Proposal for refactoring variant definition architecture

platformio.ini

@@ -87,9 +87,12 @@ build_flags = ${arduino_base.build_flags}
   -D NRF52_PLATFORM
   -D LFS_NO_ASSERT=1
   -D EXTRAFS=1
+  -I lib/nrf52/s140_nrf52_6.1.1_API/include
+  -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
 lib_deps =
   ${arduino_base.lib_deps}
   https://github.com/oltaco/CustomLFS @ 0.2.1
+
 ; ----------------- RP2040 ---------------------
 
 [rp2040_base]
@@ -118,34 +121,134 @@ lib_deps = ${arduino_base.lib_deps}
 
 [sensor_base]
 build_flags =
-  -D ENV_INCLUDE_GPS=1
   -D ENV_INCLUDE_AHTX0=1
   -D ENV_INCLUDE_BME280=1
+  -D ENV_INCLUDE_BME680=1
+  -D ENV_INCLUDE_BMP085=1
   -D ENV_INCLUDE_BMP280=1
-  -D ENV_INCLUDE_SHTC3=1
-  -D ENV_INCLUDE_SHT4X=1
-  -D ENV_INCLUDE_LPS22HB=1
-  -D ENV_INCLUDE_INA3221=1
+  -D ENV_INCLUDE_GPS=1
   -D ENV_INCLUDE_INA219=1
   -D ENV_INCLUDE_INA226=1
   -D ENV_INCLUDE_INA260=1
+  -D ENV_INCLUDE_INA3221=1
+  -D ENV_INCLUDE_LPS22HB=1
   -D ENV_INCLUDE_MLX90614=1
+  -D ENV_INCLUDE_SHT4X=1
+  -D ENV_INCLUDE_SHTC3=1
   -D ENV_INCLUDE_VL53L0X=1
-  -D ENV_INCLUDE_BME680=1
-  -D ENV_INCLUDE_BMP085=1
 lib_deps =
-  adafruit/Adafruit INA3221 Library @ ^1.0.1
-  adafruit/Adafruit INA219 @ ^1.2.3
-  robtillaart/INA226 @ ^0.6.4
-  adafruit/Adafruit INA260 Library @ ^1.5.3
   adafruit/Adafruit AHTX0 @ ^2.0.5
   adafruit/Adafruit BME280 Library @ ^2.3.0
+  adafruit/Adafruit BME680 Library @ ^2.0.4
+  adafruit/Adafruit BMP085 Library @ ^1.2.4
   adafruit/Adafruit BMP280 Library @ ^2.6.8
-  adafruit/Adafruit SHTC3 Library @ ^1.0.1
-  sensirion/Sensirion I2C SHT4x @ ^1.1.2
-  arduino-libraries/Arduino_LPS22HB @ ^1.0.2
+  adafruit/Adafruit INA219 @ ^1.2.3
+  adafruit/Adafruit INA260 Library @ ^1.5.3
+  adafruit/Adafruit INA3221 Library @ ^1.0.1
   adafruit/Adafruit MLX90614 Library @ ^2.1.5
+  adafruit/Adafruit SHTC3 Library @ ^1.0.1
   adafruit/Adafruit_VL53L0X @ ^1.2.4
+  arduino-libraries/Arduino_LPS22HB @ ^1.0.2
+  robtillaart/INA226 @ ^0.6.4
+  sensirion/Sensirion I2C SHT4x @ ^1.1.2
   stevemarple/MicroNMEA @ ^2.0.6
-  adafruit/Adafruit BME680 Library @ ^2.0.4
-  adafruit/Adafruit BMP085 Library @ ^1.2.4
+build_src_filter =
+  +<helpers/sensors>
+
+[radio_sx1262]
+build_flags =
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+build_src_filter =
+  ; placeholder
+lib_deps =
+  ; placeholder 
+
+[repeater_base]
+build_flags =
+  -D ADVERT_NAME='"MeshCore Repeater"'
+  -D ADMIN_PASSWORD='"password"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D MAX_NEIGHBOURS=50
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter =
+  +<../examples/simple_repeater>
+lib_deps =
+  ; placeholder 
+
+[bridge_rs232]
+build_flags =
+  ${repeater_base.build_flags}
+  -D ADVERT_NAME='"MeshCore RS232 Bridge"'
+;  -D BRIDGE_DEBUG=1
+build_src_filter =
+  ${repeater_base.build_src_filter}
+  +<helpers/bridges/RS232Bridge.cpp>
+lib_deps =
+  ; placeholder 
+
+[room_server_base]
+build_flags =
+  ${repeater_base.build_flags}
+  -D ADVERT_NAME='"MeshCore Room Server"'
+  -D ROOM_PASSWORD='"hello"'
+build_src_filter =
+  +<../examples/simple_room_server>
+lib_deps =
+  ; placeholder 
+
+[companion_base]
+build_flags =
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D OFFLINE_QUEUE_SIZE=256
+build_src_filter =
+  +<../examples/companion_radio/*.cpp>
+lib_deps =
+  densaugeo/base64 @ ~1.4.0
+
+[companion_ble]
+extends =
+  companion_base
+build_flags =
+  ${companion_base.build_flags}
+  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+build_src_filter =
+  ${companion_base.build_src_filter}
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+lib_deps =
+  ${companion_base.lib_deps}
+
+[ui_base]
+build_flags =
+  -I src/helpers/ui
+  -I examples/companion_radio/ui-new
+  -D DISPLAY_CLASS=NullDisplayDriver
+build_src_filter =
+  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+lib_deps =
+  ; placeholder 
+
+[display_st7789]
+extends =
+  ui_base
+build_flags =
+  ${ui_base.build_flags}
+  -D ST7789
+  -D DISPLAY_CLASS=ST7789Display
+build_src_filter =
+  ${ui_base.build_src_filter}
+  +<helpers/ui/ST7789Display.cpp>
+  +<helpers/ui/OLEDDisplay.cpp>
+  +<helpers/ui/OLEDDisplayFonts.cpp>
+lib_deps =
+  adafruit/Adafruit GFX Library @ ^1.11.7
+  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
+
+; epaper
+;adafruit/Adafruit EPD @ 4.6.1
+;zinggjm/GxEPD2

src/helpers/sensors/EnvironmentSensorManager.cpp

@@ -1,5 +1,7 @@
 #include "EnvironmentSensorManager.h"
 
+#include <Wire.h>
+
 #if ENV_PIN_SDA && ENV_PIN_SCL
 #define TELEM_WIRE &Wire1  // Use Wire1 as the I2C bus for Environment Sensors
 #else