Enable no external module choice

EdgeTX · May 27, 2023 · fac3c73 · fac3c73
1 parent e6d5d80
commit fac3c73
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp
@@ -72,7 +72,7 @@
 #elif defined(RADIOMASTER_RELEASE)
   const char vers_stamp[]   = "FW" TAB ": edgetx-" FLAVOUR    "\036VERS" TAB ": RM Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME;
 #elif defined(JUMPER_RELEASE) || defined(IFLIGHT_RELEASE)
-  const char vers_stamp[]   = "FW" TAB ": edgetx-" FLAVOUR  CPU_NAME"\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME;
+  const char vers_stamp[]   = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME;
 #else
   #if defined(VERSION_TAG)
     const char vers_stamp[]   = "FW" TAB ": edgetx-" FLAVOUR    "\036VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\036NAME" ": " CODENAME "\036DATE" TAB ": " DATE " " TIME;

diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt
@@ -77,10 +77,26 @@ if(DEFAULT_INTERNAL_MODULE)
   add_definitions(-DDEFAULT_INTERNAL_MODULE=MODULE_TYPE_${DEFAULT_INTERNAL_MODULE})
 endif()
 
+if(MODULE_SIZE_STD)
+  add_definitions(-DHARDWARE_EXTERNAL_MODULE_SIZE_STD)
+endif()
+
+if(MODULE_SIZE_SML)
+  add_definitions(-DHARDWARE_EXTERNAL_MODULE_SIZE_SML)
+endif()
+
+if(NOT MODULE_SIZE_STD AND NOT MODULE_SIZE_SML)
+  set(HARDWARE_EXTERNAL_MODULE NO)
+endif()
+
 if(HARDWARE_EXTERNAL_MODULE)
   add_definitions(-DHARDWARE_EXTERNAL_MODULE)
 endif()
 
+if(MULTIMODULE STREQUAL INTERNAL)
+  add_definitions(-DINTERNAL_MODULE_MULTI)
+endif()
+
 if(TIMERS EQUAL 3)
   add_definitions(-DTIMERS=3)
 else()
@@ -207,18 +223,6 @@ if(PXX2)
     )
 endif()
 
-if(MODULE_SIZE_STD)
-  add_definitions(-DHARDWARE_EXTERNAL_MODULE_SIZE_STD)
-endif()
-
-if(MODULE_SIZE_SML)
-  add_definitions(-DHARDWARE_EXTERNAL_MODULE_SIZE_SML)
-endif()
-
-if(MULTIMODULE STREQUAL INTERNAL)
-  add_definitions(-DINTERNAL_MODULE_MULTI)
-endif()
-
 if(MULTIMODULE)
   add_definitions(-DMULTIMODULE)
   set(SRC ${SRC} pulses/multi.cpp telemetry/hitec.cpp telemetry/hott.cpp telemetry/mlink.cpp telemetry/multi.cpp io/multi_firmware_update.cpp)