Workaround for settings being retained when restarting the simulator.

EdgeTX · Feb 22, 2025 · 33ec0ea · 33ec0ea
1 parent 088c8e2
commit 33ec0ea
Show file tree

Hide file tree

Showing 21 changed files with 115 additions and 61 deletions.
diff --git a/radio/src/analogs.cpp b/radio/src/analogs.cpp
@@ -20,28 +20,25 @@
  */
 
 #include "analogs.h"
-#include "dataconstants.h"
-#include "edgetx_helpers.h"
+#include "edgetx.h"
 
 #include "hal/adc_driver.h"
 
-static char _custom_names[MAX_ANALOG_INPUTS][LEN_ANA_NAME + 1] = { 0 };
-
 void analogSetCustomLabel(uint8_t type, uint8_t idx, const char* str, size_t len)
 {
   if (idx >= adcGetMaxInputs(type)) return;
   idx += adcGetInputOffset(type);
 
-  strncpy(_custom_names[idx], str, min<size_t>(LEN_ANA_NAME, len));
-  _custom_names[idx][LEN_ANA_NAME] = '\0';
+  strncpy(g_eeGeneral.analogNames[idx], str, min<size_t>(LEN_ANA_NAME, len));
+  g_eeGeneral.analogNames[idx][LEN_ANA_NAME] = '\0';
 }
 
 const char* analogGetCustomLabel(uint8_t type, uint8_t idx)
 {
   if (idx >= adcGetMaxInputs(type)) return "";
   idx += adcGetInputOffset(type);
 
-  return _custom_names[idx];
+  return g_eeGeneral.analogNames[idx];
 }
 
 bool analogHasCustomLabel(uint8_t type, uint8_t idx)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
@@ -83,11 +83,11 @@ static inline void check_struct()
 #endif
 
 #if defined(PCBXLITES)
-  CHKSIZE(RadioData, 872);
+  CHKSIZE(RadioData, 1008);
 #elif defined(COLORLCD)
-  CHKSIZE(RadioData, 966);
+  CHKSIZE(RadioData, 1134);
 #else
-  CHKSIZE(RadioData, 870);
+  CHKSIZE(RadioData, 1006);
 #endif
 
 #if defined(RADIO_TPRO) || defined(RADIO_TPROV2) || defined(RADIO_BUMBLEBEE)

diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h
@@ -1026,6 +1026,9 @@ PACK(struct RadioData {
 
   NOBACKUP(uint8_t pwrOffIfInactive);
 
+  NOBACKUP(char switchNames[MAX_SWITCHES][LEN_SWITCH_NAME + 1] SKIP);
+  NOBACKUP(char analogNames[MAX_ANALOG_INPUTS][LEN_ANA_NAME + 1] SKIP);
+
   NOBACKUP(uint8_t getBrightness() const
   {
 #if defined(OLED_SCREEN)

diff --git a/radio/src/edgetx.cpp b/radio/src/edgetx.cpp
@@ -1104,6 +1104,7 @@ void edgeTxClose(uint8_t shutdown)
 #if defined(HAPTIC)
     hapticOff();
 #endif
+    mixerTaskExit();
   }
 
   logsClose();

diff --git a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp
@@ -262,6 +262,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -363,6 +368,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "invertLCD", 1 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 448 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {

diff --git a/radio/src/storage/yaml/yaml_datastructs_f16.cpp b/radio/src/storage/yaml/yaml_datastructs_f16.cpp
@@ -281,6 +281,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -389,6 +394,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 6 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 704 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -692,11 +699,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),

diff --git a/radio/src/storage/yaml/yaml_datastructs_gx12.cpp b/radio/src/storage/yaml/yaml_datastructs_gx12.cpp
@@ -263,6 +263,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -364,6 +369,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "invertLCD", 1 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 448 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {

diff --git a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
@@ -272,6 +272,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -380,6 +385,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 6 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 704 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -683,11 +690,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),

diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14_family.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14_family.cpp
@@ -279,6 +279,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -387,6 +392,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 6 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 704 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -690,11 +697,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),

diff --git a/radio/src/storage/yaml/yaml_datastructs_t15.cpp b/radio/src/storage/yaml/yaml_datastructs_t15.cpp
@@ -281,6 +281,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -389,6 +394,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 6 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 704 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -692,11 +699,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),

diff --git a/radio/src/storage/yaml/yaml_datastructs_t20.cpp b/radio/src/storage/yaml/yaml_datastructs_t20.cpp
@@ -263,6 +263,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -364,6 +369,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "invertLCD", 1 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 448 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {

diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
@@ -263,6 +263,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -364,6 +369,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "invertLCD", 1 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 448 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {

diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -280,6 +280,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -388,6 +393,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 6 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 704 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -691,11 +698,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),

diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
@@ -262,6 +262,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -362,6 +367,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 4 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 448 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -664,11 +671,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),

diff --git a/radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp b/radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp
@@ -262,6 +262,11 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_PADDING( 7 ),
   YAML_END
 };
+static const struct YamlNode struct_string_32[] = {
+  YAML_IDX,
+  YAML_STRING("val", 4),
+  YAML_END
+};
 static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "manuallyEdited", 1 ),
   YAML_SIGNED( "timezoneMinutes", 3 ),
@@ -362,6 +367,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "disablePwrOnOffHaptic", 1 ),
   YAML_PADDING( 4 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
+  YAML_PADDING( 640 ),
+  YAML_PADDING( 448 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
@@ -664,11 +671,6 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode struct_string_32[] = {
-  YAML_IDX,
-  YAML_STRING("val", 4),
-  YAML_END
-};
 static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),