Merge branch 'dev' into 2026/remote-lna

2026-04-20 22:13:47 +00:00 · 2026-02-27 10:32:14 +00:00 · 2026-02-27 10:32:14 +00:00 · 64a16d7ad2
commit 64a16d7ad2
parent 3a81837845 b67decfba0
45 changed files with 665 additions and 255 deletions
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@ -44,6 +44,31 @@ lib_deps =
  stevemarple/MicroNMEA @ ^2.0.6
  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0

+[env:Heltec_Wireless_Tracker_companion_radio_usb]
+extends = Heltec_tracker_base
+build_flags =
+  ${Heltec_tracker_base.build_flags}
+  -I src/helpers/ui
+  -I examples/companion_radio/ui-new
+  -D DISPLAY_ROTATION=1
+  -D DISPLAY_CLASS=ST7735Display
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+; -D BLE_PIN_CODE=123456 ; HWT will use display for pin
+; -D OFFLINE_QUEUE_SIZE=256
+;  -D BLE_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_tracker_base.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/ST7735Display.cpp>
+lib_deps =
+  ${Heltec_tracker_base.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
 [env:Heltec_Wireless_Tracker_companion_radio_ble]
 extends = Heltec_tracker_base
 build_flags =
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@ -27,6 +27,7 @@ build_flags =
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=140
  -D SX126X_RX_BOOSTED_GAIN=1
+  -D SX126X_REGISTER_PATCH=1
  -D PIN_BOARD_SDA=5
  -D PIN_BOARD_SCL=6
  -D PIN_USER_BTN=0
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@ -27,7 +27,9 @@ build_src_filter = ${esp32_base.build_src_filter}
  +<helpers/ui/SH1106Display.cpp>
  +<helpers/esp32/TBeamBoard.cpp>
  +<helpers/sensors>
-board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
+board_build.partitions = default_8MB.csv
+board_upload.flash_size = 8MB
+board_upload.maximum_size = 8388608
 lib_deps =
  ${esp32_base.lib_deps}
  lewisxhe/XPowersLib @ ^0.2.7
@ -132,3 +134,27 @@ build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
 lib_deps =
  ${T_Beam_S3_Supreme_SX1262.lib_deps}
  densaugeo/base64 @ ~1.4.0
+
+[env:T_Beam_S3_Supreme_SX1262_companion_radio_wifi]
+extends = T_Beam_S3_Supreme_SX1262
+build_flags =
+  ${T_Beam_S3_Supreme_SX1262.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D OFFLINE_QUEUE_SIZE=256
+  -D WIFI_SSID='"WIFI_SSID"'
+  -D WIFI_PWD='"Password"'
+;  -D WIFI_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=8
+;  -D MESH_DEBUG=1
+;  -D ARDUHAL_LOG_LEVEL=4
+;  -D CORE_DEBUG_LEVEL=4
+build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps =
+  ${T_Beam_S3_Supreme_SX1262.lib_deps}
+  densaugeo/base64 @ ~1.4.0
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@ -18,7 +18,7 @@ build_flags =
  -D P_LORA_SCLK=5      ; SPI clock
  -D P_LORA_MISO=19     ; SPI MISO
  -D P_LORA_MOSI=27     ; SPI MOSI
-  -D P_LORA_TX_LED=2    ; LED pin for TX indication
+  -D P_LORA_TX_LED=25    ; LED pin for TX indication
  -D PIN_BOARD_SDA=21
  -D PIN_BOARD_SCL=22
  -D PIN_VBAT_READ=35   ; Battery voltage reading (analog pin)
@ -65,7 +65,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
-  +<../examples/simple_repeater>
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${LilyGo_TLora_V2_1_1_6.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -191,4 +191,4 @@ build_flags =
 ;  -D CORE_DEBUG_LEVEL=3
 lib_deps =
  ${LilyGo_TLora_V2_1_1_6.lib_deps}
-  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
--- a/variants/m5stack_unit_c6l/platformio.ini
+++ b/variants/m5stack_unit_c6l/platformio.ini
@ -5,7 +5,7 @@ board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 build_flags =
  ${esp32c6_base.build_flags}
  ${sensor_base.build_flags}
-  -I variants/M5Stack_Unit_C6L
+  -I variants/m5stack_unit_c6l
  -D P_LORA_TX_LED=15
  -D P_LORA_SCLK=20
  -D P_LORA_MISO=22
@ -95,6 +95,8 @@ build_flags = ${M5Stack_Unit_C6L.build_flags}
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D OFFLINE_QUEUE_SIZE=256
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_MODE=1
 build_src_filter = ${M5Stack_Unit_C6L.build_src_filter}
  +<helpers/esp32/*.cpp>
  -<helpers/esp32/ESPNOWRadio.cpp>
--- a/variants/rak3112/platformio.ini
+++ b/variants/rak3112/platformio.ini
@ -7,6 +7,7 @@ build_flags =
  -I variants/rak3112
  -D RAK_3112=1
  -D ESP32_CPU_FREQ=80
+  -D ARDUINO_USB_CDC_ON_BOOT=1
  -D P_LORA_DIO_1=47
  -D P_LORA_NSS=7
  -D P_LORA_RESET=8
@ -132,14 +133,14 @@ lib_deps =
 extends = rak3112
 build_flags =
  ${rak3112.build_flags}
-  -I examples/companion_radio/ui-new
+  -I examples/companion_radio/ui-orig
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${rak3112.build_src_filter}
  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
+  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
  ${rak3112.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -148,7 +149,7 @@ lib_deps =
 extends = rak3112
 build_flags =
  ${rak3112.build_flags}
-  -I examples/companion_radio/ui-new
+  -I examples/companion_radio/ui-orig
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
@ -160,7 +161,7 @@ build_flags =
 build_src_filter = ${rak3112.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
+  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
  ${rak3112.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -169,7 +170,7 @@ lib_deps =
 extends = rak3112
 build_flags =
  ${rak3112.build_flags}
-  -I examples/companion_radio/ui-new
+  -I examples/companion_radio/ui-orig
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D WIFI_DEBUG_LOGGING=1
@ -181,7 +182,7 @@ build_flags =
 build_src_filter = ${rak3112.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
+  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
  ${rak3112.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@ -97,6 +97,8 @@ build_flags = ${WioTrackerL1.build_flags}
  -D PIN_BUZZER=12
  -D QSPIFLASH=1
  -D ADVERT_NAME='"@@MAC"'
+  -D ENV_PIN_SDA=PIN_WIRE1_SDA
+  -D ENV_PIN_SCL=PIN_WIRE1_SCL
  ; -D MESH_PACKET_LOGGING=1
  ; -D MESH_DEBUG=1
 build_src_filter = ${WioTrackerL1.build_src_filter}