Merge pull request #24 from futurexdesign/settings_menu_fix

futurexdesign · May 16, 2023 · 0e65410 · 0e65410
2 parents 68a6801 + b694315
commit 0e65410
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/KiwiBoard.emf b/KiwiBoard.emf
@@ -485,33 +485,33 @@
     },
     {
       "parentId": 30,
-      "type": "textItem",
-      "defaultValue": "1.00",
+      "type": "boolItem",
+      "defaultValue": "false",
       "item": {
-        "textLength": 10,
-        "itemType": "PLAIN_TEXT",
-        "name": "Version",
-        "variableName": "Version",
-        "id": 43,
+        "naming": "ON_OFF",
+        "name": "Motor Test",
+        "variableName": "motorTest",
+        "id": 44,
         "eepromAddress": -1,
-        "readOnly": true,
+        "functionName": "@motortest",
+        "readOnly": false,
         "localOnly": false,
         "visible": true,
         "staticDataInRAM": false
       }
     },
     {
       "parentId": 30,
-      "type": "boolItem",
-      "defaultValue": "false",
+      "type": "textItem",
+      "defaultValue": "1.00",
       "item": {
-        "naming": "ON_OFF",
-        "name": "Motor Test",
-        "variableName": "motorTest",
-        "id": 44,
+        "textLength": 10,
+        "itemType": "PLAIN_TEXT",
+        "name": "Version",
+        "variableName": "Version",
+        "id": 43,
         "eepromAddress": -1,
-        "functionName": "@motortest",
-        "readOnly": false,
+        "readOnly": true,
         "localOnly": false,
         "visible": true,
         "staticDataInRAM": false

diff --git a/src/KiwiBoardFirmware_menu.cpp b/src/KiwiBoardFirmware_menu.cpp
@@ -20,12 +20,12 @@ TfteSpiDrawable gfxDrawable(&gfx, 100);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
 
 // Global Menu Item declarations
-const BooleanMenuInfo minfomotorTest = { "Motor Test", 44, 0xffff, 1, motortest, NAMING_ON_OFF };
-BooleanMenuItem menumotorTest(&minfomotorTest, false, NULL, INFO_LOCATION_PGM);
 RENDERING_CALLBACK_NAME_INVOKE(fnVersionRtCall, textItemRenderFn, "Version", -1, NO_CALLBACK)
-TextMenuItem menuVersion(fnVersionRtCall, "1.00", 43, 10, &menumotorTest);
+TextMenuItem menuVersion(fnVersionRtCall, "1.00", 43, 10, NULL);
+const BooleanMenuInfo minfomotorTest = { "Motor Test", 44, 0xffff, 1, motortest, NAMING_ON_OFF };
+BooleanMenuItem menumotorTest(&minfomotorTest, false, &menuVersion, INFO_LOCATION_PGM);
 const BooleanMenuInfo minfoStealthChop = { "StealthChop", 45, 96, 1, stealthChopChange, NAMING_ON_OFF };
-BooleanMenuItem menuStealthChop(&minfoStealthChop, true, &menuVersion, INFO_LOCATION_PGM);
+BooleanMenuItem menuStealthChop(&minfoStealthChop, true, &menumotorTest, INFO_LOCATION_PGM);
 const AnalogMenuInfo minfoIRun = { "IRun", 33, 77, 31, iRunChanged, 0, 1, "" };
 AnalogMenuItem menuIRun(&minfoIRun, 17, &menuStealthChop, INFO_LOCATION_PGM);
 const AnalogMenuInfo minfoGlobalScaler = { "Global Scaler", 32, 75, 255, GlobalScalerChanged, 0, 1, "" };

diff --git a/src/KiwiBoardFirmware_menu.h b/src/KiwiBoardFirmware_menu.h
@@ -1,4 +1,4 @@
-/*
+/*
     The code in this file uses open source libraries provided by thecoderscorner
 
     DO NOT EDIT THIS FILE, IT WILL BE GENERATED EVERY TIME YOU USE THE UI DESIGNER
@@ -29,8 +29,8 @@ extern GraphicsDeviceRenderer renderer;
 
 
 // Global Menu Item exports
-extern BooleanMenuItem menumotorTest;
 extern TextMenuItem menuVersion;
+extern BooleanMenuItem menumotorTest;
 extern BooleanMenuItem menuStealthChop;
 extern AnalogMenuItem menuIRun;
 extern AnalogMenuItem menuGlobalScaler;