split up and organized the platformio better

variants/muzi_base_duo/platformio.ini

@@ -28,7 +28,7 @@ build_flags = ${nrf52_base.build_flags}
   -D LR11X0_DIO_AS_RF_SWITCH=true
   -D LR11X0_DIO3_TCXO_VOLTAGE=3.0
   -D QSPIFLASH=1
-  ; -D ENV_INCLUDE_GPS=1
+  ; -D ENV_INCLUDE_GPS=0
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/sensors>
@@ -36,11 +36,13 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/muzi_base_duo>
 debug_tool = jlink
 upload_protocol = nrfutil
-
+lib_deps =
+  ${nrf52_base.lib_deps}
+  ${sensor_base.lib_deps}
 [env:muzi_base_duo_repeater]
 extends = muzi_base_duo
 build_flags = ${muzi_base_duo.build_flags}
-  -I examples/companion_radio/ui-orig
+  -I examples/companion_radio/ui-new
   -D ADVERT_NAME='"muzi_base_duo Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -51,12 +53,11 @@ build_flags = ${muzi_base_duo.build_flags}
 build_src_filter = ${muzi_base_duo.build_src_filter}
   +<../examples/simple_repeater>
 lib_deps = ${muzi_base_duo.lib_deps}
-  ; stevemarple/MicroNMEA @ ^2.0.6
 
 [env:muzi_base_duo_room_server]
 extends = muzi_base_duo
 build_flags = ${muzi_base_duo.build_flags}
-  -I examples/companion_radio/ui-orig
+  -I examples/companion_radio/ui-new
   -D ADVERT_NAME='"muzi_base_duo Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -68,15 +69,15 @@ build_flags = ${muzi_base_duo.build_flags}
 build_src_filter = ${muzi_base_duo.build_src_filter}
   +<../examples/simple_room_server>
 lib_deps = ${muzi_base_duo.lib_deps}
-  ; stevemarple/MicroNMEA @ ^2.0.6
+
 
 [env:muzi_base_duo_companion_radio_usb]
 extends = muzi_base_duo
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${muzi_base_duo.build_flags}
-  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=500 ;can increase number of contacts since we have a ton of extra flash.
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -85,19 +86,17 @@ build_flags = ${muzi_base_duo.build_flags}
 
 build_src_filter = ${muzi_base_duo.build_src_filter}
   +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-orig/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps = ${muzi_base_duo.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  ; stevemarple/MicroNMEA @ ^2.0.6
-  end2endzone/NonBlockingRTTTL@^1.3.0
 
 [env:muzi_base_duo_companion_radio_ble]
 extends = muzi_base_duo
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${muzi_base_duo.build_flags}
-  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=500 ;can increase number of contacts since we have a ton of extra flash.
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_TX_POWER=0
@@ -107,42 +106,31 @@ build_flags = ${muzi_base_duo.build_flags}
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
   -D DISPLAY_CLASS=NullDisplayDriver
-  -D ADVERT_NAME='"@@MAC"'
+  ; -D ADVERT_NAME='"@@MAC"'
 build_src_filter = ${muzi_base_duo.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<helpers/sensors>
   +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-orig/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps = ${muzi_base_duo.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  ; stevemarple/MicroNMEA @ ^2.0.6
-  end2endzone/NonBlockingRTTTL@^1.3.0
-[env:muzi_base_duo_companion_radio_ble_superIO]
+
+[muzi_base_duo_superIO]
 extends = muzi_base_duo
+board= muzi_base_duo
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${muzi_base_duo.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-  -D BLE_TX_POWER=0
-  -D QSPIFLASH=1
+  -D muzi_base_duo_superIO
   -D UI_HAS_JOYSTICK=1
-;  -D BLE_DEBUG_LOGGING=1
-;  -D MESH_PACKET_LOGGING=1
-  ; -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
   -D DISPLAY_CLASS=SH1107Display
   -D DISPLAY_ROTATION=2
-  ; -D ADVERT_NAME='"@@MAC"'
   -D ENV_INCLUDE_GPS=1
-  ; -D PIN_BUZZER=22
+  -D PIN_BUZZER=22
 build_src_filter = ${muzi_base_duo.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<helpers/sensors>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
   +<helpers/ui/SH1107Display.cpp>
   +<helpers/ui/buzzer.cpp>
   +<helpers/ui/MomentaryButton.cpp>
@@ -154,4 +142,28 @@ lib_deps = ${muzi_base_duo.lib_deps}
   adafruit/Adafruit SH110X@^2.1.14
   artronshop/[email protected]
   adafruit/Adafruit GFX Library @ ^1.12.1
+debug_tool = jlink
+upload_protocol = nrfutil
+
 
+[env:muzi_base_duo_companion_radio_ble_superIO]
+extends = muzi_base_duo_superIO
+board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
+board_upload.maximum_size = 708608
+build_flags = ${muzi_base_duo_superIO.build_flags}
+  -D MAX_CONTACTS=500 ; can increase number of contacts since we have a ton of extra flash.
+  -D MAX_GROUP_CHANNELS=40
+  -I examples/companion_radio/ui-new
+  -D BLE_PIN_CODE=123456
+  -D BLE_TX_POWER=0
+  -D QSPIFLASH=1
+;  -D BLE_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+  -D OFFLINE_QUEUE_SIZE=256
+build_src_filter = ${muzi_base_duo_superIO.build_src_filter}
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps = 
+  ${muzi_base_duo_superIO.lib_deps}

variants/muzi_base_duo/target.h

@@ -10,17 +10,23 @@
 #include <helpers/sensors/LocationProvider.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/sensors/EnvironmentSensorManager.h>  // Added: Include for EnvironmentSensorManager
+#include <helpers/ui/MomentaryButton.h>
 
-#ifdef DISPLAY_CLASS
+
+#ifdef muzi_base_duo_superIO
   #include <helpers/ui/SH1107Display.h>
   extern DISPLAY_CLASS display;
-  #include <helpers/ui/MomentaryButton.h>
   extern MomentaryButton user_btn;
   extern MomentaryButton joystick_left;
   extern MomentaryButton joystick_right;
   extern MomentaryButton joystick_up;
   extern MomentaryButton joystick_down;
   extern MomentaryButton back_btn;
+#else
+  #include "helpers/ui/NullDisplayDriver.h"
+  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
+
 #endif
 
 extern muzi_base_duoBoard board;