test

src/js/app.js

@@ -114,7 +114,7 @@ module.exports = new Vue({
             full_version: "<loading>",
             ip: "<>",
             wifiName: "not connected",
-            macros:[{},{},{},{},{},{}]
+            macros:[]
           },
           state: {
             messages: [],

src/js/control-view.js

@@ -203,12 +203,13 @@ module.exports = {
             return Math.min(1, p);
         },
         isMacrosPresent: function(){
-            if(this.config.macros!=undefined){
-                console.log("isMacrosPresent",this.config.macros!=undefined);
-                console.log(this.config.macros.length!=0);
-                return this.config.macros.length!=0;
-            }
-            return false;
+            return (this.config.macros!=undefined)
+            // if(this.config.macros!=undefined){
+            //     console.log("isMacrosPresent",this.config.macros!=undefined);
+            //     console.log(this.config.macros.length!=0);
+            //     return this.config.macros.length!=0;
+            // }
+            // return false;
         }
     },
 

src/js/macros.js

@@ -55,8 +55,7 @@ module.exports = {
         },
         saveMacros: function(){
             var macrosName = document.getElementById("macros-name").value;
-            var macrosColor = document.getElementById("macros-color").value
-            console.log(this.state.selected);
+            var macrosColor = document.getElementById("macros-color").value;
             if(this.config.macros == undefined) {
                 console.log("macros is undefined");
                 this.config.macros=[];
@@ -65,7 +64,8 @@ module.exports = {
             this.config.macros.push({
                 id:Math.round(Math.random()*100000),
                 name:macrosName,
-                color:macrosColor
+                color:macrosColor,
+                gcode:this.state.selected,
             })
             console.log("Successfully saved");
             console.log(this.config.macros);