fix: Internal module setting and applying post load fixes on radio se…

…ttings (#1787)
EdgeTX · Apr 2, 2022 · d38c228 · d38c228
1 parent c2d8ff6
commit d38c228
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/radio/src/storage/sdcard_yaml.cpp b/radio/src/storage/sdcard_yaml.cpp
@@ -129,15 +129,12 @@ const char * loadRadioSettings()
 #endif
     }
 
-#if defined(DEFAULT_INTERNAL_MODULE)
-    g_eeGeneral.internalModule = DEFAULT_INTERNAL_MODULE;
-#endif
-
     const char* error = loadRadioSettingsYaml();
     if (!error) {
       g_eeGeneral.chkSum = evalChkSum();
     }
-
+    postRadioSettingsLoad();
+
     return error;
 }
 

diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp
@@ -93,6 +93,11 @@ void postRadioSettingsLoad()
     serialSetMode(SP_VCP, UART_MODE_CLI);
   }
 #endif
+#if defined(DEFAULT_INTERNAL_MODULE)
+  if (!g_eeGeneral.internalModule) {
+    g_eeGeneral.internalModule = DEFAULT_INTERNAL_MODULE;
+  }
+#endif
 }
 
 #if defined(EXTERNAL_ANTENNA) && defined(INTERNAL_MODULE_PXX1)