Preserve macros defined in keyboard JSON

qmk · Nov 20, 2024 · 4a19923 · 4a19923
1 parent cf968a0
commit 4a19923
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/components/ControllerBottom.vue b/src/components/ControllerBottom.vue
@@ -164,6 +164,7 @@ export default {
       'firmwareSourceURL',
       'keymapSourceURL',
       'author',
+      'macros',
       'notes',
       'electron'
     ]),
@@ -209,6 +210,7 @@ export default {
       'setKeymapName',
       'setLayout',
       'setNotes',
+      'setMacros',
       'startListening',
       'stopListening'
     ]),
@@ -253,11 +255,13 @@ export default {
       let layers = this.exportLayers({
         compiler: false
       });
-
+      console.log('exportJSON!');
+      console.log(this.macros);
       //API payload format
       const { keymap } = this.templates;
       let data = Object.assign(keymap, {
         keyboard: this.keyboard,
+        macros: this.macros,
         keymap: this.exportKeymapName,
         layout: this.layout,
         layers: layers,
@@ -367,6 +371,10 @@ export default {
         this.setNotes(notes);
       }
 
+      if (!isUndefined(data.macros)) {
+        this.setMacros(data.macros);
+      }
+
       // remap old json files to new mappings if they need it
       data = Object.assign(
         data,

diff --git a/src/store/modules/app/mutations.js b/src/store/modules/app/mutations.js
@@ -177,6 +177,10 @@ const mutations = {
   setNotes(state, newNotes) {
     state.notes = newNotes;
   },
+  setMacros(state, newMacros) {
+    console.log('macros!');
+    state.macros = newMacros;
+  },
   toggleTutorial(state) {
     state.tutorialEnabled = !state.tutorialEnabled;
   },