DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
kelsey hudson
2025-08-31 11:30:59 -07:00
parent 65be15e6be 3aa57780f1
commit 4b508136b4
28 changed files with 85 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/companion_radio/MyMesh.h
View File

@@ -8,11 +8,11 @@
#define FIRMWARE_VER_CODE 7 #define FIRMWARE_VER_CODE 7
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "24 Jul 2025" #define FIRMWARE_BUILD_DATE "31 Aug 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.7.4" #define FIRMWARE_VERSION "v1.8.0"
#endif #endif
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM) #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

15
examples/companion_radio/ui-new/UITask.cpp
View File

@@ -551,7 +551,22 @@ void UITask::loop() {
if (millis() > next_batt_chck) { if (millis() > next_batt_chck) {
uint16_t milliVolts = getBattMilliVolts(); uint16_t milliVolts = getBattMilliVolts();
if (milliVolts > 0 && milliVolts < AUTO_SHUTDOWN_MILLIVOLTS) { if (milliVolts > 0 && milliVolts < AUTO_SHUTDOWN_MILLIVOLTS) {
// show low battery shutdown alert
// we should only do this for eink displays, which will persist after power loss
#ifdef THINKNODE_M1
if (_display != NULL) {
_display->startFrame();
_display->setTextSize(2);
_display->setColor(DisplayDriver::RED);
_display->drawTextCentered(_display->width() / 2, 20, "Low Battery.");
_display->drawTextCentered(_display->width() / 2, 40, "Shutting Down!");
_display->endFrame();
}
#endif
shutdown(); shutdown();
} }
next_batt_chck = millis() + 8000; next_batt_chck = millis() + 8000;
} }

4
examples/simple_repeater/main.cpp
View File

@@ -22,11 +22,11 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "24 Jul 2025" #define FIRMWARE_BUILD_DATE "31 Aug 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.7.4" #define FIRMWARE_VERSION "v1.8.0"
#endif #endif
#ifndef LORA_FREQ #ifndef LORA_FREQ

4
examples/simple_room_server/main.cpp
View File

@@ -22,11 +22,11 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "24 Jul 2025" #define FIRMWARE_BUILD_DATE "31 Aug 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.7.4" #define FIRMWARE_VERSION "v1.8.0"
#endif #endif
#ifndef LORA_FREQ #ifndef LORA_FREQ

4
examples/simple_sensor/SensorMesh.h
View File

@@ -49,11 +49,11 @@ struct ContactInfo {
}; };
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "24 Jul 2025" #define FIRMWARE_BUILD_DATE "31 Aug 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.7.4" #define FIRMWARE_VERSION "v1.8.0"
#endif #endif
#define FIRMWARE_ROLE "sensor" #define FIRMWARE_ROLE "sensor"

2
library.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "MeshCore", "name": "MeshCore",
"version" : "1.7.4", "version" : "1.8.0",
"dependencies": { "dependencies": {
"SPI": "*", "SPI": "*",
"Wire": "*", "Wire": "*",

2
platformio.ini
View File

@@ -68,7 +68,7 @@ lib_deps =
; esp32c6 uses arduino framework 3.x ; esp32c6 uses arduino framework 3.x
[esp32c6_base] [esp32c6_base]
extends = esp32_base extends = esp32_base
platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21/platform-espressif32.zip platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.12/platform-espressif32.zip
; ----------------- NRF52 --------------------- ; ----------------- NRF52 ---------------------

2
src/helpers/CommonCLI.cpp
View File

@@ -268,7 +268,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
} else if (memcmp(config, "agc.reset.interval ", 19) == 0) { } else if (memcmp(config, "agc.reset.interval ", 19) == 0) {
_prefs->agc_reset_interval = atoi(&config[19]) / 4; _prefs->agc_reset_interval = atoi(&config[19]) / 4;
savePrefs(); savePrefs();
strcpy(reply, "OK"); sprintf(reply, "OK - interval rounded to %d", ((uint32_t) _prefs->agc_reset_interval) * 4);
} else if (memcmp(config, "multi.acks ", 11) == 0) { } else if (memcmp(config, "multi.acks ", 11) == 0) {
_prefs->multi_acks = atoi(&config[11]); _prefs->multi_acks = atoi(&config[11]);
savePrefs(); savePrefs();

8
src/helpers/nrf52/ThinkNodeM1Board.h
View File

@@ -57,6 +57,14 @@ public:
} }
void powerOff() override { void powerOff() override {
// turn off all leds, sd_power_system_off will not do this for us
#ifdef P_LORA_TX_LED
digitalWrite(P_LORA_TX_LED, LOW);
#endif
// power off board
sd_power_system_off(); sd_power_system_off();
} }
}; };

4
variants/generic_espnow/platformio.ini
View File

@@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
extends = Generic_ESPNOW extends = Generic_ESPNOW
build_flags = build_flags =
${Generic_ESPNOW.build_flags} ${Generic_ESPNOW.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
build_src_filter = ${Generic_ESPNOW.build_src_filter} build_src_filter = ${Generic_ESPNOW.build_src_filter}
+<../examples/simple_secure_chat/main.cpp> +<../examples/simple_secure_chat/main.cpp>
@@ -54,7 +54,7 @@ lib_deps =
extends = Generic_ESPNOW extends = Generic_ESPNOW
build_flags = build_flags =
${Generic_ESPNOW.build_flags} ${Generic_ESPNOW.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1

4
variants/heltec_ct62/platformio.ini
View File

@@ -55,7 +55,7 @@ build_flags =
${Heltec_ct62.build_flags} ${Heltec_ct62.build_flags}
; -D ARDUINO_USB_MODE=1 ; -D ARDUINO_USB_MODE=1
; -D ARDUINO_USB_CDC_ON_BOOT=1 ; -D ARDUINO_USB_CDC_ON_BOOT=1
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
@@ -73,7 +73,7 @@ build_flags =
${Heltec_ct62.build_flags} ${Heltec_ct62.build_flags}
; -D ARDUINO_USB_MODE=1 ; -D ARDUINO_USB_MODE=1
; -D ARDUINO_USB_CDC_ON_BOOT=1 ; -D ARDUINO_USB_CDC_ON_BOOT=1
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456

2
variants/heltec_tracker/platformio.ini
View File

@@ -43,7 +43,7 @@ build_flags =
-D ARDUINO_USB_CDC_ON_BOOT=1 ; need for Serial -D ARDUINO_USB_CDC_ON_BOOT=1 ; need for Serial
-D DISPLAY_ROTATION=1 -D DISPLAY_ROTATION=1
-D DISPLAY_CLASS=ST7735Display -D DISPLAY_CLASS=ST7735Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 ; HWT will use display for pin -D BLE_PIN_CODE=123456 ; HWT will use display for pin
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256

2
variants/heltec_v3/platformio.ini
View File

@@ -72,7 +72,7 @@ lib_deps =
extends = Heltec_lora32_v3 extends = Heltec_lora32_v3
build_flags = build_flags =
${Heltec_lora32_v3.build_flags} ${Heltec_lora32_v3.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1

2
variants/heltec_vision_master_e213/platformio.ini
View File

@@ -38,7 +38,7 @@ extends = Heltec_Vision_Master_E213_base
build_flags = build_flags =
${Heltec_Vision_Master_E213_base.build_flags} ${Heltec_Vision_Master_E213_base.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D DISPLAY_CLASS=E213Display -D DISPLAY_CLASS=E213Display
-D BLE_PIN_CODE=123456 ; dynamic, random PIN -D BLE_PIN_CODE=123456 ; dynamic, random PIN

2
variants/heltec_vision_master_e290/platformio.ini
View File

@@ -32,7 +32,7 @@ extends = Heltec_Vision_Master_E290_base
build_flags = build_flags =
${Heltec_Vision_Master_E290_base.build_flags} ${Heltec_Vision_Master_E290_base.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D DISPLAY_CLASS=E290Display -D DISPLAY_CLASS=E290Display
-D BLE_PIN_CODE=123456 ; dynamic, random PIN -D BLE_PIN_CODE=123456 ; dynamic, random PIN

2
variants/heltec_vision_master_t190/platformio.ini
View File

@@ -45,7 +45,7 @@ extends = Heltec_Vision_Master_T190_base
build_flags = build_flags =
${Heltec_Vision_Master_T190_base.build_flags} ${Heltec_Vision_Master_T190_base.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 ; dynamic, random PIN -D BLE_PIN_CODE=123456 ; dynamic, random PIN
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1

2
variants/heltec_wireless_paper/platformio.ini
View File

@@ -38,7 +38,7 @@ extends = Heltec_Wireless_Paper_base
build_flags = build_flags =
${Heltec_Wireless_Paper_base.build_flags} ${Heltec_Wireless_Paper_base.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D DISPLAY_CLASS=E213Display -D DISPLAY_CLASS=E213Display
-D BLE_PIN_CODE=123456 ; dynamic, random PIN -D BLE_PIN_CODE=123456 ; dynamic, random PIN

6
variants/lilygo_t3s3/platformio.ini
View File

@@ -56,7 +56,7 @@ lib_deps =
extends = LilyGo_T3S3_sx1262 extends = LilyGo_T3S3_sx1262
build_flags = build_flags =
${LilyGo_T3S3_sx1262.build_flags} ${LilyGo_T3S3_sx1262.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@@ -91,7 +91,7 @@ build_flags =
${LilyGo_T3S3_sx1262.build_flags} ${LilyGo_T3S3_sx1262.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
@@ -110,7 +110,7 @@ build_flags =
${LilyGo_T3S3_sx1262.build_flags} ${LilyGo_T3S3_sx1262.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1

6
variants/lilygo_t3s3_sx1276/platformio.ini
View File

@@ -54,7 +54,7 @@ lib_deps =
extends = LilyGo_T3S3_sx1276 extends = LilyGo_T3S3_sx1276
build_flags = build_flags =
${LilyGo_T3S3_sx1276.build_flags} ${LilyGo_T3S3_sx1276.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@@ -90,7 +90,7 @@ build_flags =
${LilyGo_T3S3_sx1276.build_flags} ${LilyGo_T3S3_sx1276.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
-D MESH_DEBUG=1 -D MESH_DEBUG=1
@@ -109,7 +109,7 @@ build_flags =
${LilyGo_T3S3_sx1276.build_flags} ${LilyGo_T3S3_sx1276.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1

2
variants/lilygo_tbeam_supreme_SX1262/platformio.ini
View File

@@ -74,7 +74,7 @@ extends = T_Beam_S3_Supreme_SX1262
build_flags = build_flags =
${T_Beam_S3_Supreme_SX1262.build_flags} ${T_Beam_S3_Supreme_SX1262.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256

2
variants/lilygo_tlora_c6/platformio.ini
View File

@@ -67,7 +67,7 @@ lib_deps =
[env:LilyGo_Tlora_C6_companion_radio_ble] [env:LilyGo_Tlora_C6_companion_radio_ble]
extends = tlora_c6 extends = tlora_c6
build_flags = ${tlora_c6.build_flags} build_flags = ${tlora_c6.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1

10
variants/meshadventurer/platformio.ini
View File

@@ -82,6 +82,7 @@ build_src_filter = ${Meshadventurer.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
build_flags = build_flags =
${Meshadventurer.build_flags} ${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1262 -D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper -D WRAPPER_CLASS=CustomSX1262Wrapper
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
@@ -99,8 +100,11 @@ build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
build_flags = build_flags =
${Meshadventurer.build_flags} ${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1262 -D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper -D WRAPPER_CLASS=CustomSX1262Wrapper
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
@@ -159,8 +163,11 @@ extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
build_flags = build_flags =
${Meshadventurer.build_flags} ${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1268 -D RADIO_CLASS=CustomSX1268
-D WRAPPER_CLASS=CustomSX1268Wrapper -D WRAPPER_CLASS=CustomSX1268Wrapper
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
@@ -178,8 +185,11 @@ build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
build_flags = build_flags =
${Meshadventurer.build_flags} ${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1268 -D RADIO_CLASS=CustomSX1268
-D WRAPPER_CLASS=CustomSX1268Wrapper -D WRAPPER_CLASS=CustomSX1268Wrapper
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22

4
variants/meshadventurer/target.cpp
View File

@@ -18,10 +18,6 @@ MASensorManager sensors = MASensorManager(nmea);
DISPLAY_CLASS display; DISPLAY_CLASS display;
#endif #endif
#ifndef LORA_CR
#define LORA_CR 5
#endif
bool radio_init() { bool radio_init() {
fallback_clock.begin(); fallback_clock.begin();
rtc_clock.begin(Wire); rtc_clock.begin(Wire);

4
variants/station_g2/platformio.ini
View File

@@ -87,7 +87,7 @@ build_flags =
${Station_G2.build_flags} ${Station_G2.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SH1106Display -D DISPLAY_CLASS=SH1106Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
@@ -105,7 +105,7 @@ build_flags =
${Station_G2.build_flags} ${Station_G2.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D DISPLAY_CLASS=SH1106Display -D DISPLAY_CLASS=SH1106Display
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1

1
variants/thinknode_m1/platformio.ini
View File

@@ -77,6 +77,7 @@ build_flags =
-D DISPLAY_CLASS=GxEPDDisplay -D DISPLAY_CLASS=GxEPDDisplay
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
-D PIN_BUZZER=6 -D PIN_BUZZER=6
-D AUTO_SHUTDOWN_MILLIVOLTS=3300
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${ThinkNode_M1.build_src_filter} build_src_filter = ${ThinkNode_M1.build_src_filter}

69
variants/xiao_c3/platformio.ini
View File

@@ -19,28 +19,6 @@ build_flags =
build_src_filter = ${esp32_base.build_src_filter} build_src_filter = ${esp32_base.build_src_filter}
+<../variants/xiao_c3> +<../variants/xiao_c3>
[Xiao_esp32_C3_custom]
extends = esp32_base
board = seeed_xiao_esp32c3
build_flags =
${esp32_base.build_flags}
-I variants/xiao_c3
-D ESP32_CPU_FREQ=80
-D LORA_TX_BOOST_PIN=D3
-D P_LORA_TX_LED=D5
-D PIN_VBAT_READ=D0
-D P_LORA_DIO_1=D2
-D P_LORA_NSS=D4
-D P_LORA_RESET=RADIOLIB_NC
-D P_LORA_BUSY=D1
-D PIN_BOARD_SDA=D6
-D PIN_BOARD_SCL=D7
-D SX126X_DIO2_AS_RF_SWITCH=true
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
-D SX126X_CURRENT_LIMIT=140
build_src_filter = ${esp32_base.build_src_filter}
+<../variants/xiao_c3>
[env:Xiao_C3_Repeater_sx1262] [env:Xiao_C3_Repeater_sx1262]
extends = Xiao_esp32_C3 extends = Xiao_esp32_C3
build_src_filter = ${Xiao_esp32_C3.build_src_filter} build_src_filter = ${Xiao_esp32_C3.build_src_filter}
@@ -74,7 +52,7 @@ build_flags =
-D WRAPPER_CLASS=CustomSX1262Wrapper -D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RX_BOOSTED_GAIN=1 -D SX126X_RX_BOOSTED_GAIN=1
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
@@ -97,7 +75,7 @@ build_flags =
-D WRAPPER_CLASS=CustomSX1262Wrapper -D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RX_BOOSTED_GAIN=1 -D SX126X_RX_BOOSTED_GAIN=1
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
; -D BLE_DEBUG_LOGGING=1 ; -D BLE_DEBUG_LOGGING=1
@@ -107,46 +85,3 @@ lib_deps =
${Xiao_esp32_C3.lib_deps} ${Xiao_esp32_C3.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:Xiao_C3_Repeater_sx1262_custom]
extends = Xiao_esp32_C3_custom
build_src_filter = ${Xiao_esp32_C3_custom.build_src_filter}
+<../examples/simple_repeater/main.cpp>
build_flags =
${Xiao_esp32_C3_custom.build_flags}
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RX_BOOSTED_GAIN=1
-D LORA_TX_POWER=22
-D ADVERT_NAME='"Xiao Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=8
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps =
${Xiao_esp32_C3_custom.lib_deps}
${esp32_ota.lib_deps}
bakercp/CRC32 @ ^2.0.0
[env:Xiao_C3_Repeater_sx1268_custom]
extends = Xiao_esp32_C3_custom
build_src_filter = ${Xiao_esp32_C3_custom.build_src_filter}
+<../examples/simple_repeater/main.cpp>
build_flags =
${Xiao_esp32_C3_custom.build_flags}
-D RADIO_CLASS=CustomSX1268
-D WRAPPER_CLASS=CustomSX1268Wrapper
-D LORA_TX_POWER=22
-D ADVERT_NAME='"Xiao Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=8
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps =
${Xiao_esp32_C3_custom.lib_deps}
${esp32_ota.lib_deps}
bakercp/CRC32 @ ^2.0.0

6
variants/xiao_c6/platformio.ini
View File

@@ -50,7 +50,7 @@ lib_deps =
[env:Xiao_C6_companion_radio_ble] [env:Xiao_C6_companion_radio_ble]
extends = Xiao_C6 extends = Xiao_C6
build_flags = ${Xiao_C6.build_flags} build_flags = ${Xiao_C6.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1
@@ -107,7 +107,7 @@ lib_deps =
[env:Meshimi_companion_radio_ble] [env:Meshimi_companion_radio_ble]
extends = Meshimi extends = Meshimi
build_flags = ${Meshimi.build_flags} build_flags = ${Meshimi.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1
@@ -167,7 +167,7 @@ lib_deps =
[env:WHY2025_badge_companion_radio_ble] [env:WHY2025_badge_companion_radio_ble]
extends = WHY2025_badge extends = WHY2025_badge
build_flags = ${WHY2025_badge.build_flags} build_flags = ${WHY2025_badge.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1

12
variants/xiao_s3_wio/platformio.ini
View File

@@ -65,7 +65,7 @@ lib_deps =
extends = Xiao_S3_WIO extends = Xiao_S3_WIO
build_flags = build_flags =
${Xiao_S3_WIO.build_flags} ${Xiao_S3_WIO.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@@ -80,7 +80,7 @@ extends = Xiao_S3_WIO
build_flags = build_flags =
${Xiao_S3_WIO.build_flags} ${Xiao_S3_WIO.build_flags}
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=100 -D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
@@ -103,15 +103,21 @@ lib_deps =
extends = Xiao_S3_WIO extends = Xiao_S3_WIO
build_flags = build_flags =
${Xiao_S3_WIO.build_flags} ${Xiao_S3_WIO.build_flags}
-D MAX_CONTACTS=100 -I examples/companion_radio/ui-new
-D MAX_CONTACTS=300
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D DISPLAY_CLASS=SSD1306Display
-D SERIAL_TX=D6 -D SERIAL_TX=D6
-D SERIAL_RX=D7 -D SERIAL_RX=D7
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Xiao_S3_WIO.build_src_filter} build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
${Xiao_S3_WIO.lib_deps} ${Xiao_S3_WIO.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
adafruit/Adafruit SSD1306 @ ^2.5.13