From c88b50c130d388af484d3487105b9a54b525beea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Sat, 21 Jun 2025 02:21:49 +0100 Subject: [PATCH 1/3] MACRO cleanup --- platformio.ini | 30 ++++++++++-- src/helpers/RadioLibWrappers.cpp | 1 - variants/generic-e22/platformio.ini | 4 -- variants/generic-e22/target.h | 1 - variants/generic_espnow/platformio.ini | 8 --- variants/heltec_ct62/platformio.ini | 12 ----- variants/heltec_ct62/target.h | 1 - variants/heltec_tracker/platformio.ini | 7 --- variants/heltec_tracker/target.h | 1 - variants/heltec_v2/platformio.ini | 11 ----- variants/heltec_v2/target.h | 1 - variants/heltec_v3/platformio.ini | 20 -------- variants/heltec_v3/target.h | 1 - variants/lilygo_t3s3/platformio.ini | 11 ----- variants/lilygo_t3s3/target.h | 1 - variants/lilygo_t3s3_sx1276/platformio.ini | 11 ----- variants/lilygo_t3s3_sx1276/target.h | 1 - variants/lilygo_tbeam/platformio.ini | 6 --- variants/lilygo_tbeam/target.h | 1 - variants/lilygo_tbeam_SX1262/platformio.ini | 8 --- variants/lilygo_tbeam_SX1262/target.h | 1 - .../platformio.ini | 7 --- variants/lilygo_tbeam_supreme_SX1262/target.h | 1 - variants/lilygo_tlora_c6/platformio.ini | 9 ---- variants/lilygo_tlora_c6/target.h | 1 - variants/lilygo_tlora_v2_1/platformio.ini | 12 ----- variants/lilygo_tlora_v2_1/target.h | 1 - variants/nano_g2_ultra/platformio.ini | 3 -- variants/nano_g2_ultra/target.h | 1 - variants/picow/platformio.ini | 37 -------------- variants/picow/target.h | 1 - variants/promicro/platformio.ini | 22 --------- variants/promicro/target.h | 1 - variants/rak3x72/target.h | 1 - variants/rak4631/platformio.ini | 14 ------ variants/rak4631/target.h | 1 - variants/station_g2/platformio.ini | 9 ---- variants/station_g2/target.h | 1 - variants/t1000-e/platformio.ini | 3 -- variants/t1000-e/target.h | 1 - variants/t114/platformio.ini | 11 ----- variants/t114/target.h | 1 - variants/techo/platformio.ini | 7 --- variants/techo/target.h | 1 - variants/thinknode_m1/platformio.ini | 7 --- variants/thinknode_m1/target.h | 1 - variants/waveshare_rp2040_lora/platformio.ini | 49 +------------------ variants/waveshare_rp2040_lora/target.h | 2 - variants/wio-e5-dev/target.h | 1 - variants/wio-e5-mini/target.h | 1 - variants/xiao_c3/platformio.ini | 4 -- variants/xiao_c3/target.h | 1 - variants/xiao_nrf52/platformio.ini | 9 ---- variants/xiao_nrf52/target.h | 1 - variants/xiao_s3_wio/platformio.ini | 11 ----- variants/xiao_s3_wio/target.h | 1 - 56 files changed, 26 insertions(+), 346 deletions(-) diff --git a/platformio.ini b/platformio.ini index 90e7cfb0..e885dd86 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,15 +23,35 @@ lib_deps = adafruit/RTClib @ ^2.1.3 melopero/Melopero RV3028 @ ^1.1.0 electroniccats/CayenneLPP @ 1.4.0 -build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1 +build_src_filter = + +<*.cpp> + + +build_flags = -w -D NDEBUG +;-- radiolib settings + -D RADIOLIB_STATIC_ONLY=1 + -D RADIOLIB_GODMODE=1 +;-- LoRa defaults -D LORA_FREQ=869.525 -D LORA_BW=250 -D LORA_SF=11 - -D ENABLE_PRIVATE_KEY_IMPORT=1 ; NOTE: comment these out for more secure firmware +;-- comment these out for more secure firmware + -D ENABLE_PRIVATE_KEY_IMPORT=1 -D ENABLE_PRIVATE_KEY_EXPORT=1 -build_src_filter = - +<*.cpp> - + +;-- meshcore debug options +; -D BLE_DEBUG_LOGGING +; -D ESPNOW_DEBUG_LOGGING +; -D MESH_DEBUG +; -D MESH_PACKET_LOGGING +;-- arduino-pico debug options +; -D DEBUG_RP2040_SPI +; -D DEBUG_RP2040_WIRE +; -D DEBUG_RP2040_CORE +; -D DEBUG_RP2040_PORT=Serial +;-- radiolib debug options +; -D RADIOLIB_DEBUG_SPI +; -D RADIOLIB_DEBUG_BASIC +; -D RADIOLIB_DEBUG_PROTOCOL +; -D RADIOLIB_DEBUG_PORT=Serial ; ----------------- ESP32 --------------------- diff --git a/src/helpers/RadioLibWrappers.cpp b/src/helpers/RadioLibWrappers.cpp index 96fb7aab..b6076e1e 100644 --- a/src/helpers/RadioLibWrappers.cpp +++ b/src/helpers/RadioLibWrappers.cpp @@ -1,5 +1,4 @@ -#define RADIOLIB_STATIC_ONLY 1 #include "RadioLibWrappers.h" #define STATE_IDLE 0 diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index 8b2c293b..a8b17931 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -41,8 +41,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Generic_E22.lib_deps} ${esp32_ota.lib_deps} @@ -61,8 +59,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Generic_E22.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/generic-e22/target.h b/variants/generic-e22/target.h index e5c116e1..b28a7c66 100644 --- a/variants/generic-e22/target.h +++ b/variants/generic-e22/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini index dbc902f0..a3e2d152 100644 --- a/variants/generic_espnow/platformio.ini +++ b/variants/generic_espnow/platformio.ini @@ -13,11 +13,6 @@ build_flags = -D PIN_BOARD_SCL=-1 ; -D P_LORA_TX_LED=8 -D PIN_USER_BTN=0 -; -D ARDUINO_USB_MODE=1 -; -D ARDUINO_USB_CDC_ON_BOOT=1 -; -D ESPNOW_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${esp32_base.build_src_filter} + +<../variants/generic_espnow> @@ -56,9 +51,6 @@ build_flags = ${Generic_ESPNOW.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 -; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${Generic_ESPNOW.build_src_filter} +<../examples/companion_radio> lib_deps = diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini index ba23a5a6..7388b668 100644 --- a/variants/heltec_ct62/platformio.ini +++ b/variants/heltec_ct62/platformio.ini @@ -34,15 +34,11 @@ build_src_filter = ${esp32_base.build_src_filter} extends = Heltec_ct62 build_flags = ${Heltec_ct62.build_flags} - ;-D ARDUINO_USB_MODE=1 - ;-D ARDUINO_USB_CDC_ON_BOOT=1 -D ADVERT_NAME='"HT-CT62 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 build_src_filter = ${Heltec_ct62.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -53,13 +49,9 @@ lib_deps = extends = Heltec_ct62 build_flags = ${Heltec_ct62.build_flags} -; -D ARDUINO_USB_MODE=1 -; -D ARDUINO_USB_CDC_ON_BOOT=1 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} +<../examples/companion_radio> lib_deps = @@ -71,14 +63,10 @@ lib_deps = extends = Heltec_ct62 build_flags = ${Heltec_ct62.build_flags} -; -D ARDUINO_USB_MODE=1 -; -D ARDUINO_USB_CDC_ON_BOOT=1 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D OFFLINE_QUEUE_SIZE=256 -D BLE_PIN_CODE=123456 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} +<../examples/companion_radio> + diff --git a/variants/heltec_ct62/target.h b/variants/heltec_ct62/target.h index ff114e6e..d83976fb 100644 --- a/variants/heltec_ct62/target.h +++ b/variants/heltec_ct62/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include "HT-CT62Board.h" diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index 8d9013a5..9b47540c 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -46,9 +46,6 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -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} + +<../examples/companion_radio> @@ -68,8 +65,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + +<../examples/simple_repeater> @@ -88,8 +83,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + +<../examples/simple_room_server> diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h index 3184bec9..e589e278 100644 --- a/variants/heltec_tracker/target.h +++ b/variants/heltec_tracker/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index 562b309d..ec6d224c 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -30,8 +30,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<../examples/simple_repeater> + @@ -49,8 +47,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} + +<../examples/simple_room_server> @@ -64,8 +60,6 @@ build_flags = ${Heltec_lora32_v2.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -79,8 +73,6 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + @@ -97,10 +89,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=0 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + diff --git a/variants/heltec_v2/target.h b/variants/heltec_v2/target.h index f758c193..66d8dd33 100644 --- a/variants/heltec_v2/target.h +++ b/variants/heltec_v2/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index e8818fdd..2cd6ba03 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -42,8 +42,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/simple_repeater> @@ -61,8 +59,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/simple_room_server> @@ -76,8 +72,6 @@ build_flags = ${Heltec_lora32_v3.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -91,8 +85,6 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=SSD1306Display -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/companion_radio> @@ -108,10 +100,7 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=SSD1306Display -D BLE_PIN_CODE=0 ; dynamic, random PIN - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + @@ -130,8 +119,6 @@ build_flags = -D WIFI_DEBUG_LOGGING=1 -D WIFI_SSID='"myssid"' -D WIFI_PWD='"mypwd"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + @@ -149,8 +136,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -168,8 +153,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -181,10 +164,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/heltec_v3/target.h b/variants/heltec_v3/target.h index 701f9cd5..816bc798 100644 --- a/variants/heltec_v3/target.h +++ b/variants/heltec_v3/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index f3a95e96..3f2f1160 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/variants/lilygo_t3s3/platformio.ini @@ -43,8 +43,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + +<../examples/simple_repeater> @@ -58,8 +56,6 @@ build_flags = ${LilyGo_T3S3_sx1262.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -76,8 +72,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + +<../examples/simple_room_server> @@ -92,8 +86,6 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + +<../examples/companion_radio> @@ -109,10 +101,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + diff --git a/variants/lilygo_t3s3/target.h b/variants/lilygo_t3s3/target.h index 609248ae..1709129f 100644 --- a/variants/lilygo_t3s3/target.h +++ b/variants/lilygo_t3s3/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini index 1bcbbbf9..40d35972 100644 --- a/variants/lilygo_t3s3_sx1276/platformio.ini +++ b/variants/lilygo_t3s3_sx1276/platformio.ini @@ -39,8 +39,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 - ; -D MESH_PACKET_LOGGING=1 - ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + +<../examples/simple_repeater> @@ -54,8 +52,6 @@ build_flags = ${LilyGo_T3S3_sx1276.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -72,8 +68,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + +<../examples/simple_room_server> @@ -89,8 +83,6 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 - -D MESH_PACKET_LOGGING=1 - -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + +<../examples/companion_radio> @@ -106,10 +98,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + diff --git a/variants/lilygo_t3s3_sx1276/target.h b/variants/lilygo_t3s3_sx1276/target.h index c5fc0be0..d758914b 100644 --- a/variants/lilygo_t3s3_sx1276/target.h +++ b/variants/lilygo_t3s3_sx1276/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tbeam/platformio.ini b/variants/lilygo_tbeam/platformio.ini index 4369243d..abba535c 100644 --- a/variants/lilygo_tbeam/platformio.ini +++ b/variants/lilygo_tbeam/platformio.ini @@ -30,11 +30,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D RADIOLIB_DEBUG_BASIC=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam.build_src_filter} + + @@ -53,8 +49,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam.build_src_filter} + +<../examples/simple_repeater> diff --git a/variants/lilygo_tbeam/target.h b/variants/lilygo_tbeam/target.h index 4a9f0b3c..07d6a9b9 100644 --- a/variants/lilygo_tbeam/target.h +++ b/variants/lilygo_tbeam/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index 153fc6fa..329f16e3 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -34,12 +34,6 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -; -D RADIOLIB_DEBUG_BASIC=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + + @@ -58,8 +52,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + +<../examples/simple_repeater> diff --git a/variants/lilygo_tbeam_SX1262/target.h b/variants/lilygo_tbeam_SX1262/target.h index 3f4d77fa..cb2665e6 100644 --- a/variants/lilygo_tbeam_SX1262/target.h +++ b/variants/lilygo_tbeam_SX1262/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index bcc51703..a3cf9006 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini @@ -35,8 +35,6 @@ build_flags = -D ADVERT_LON=0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -52,8 +50,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} +<../examples/simple_room_server> lib_deps = @@ -68,9 +64,6 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=8 -; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.h b/variants/lilygo_tbeam_supreme_SX1262/target.h index a3023750..2aaeb510 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.h +++ b/variants/lilygo_tbeam_supreme_SX1262/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini index 7f89c3da..b1bfcfe8 100644 --- a/variants/lilygo_tlora_c6/platformio.ini +++ b/variants/lilygo_tlora_c6/platformio.ini @@ -41,8 +41,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${tlora_c6.lib_deps} ; ${esp32_ota.lib_deps} @@ -58,8 +56,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${tlora_c6.lib_deps} ; ${esp32_ota.lib_deps} @@ -70,12 +66,7 @@ build_flags = ${tlora_c6.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 - -D ENABLE_PRIVATE_KEY_IMPORT=1 - -D ENABLE_PRIVATE_KEY_EXPORT=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${tlora_c6.build_src_filter} + - diff --git a/variants/lilygo_tlora_c6/target.h b/variants/lilygo_tlora_c6/target.h index eef923ab..8aa623af 100644 --- a/variants/lilygo_tlora_c6/target.h +++ b/variants/lilygo_tlora_c6/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index d9cecfc2..eb7bab1b 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -44,9 +44,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -; -D CORE_DEBUG_LEVEL=3 lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} ${esp32_ota.lib_deps} @@ -57,8 +54,6 @@ build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + +<../examples/simple_repeater> @@ -72,8 +67,6 @@ build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + +<../examples/companion_radio> @@ -89,9 +82,6 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + @@ -112,8 +102,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/lilygo_tlora_v2_1/target.h b/variants/lilygo_tlora_v2_1/target.h index edf28eb4..9780f840 100644 --- a/variants/lilygo_tlora_v2_1/target.h +++ b/variants/lilygo_tlora_v2_1/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index 20928bdf..f44902cf 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -37,12 +37,9 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=0 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SH1106Display -D PIN_BUZZER=4 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h index e0d891e9..2984a1a6 100644 --- a/variants/nano_g2_ultra/target.h +++ b/variants/nano_g2_ultra/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include "nano-g2.h" #include diff --git a/variants/picow/platformio.ini b/variants/picow/platformio.ini index 8b6c2506..62b17484 100644 --- a/variants/picow/platformio.ini +++ b/variants/picow/platformio.ini @@ -26,8 +26,6 @@ build_flags = ${picow.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/simple_repeater> @@ -39,8 +37,6 @@ build_flags = ${picow.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/simple_room_server> @@ -49,49 +45,16 @@ extends = picow build_flags = ${picow.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/companion_radio> lib_deps = ${picow.lib_deps} densaugeo/base64 @ ~1.4.0 -; [env:PicoW_companion_radio_ble] -; extends = picow -; build_flags = ${picow.build_flags} -; -D MAX_CONTACTS=100 -; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 -; -D BLE_DEBUG_LOGGING=1 -; ; -D MESH_PACKET_LOGGING=1 -; ; -D MESH_DEBUG=1 -; build_src_filter = ${picow.build_src_filter} -; +<../examples/companion_radio> -; lib_deps = ${picow.lib_deps} -; densaugeo/base64 @ ~1.4.0 - -; [env:PicoW_companion_radio_wifi] -; extends = picow -; build_flags = ${picow.build_flags} -; -D MAX_CONTACTS=100 -; -D MAX_GROUP_CHANNELS=8 -; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' -; ; -D MESH_PACKET_LOGGING=1 -; ; -D MESH_DEBUG=1 -; build_src_filter = ${picow.build_src_filter} -; +<../examples/companion_radio> -; lib_deps = ${picow.lib_deps} -; densaugeo/base64 @ ~1.4.0 - [env:PicoW_terminal_chat] extends = picow build_flags = ${picow.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${picow.lib_deps} diff --git a/variants/picow/target.h b/variants/picow/target.h index a89b5ba8..72da4ada 100644 --- a/variants/picow/target.h +++ b/variants/picow/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index e7099d1e..eb7cb366 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -46,8 +46,6 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -D DISPLAY_CLASS=SSD1306Display -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -63,8 +61,6 @@ build_flags = ${Faketec.build_flags} -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -D DISPLAY_CLASS=SSD1306Display -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -73,8 +69,6 @@ extends = Faketec build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${Faketec.lib_deps} @@ -87,8 +81,6 @@ build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=SSD1306Display -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} +<../examples/companion_radio> + @@ -102,11 +94,8 @@ build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SSD1306Display -; -D MESH_PACKET_LOGGING=1 - -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} + +<../examples/companion_radio> @@ -145,8 +134,6 @@ build_flags = ${ProMicroLLCC68.build_flags} -D ADVERT_NAME='"ProMicroLLCC68 Repeater"' -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${ProMicroLLCC68.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -158,8 +145,6 @@ build_flags = ${ProMicroLLCC68.build_flags} -D ADVERT_NAME='"ProMicroLLCC68 Room"' -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${ProMicroLLCC68.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -168,8 +153,6 @@ extends = ProMicroLLCC68 build_flags = ${ProMicroLLCC68.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${ProMicroLLCC68.lib_deps} @@ -181,8 +164,6 @@ extends = ProMicroLLCC68 build_flags = ${ProMicroLLCC68.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/companion_radio> lib_deps = ${ProMicroLLCC68.lib_deps} @@ -195,10 +176,7 @@ build_flags = ${ProMicroLLCC68.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${ProMicroLLCC68.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/promicro/target.h b/variants/promicro/target.h index c634d18a..a1c00f93 100644 --- a/variants/promicro/target.h +++ b/variants/promicro/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/rak3x72/target.h b/variants/rak3x72/target.h index c39b69b1..4efa7335 100644 --- a/variants/rak3x72/target.h +++ b/variants/rak3x72/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index 3014bc59..7becc7b1 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -35,8 +35,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_repeater> @@ -51,8 +49,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_room_server> @@ -64,8 +60,6 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + +<../examples/companion_radio> @@ -81,10 +75,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + + @@ -101,11 +92,8 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D ENV_INCLUDE_GPS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + + @@ -120,8 +108,6 @@ build_flags = ${rak4631.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h index 3e6db0aa..06c5b4c8 100644 --- a/variants/rak4631/target.h +++ b/variants/rak4631/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index 8ba368bd..28f8a4f5 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -36,8 +36,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -55,8 +53,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -68,8 +64,6 @@ build_flags = -D DISPLAY_CLASS=SH1106Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + +<../examples/companion_radio> @@ -85,10 +79,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + + diff --git a/variants/station_g2/target.h b/variants/station_g2/target.h index 695e700a..1519259d 100644 --- a/variants/station_g2/target.h +++ b/variants/station_g2/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index 00974208..50927483 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -40,9 +40,6 @@ build_flags = ${t1000-e.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -D OFFLINE_QUEUE_SIZE=256 -D RX_BOOSTED_GAIN=true -D RF_SWITCH_TABLE diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h index 1b569481..f8cb66da 100644 --- a/variants/t1000-e/target.h +++ b/variants/t1000-e/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/t114/platformio.ini b/variants/t114/platformio.ini index dac12da9..b2cb0167 100644 --- a/variants/t114/platformio.ini +++ b/variants/t114/platformio.ini @@ -51,8 +51,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 [env:Heltec_t114_room_server] extends = Heltec_t114 @@ -65,8 +63,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 [env:Heltec_t114_companion_radio_ble] extends = Heltec_t114 @@ -75,10 +71,7 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + +<../examples/companion_radio> @@ -92,10 +85,6 @@ build_flags = ${Heltec_t114.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/t114/target.h b/variants/t114/target.h index 0f6ebaa1..53c12f5a 100644 --- a/variants/t114/target.h +++ b/variants/t114/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/techo/platformio.ini b/variants/techo/platformio.ini index 8ad5ca03..b7894819 100644 --- a/variants/techo/platformio.ini +++ b/variants/techo/platformio.ini @@ -41,8 +41,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 [env:LilyGo_T-Echo_room_server] extends = LilyGo_Techo @@ -53,8 +51,6 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 [env:LilyGo_T-Echo_companion_radio_ble] extends = LilyGo_Techo @@ -64,11 +60,8 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D DISPLAY_CLASS=GxEPDDisplay -D OFFLINE_QUEUE_SIZE=256 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_Techo.build_src_filter} + + diff --git a/variants/techo/target.h b/variants/techo/target.h index 8fb8b6ca..98d4e565 100644 --- a/variants/techo/target.h +++ b/variants/techo/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index 2104a080..84b5d04d 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -41,8 +41,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} +<../examples/simple_repeater/main.cpp> lib_deps = @@ -56,8 +54,6 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} +<../examples/simple_room_server/main.cpp> lib_deps = @@ -71,13 +67,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 - -D BLE_DEBUG_LOGGING=1 -D DISPLAY_ROTATION=4 -D DISPLAY_CLASS=GxEPDDisplay -D OFFLINE_QUEUE_SIZE=256 -D PIN_BUZZER=6 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} + + diff --git a/variants/thinknode_m1/target.h b/variants/thinknode_m1/target.h index 550ee62a..8c8a5991 100644 --- a/variants/thinknode_m1/target.h +++ b/variants/thinknode_m1/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index 2730734d..fa6a9aae 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -3,28 +3,18 @@ [waveshare_rp2040_lora] extends = rp2040_base - board = pico board_build.filesystem_size = 0.5m - build_flags = ${rp2040_base.build_flags} -I variants/waveshare_rp2040_lora - -D SX126X_CURRENT_LIMIT=140 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 + -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 -; Debug options - ; -D DEBUG_RP2040_WIRE=1 - ; -D DEBUG_RP2040_SPI=1 - ; -D DEBUG_RP2040_CORE=1 - ; -D RADIOLIB_DEBUG_SPI=1 - ; -D DEBUG_RP2040_PORT=Serial - build_src_filter = ${rp2040_base.build_src_filter} + +<../variants/waveshare_rp2040_lora> - lib_deps = ${rp2040_base.lib_deps} [env:waveshare_rp2040_lora_Repeater] @@ -35,8 +25,6 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/simple_repeater> @@ -48,8 +36,6 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/simple_room_server> @@ -58,49 +44,16 @@ extends = waveshare_rp2040_lora build_flags = ${waveshare_rp2040_lora.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/companion_radio> lib_deps = ${waveshare_rp2040_lora.lib_deps} densaugeo/base64 @ ~1.4.0 -; [env:waveshare_rp2040_lora_companion_radio_ble] -; extends = waveshare_rp2040_lora -; build_flags = ${waveshare_rp2040_lora.build_flags} -; -D MAX_CONTACTS=100 -; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 -; -D BLE_DEBUG_LOGGING=1 -; ; -D MESH_PACKET_LOGGING=1 -; ; -D MESH_DEBUG=1 -; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} -; +<../examples/companion_radio> -; lib_deps = ${waveshare_rp2040_lora.lib_deps} -; densaugeo/base64 @ ~1.4.0 - -; [env:waveshare_rp2040_lora_companion_radio_wifi] -; extends = waveshare_rp2040_lora -; build_flags = ${waveshare_rp2040_lora.build_flags} -; -D MAX_CONTACTS=100 -; -D MAX_GROUP_CHANNELS=8 -; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' -; ; -D MESH_PACKET_LOGGING=1 -; ; -D MESH_DEBUG=1 -; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} -; +<../examples/companion_radio> -; lib_deps = ${waveshare_rp2040_lora.lib_deps} -; densaugeo/base64 @ ~1.4.0 - [env:waveshare_rp2040_lora_terminal_chat] extends = waveshare_rp2040_lora build_flags = ${waveshare_rp2040_lora.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${waveshare_rp2040_lora.lib_deps} diff --git a/variants/waveshare_rp2040_lora/target.h b/variants/waveshare_rp2040_lora/target.h index 3ebe0570..831a2640 100644 --- a/variants/waveshare_rp2040_lora/target.h +++ b/variants/waveshare_rp2040_lora/target.h @@ -1,7 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 - #include #include #include diff --git a/variants/wio-e5-dev/target.h b/variants/wio-e5-dev/target.h index 83fd9cf1..9ac78093 100644 --- a/variants/wio-e5-dev/target.h +++ b/variants/wio-e5-dev/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/wio-e5-mini/target.h b/variants/wio-e5-mini/target.h index 4b510d56..33698e0f 100644 --- a/variants/wio-e5-mini/target.h +++ b/variants/wio-e5-mini/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini index 55baf2b8..b802ce8a 100644 --- a/variants/xiao_c3/platformio.ini +++ b/variants/xiao_c3/platformio.ini @@ -35,8 +35,6 @@ build_flags = -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.lib_deps} ${esp32_ota.lib_deps} @@ -55,8 +53,6 @@ build_flags = -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.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/xiao_c3/target.h b/variants/xiao_c3/target.h index 0aea87dd..8bb9c6ee 100644 --- a/variants/xiao_c3/target.h +++ b/variants/xiao_c3/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index c4934e04..5dfc3f15 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -64,9 +64,6 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} + +<../examples/companion_radio> @@ -80,8 +77,6 @@ build_flags = ${Xiao_nrf52.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} + +<../examples/companion_radio> @@ -104,8 +99,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} +<../examples/simple_repeater/main.cpp> @@ -123,7 +116,5 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} +<../examples/simple_room_server/main.cpp> \ No newline at end of file diff --git a/variants/xiao_nrf52/target.h b/variants/xiao_nrf52/target.h index eb299006..6c53e2d2 100644 --- a/variants/xiao_nrf52/target.h +++ b/variants/xiao_nrf52/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index 4d6fed88..ac2764ed 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -38,8 +38,6 @@ build_flags = -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_S3_WIO.lib_deps} ${esp32_ota.lib_deps} @@ -55,8 +53,6 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 lib_deps = ${Xiao_S3_WIO.lib_deps} ${esp32_ota.lib_deps} @@ -67,8 +63,6 @@ build_flags = ${Xiao_S3_WIO.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -84,9 +78,6 @@ build_flags = -D BLE_PIN_CODE=123456 -D DISPLAY_CLASS=SSD1306Display -D OFFLINE_QUEUE_SIZE=256 -; -D BLE_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + @@ -104,8 +95,6 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D SERIAL_TX=D6 -D SERIAL_RX=D7 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h index 609248ae..1709129f 100644 --- a/variants/xiao_s3_wio/target.h +++ b/variants/xiao_s3_wio/target.h @@ -1,6 +1,5 @@ #pragma once -#define RADIOLIB_STATIC_ONLY 1 #include #include #include From ce1650a5bca446a4768b63ec017332a1955adb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Tue, 1 Jul 2025 14:02:33 +0100 Subject: [PATCH 2/3] Revert "MACRO cleanup" This reverts commit c88b50c130d388af484d3487105b9a54b525beea. --- platformio.ini | 30 ++---------- src/helpers/RadioLibWrappers.cpp | 1 + variants/generic-e22/platformio.ini | 4 ++ variants/generic-e22/target.h | 1 + variants/generic_espnow/platformio.ini | 8 +++ variants/heltec_ct62/platformio.ini | 12 +++++ variants/heltec_ct62/target.h | 1 + variants/heltec_tracker/platformio.ini | 7 +++ variants/heltec_tracker/target.h | 1 + variants/heltec_v2/platformio.ini | 11 +++++ variants/heltec_v2/target.h | 1 + variants/heltec_v3/platformio.ini | 20 ++++++++ variants/heltec_v3/target.h | 1 + variants/lilygo_t3s3/platformio.ini | 11 +++++ variants/lilygo_t3s3/target.h | 1 + variants/lilygo_t3s3_sx1276/platformio.ini | 11 +++++ variants/lilygo_t3s3_sx1276/target.h | 1 + variants/lilygo_tbeam/platformio.ini | 6 +++ variants/lilygo_tbeam/target.h | 1 + variants/lilygo_tbeam_SX1262/platformio.ini | 8 +++ variants/lilygo_tbeam_SX1262/target.h | 1 + .../platformio.ini | 7 +++ variants/lilygo_tbeam_supreme_SX1262/target.h | 1 + variants/lilygo_tlora_c6/platformio.ini | 9 ++++ variants/lilygo_tlora_c6/target.h | 1 + variants/lilygo_tlora_v2_1/platformio.ini | 12 +++++ variants/lilygo_tlora_v2_1/target.h | 1 + variants/nano_g2_ultra/platformio.ini | 3 ++ variants/nano_g2_ultra/target.h | 1 + variants/picow/platformio.ini | 37 ++++++++++++++ variants/picow/target.h | 1 + variants/promicro/platformio.ini | 22 +++++++++ variants/promicro/target.h | 1 + variants/rak3x72/target.h | 1 + variants/rak4631/platformio.ini | 14 ++++++ variants/rak4631/target.h | 1 + variants/station_g2/platformio.ini | 9 ++++ variants/station_g2/target.h | 1 + variants/t1000-e/platformio.ini | 3 ++ variants/t1000-e/target.h | 1 + variants/t114/platformio.ini | 11 +++++ variants/t114/target.h | 1 + variants/techo/platformio.ini | 7 +++ variants/techo/target.h | 1 + variants/thinknode_m1/platformio.ini | 7 +++ variants/thinknode_m1/target.h | 1 + variants/waveshare_rp2040_lora/platformio.ini | 49 ++++++++++++++++++- variants/waveshare_rp2040_lora/target.h | 2 + variants/wio-e5-dev/target.h | 1 + variants/wio-e5-mini/target.h | 1 + variants/xiao_c3/platformio.ini | 4 ++ variants/xiao_c3/target.h | 1 + variants/xiao_nrf52/platformio.ini | 9 ++++ variants/xiao_nrf52/target.h | 1 + variants/xiao_s3_wio/platformio.ini | 11 +++++ variants/xiao_s3_wio/target.h | 1 + 56 files changed, 346 insertions(+), 26 deletions(-) diff --git a/platformio.ini b/platformio.ini index e885dd86..90e7cfb0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,35 +23,15 @@ lib_deps = adafruit/RTClib @ ^2.1.3 melopero/Melopero RV3028 @ ^1.1.0 electroniccats/CayenneLPP @ 1.4.0 -build_src_filter = - +<*.cpp> - + -build_flags = -w -D NDEBUG -;-- radiolib settings - -D RADIOLIB_STATIC_ONLY=1 - -D RADIOLIB_GODMODE=1 -;-- LoRa defaults +build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1 -D LORA_FREQ=869.525 -D LORA_BW=250 -D LORA_SF=11 -;-- comment these out for more secure firmware - -D ENABLE_PRIVATE_KEY_IMPORT=1 + -D ENABLE_PRIVATE_KEY_IMPORT=1 ; NOTE: comment these out for more secure firmware -D ENABLE_PRIVATE_KEY_EXPORT=1 -;-- meshcore debug options -; -D BLE_DEBUG_LOGGING -; -D ESPNOW_DEBUG_LOGGING -; -D MESH_DEBUG -; -D MESH_PACKET_LOGGING -;-- arduino-pico debug options -; -D DEBUG_RP2040_SPI -; -D DEBUG_RP2040_WIRE -; -D DEBUG_RP2040_CORE -; -D DEBUG_RP2040_PORT=Serial -;-- radiolib debug options -; -D RADIOLIB_DEBUG_SPI -; -D RADIOLIB_DEBUG_BASIC -; -D RADIOLIB_DEBUG_PROTOCOL -; -D RADIOLIB_DEBUG_PORT=Serial +build_src_filter = + +<*.cpp> + + ; ----------------- ESP32 --------------------- diff --git a/src/helpers/RadioLibWrappers.cpp b/src/helpers/RadioLibWrappers.cpp index b6076e1e..96fb7aab 100644 --- a/src/helpers/RadioLibWrappers.cpp +++ b/src/helpers/RadioLibWrappers.cpp @@ -1,4 +1,5 @@ +#define RADIOLIB_STATIC_ONLY 1 #include "RadioLibWrappers.h" #define STATE_IDLE 0 diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index a8b17931..8b2c293b 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -41,6 +41,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Generic_E22.lib_deps} ${esp32_ota.lib_deps} @@ -59,6 +61,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Generic_E22.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/generic-e22/target.h b/variants/generic-e22/target.h index b28a7c66..e5c116e1 100644 --- a/variants/generic-e22/target.h +++ b/variants/generic-e22/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini index a3e2d152..dbc902f0 100644 --- a/variants/generic_espnow/platformio.ini +++ b/variants/generic_espnow/platformio.ini @@ -13,6 +13,11 @@ build_flags = -D PIN_BOARD_SCL=-1 ; -D P_LORA_TX_LED=8 -D PIN_USER_BTN=0 +; -D ARDUINO_USB_MODE=1 +; -D ARDUINO_USB_CDC_ON_BOOT=1 +; -D ESPNOW_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${esp32_base.build_src_filter} + +<../variants/generic_espnow> @@ -51,6 +56,9 @@ build_flags = ${Generic_ESPNOW.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 +; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${Generic_ESPNOW.build_src_filter} +<../examples/companion_radio> lib_deps = diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini index 7388b668..ba23a5a6 100644 --- a/variants/heltec_ct62/platformio.ini +++ b/variants/heltec_ct62/platformio.ini @@ -34,11 +34,15 @@ build_src_filter = ${esp32_base.build_src_filter} extends = Heltec_ct62 build_flags = ${Heltec_ct62.build_flags} + ;-D ARDUINO_USB_MODE=1 + ;-D ARDUINO_USB_CDC_ON_BOOT=1 -D ADVERT_NAME='"HT-CT62 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 build_src_filter = ${Heltec_ct62.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -49,9 +53,13 @@ lib_deps = extends = Heltec_ct62 build_flags = ${Heltec_ct62.build_flags} +; -D ARDUINO_USB_MODE=1 +; -D ARDUINO_USB_CDC_ON_BOOT=1 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} +<../examples/companion_radio> lib_deps = @@ -63,10 +71,14 @@ lib_deps = extends = Heltec_ct62 build_flags = ${Heltec_ct62.build_flags} +; -D ARDUINO_USB_MODE=1 +; -D ARDUINO_USB_CDC_ON_BOOT=1 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D OFFLINE_QUEUE_SIZE=256 -D BLE_PIN_CODE=123456 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} +<../examples/companion_radio> + diff --git a/variants/heltec_ct62/target.h b/variants/heltec_ct62/target.h index d83976fb..ff114e6e 100644 --- a/variants/heltec_ct62/target.h +++ b/variants/heltec_ct62/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include "HT-CT62Board.h" diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index 9b47540c..8d9013a5 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -46,6 +46,9 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -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} + +<../examples/companion_radio> @@ -65,6 +68,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + +<../examples/simple_repeater> @@ -83,6 +88,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + +<../examples/simple_room_server> diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h index e589e278..3184bec9 100644 --- a/variants/heltec_tracker/target.h +++ b/variants/heltec_tracker/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index ec6d224c..562b309d 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -30,6 +30,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<../examples/simple_repeater> + @@ -47,6 +49,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} + +<../examples/simple_room_server> @@ -60,6 +64,8 @@ build_flags = ${Heltec_lora32_v2.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -73,6 +79,8 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + @@ -89,7 +97,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=0 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + diff --git a/variants/heltec_v2/target.h b/variants/heltec_v2/target.h index 66d8dd33..f758c193 100644 --- a/variants/heltec_v2/target.h +++ b/variants/heltec_v2/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 2cd6ba03..e8818fdd 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -42,6 +42,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/simple_repeater> @@ -59,6 +61,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/simple_room_server> @@ -72,6 +76,8 @@ build_flags = ${Heltec_lora32_v3.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -85,6 +91,8 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=SSD1306Display +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/companion_radio> @@ -100,7 +108,10 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=SSD1306Display -D BLE_PIN_CODE=0 ; dynamic, random PIN + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + @@ -119,6 +130,8 @@ build_flags = -D WIFI_DEBUG_LOGGING=1 -D WIFI_SSID='"myssid"' -D WIFI_PWD='"mypwd"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + @@ -136,6 +149,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -153,6 +168,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -164,7 +181,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/heltec_v3/target.h b/variants/heltec_v3/target.h index 816bc798..701f9cd5 100644 --- a/variants/heltec_v3/target.h +++ b/variants/heltec_v3/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index 3f2f1160..f3a95e96 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/variants/lilygo_t3s3/platformio.ini @@ -43,6 +43,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + +<../examples/simple_repeater> @@ -56,6 +58,8 @@ build_flags = ${LilyGo_T3S3_sx1262.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -72,6 +76,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + +<../examples/simple_room_server> @@ -86,6 +92,8 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + +<../examples/companion_radio> @@ -101,7 +109,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + diff --git a/variants/lilygo_t3s3/target.h b/variants/lilygo_t3s3/target.h index 1709129f..609248ae 100644 --- a/variants/lilygo_t3s3/target.h +++ b/variants/lilygo_t3s3/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini index 40d35972..1bcbbbf9 100644 --- a/variants/lilygo_t3s3_sx1276/platformio.ini +++ b/variants/lilygo_t3s3_sx1276/platformio.ini @@ -39,6 +39,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 + ; -D MESH_PACKET_LOGGING=1 + ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + +<../examples/simple_repeater> @@ -52,6 +54,8 @@ build_flags = ${LilyGo_T3S3_sx1276.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -68,6 +72,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + +<../examples/simple_room_server> @@ -83,6 +89,8 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + +<../examples/companion_radio> @@ -98,7 +106,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + diff --git a/variants/lilygo_t3s3_sx1276/target.h b/variants/lilygo_t3s3_sx1276/target.h index d758914b..c5fc0be0 100644 --- a/variants/lilygo_t3s3_sx1276/target.h +++ b/variants/lilygo_t3s3_sx1276/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tbeam/platformio.ini b/variants/lilygo_tbeam/platformio.ini index abba535c..4369243d 100644 --- a/variants/lilygo_tbeam/platformio.ini +++ b/variants/lilygo_tbeam/platformio.ini @@ -30,7 +30,11 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D RADIOLIB_DEBUG_BASIC=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam.build_src_filter} + + @@ -49,6 +53,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam.build_src_filter} + +<../examples/simple_repeater> diff --git a/variants/lilygo_tbeam/target.h b/variants/lilygo_tbeam/target.h index 07d6a9b9..4a9f0b3c 100644 --- a/variants/lilygo_tbeam/target.h +++ b/variants/lilygo_tbeam/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index 329f16e3..153fc6fa 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -34,6 +34,12 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +; -D RADIOLIB_DEBUG_BASIC=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + + @@ -52,6 +58,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + +<../examples/simple_repeater> diff --git a/variants/lilygo_tbeam_SX1262/target.h b/variants/lilygo_tbeam_SX1262/target.h index cb2665e6..3f4d77fa 100644 --- a/variants/lilygo_tbeam_SX1262/target.h +++ b/variants/lilygo_tbeam_SX1262/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index a3cf9006..bcc51703 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini @@ -35,6 +35,8 @@ build_flags = -D ADVERT_LON=0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -50,6 +52,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} +<../examples/simple_room_server> lib_deps = @@ -64,6 +68,9 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=8 +; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.h b/variants/lilygo_tbeam_supreme_SX1262/target.h index 2aaeb510..a3023750 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.h +++ b/variants/lilygo_tbeam_supreme_SX1262/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini index b1bfcfe8..7f89c3da 100644 --- a/variants/lilygo_tlora_c6/platformio.ini +++ b/variants/lilygo_tlora_c6/platformio.ini @@ -41,6 +41,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${tlora_c6.lib_deps} ; ${esp32_ota.lib_deps} @@ -56,6 +58,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${tlora_c6.lib_deps} ; ${esp32_ota.lib_deps} @@ -66,7 +70,12 @@ build_flags = ${tlora_c6.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 + -D ENABLE_PRIVATE_KEY_IMPORT=1 + -D ENABLE_PRIVATE_KEY_EXPORT=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${tlora_c6.build_src_filter} + - diff --git a/variants/lilygo_tlora_c6/target.h b/variants/lilygo_tlora_c6/target.h index 8aa623af..eef923ab 100644 --- a/variants/lilygo_tlora_c6/target.h +++ b/variants/lilygo_tlora_c6/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index eb7bab1b..d9cecfc2 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -44,6 +44,9 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +; -D CORE_DEBUG_LEVEL=3 lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} ${esp32_ota.lib_deps} @@ -54,6 +57,8 @@ build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + +<../examples/simple_repeater> @@ -67,6 +72,8 @@ build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + +<../examples/companion_radio> @@ -82,6 +89,9 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + @@ -102,6 +112,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/lilygo_tlora_v2_1/target.h b/variants/lilygo_tlora_v2_1/target.h index 9780f840..edf28eb4 100644 --- a/variants/lilygo_tlora_v2_1/target.h +++ b/variants/lilygo_tlora_v2_1/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index f44902cf..20928bdf 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -37,9 +37,12 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=0 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SH1106Display -D PIN_BUZZER=4 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h index 2984a1a6..e0d891e9 100644 --- a/variants/nano_g2_ultra/target.h +++ b/variants/nano_g2_ultra/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include "nano-g2.h" #include diff --git a/variants/picow/platformio.ini b/variants/picow/platformio.ini index 62b17484..8b6c2506 100644 --- a/variants/picow/platformio.ini +++ b/variants/picow/platformio.ini @@ -26,6 +26,8 @@ build_flags = ${picow.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/simple_repeater> @@ -37,6 +39,8 @@ build_flags = ${picow.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/simple_room_server> @@ -45,16 +49,49 @@ extends = picow build_flags = ${picow.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/companion_radio> lib_deps = ${picow.lib_deps} densaugeo/base64 @ ~1.4.0 +; [env:PicoW_companion_radio_ble] +; extends = picow +; build_flags = ${picow.build_flags} +; -D MAX_CONTACTS=100 +; -D MAX_GROUP_CHANNELS=8 +; -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 +; ; -D MESH_PACKET_LOGGING=1 +; ; -D MESH_DEBUG=1 +; build_src_filter = ${picow.build_src_filter} +; +<../examples/companion_radio> +; lib_deps = ${picow.lib_deps} +; densaugeo/base64 @ ~1.4.0 + +; [env:PicoW_companion_radio_wifi] +; extends = picow +; build_flags = ${picow.build_flags} +; -D MAX_CONTACTS=100 +; -D MAX_GROUP_CHANNELS=8 +; -D WIFI_DEBUG_LOGGING=1 +; -D WIFI_SSID='"myssid"' +; -D WIFI_PWD='"mypwd"' +; ; -D MESH_PACKET_LOGGING=1 +; ; -D MESH_DEBUG=1 +; build_src_filter = ${picow.build_src_filter} +; +<../examples/companion_radio> +; lib_deps = ${picow.lib_deps} +; densaugeo/base64 @ ~1.4.0 + [env:PicoW_terminal_chat] extends = picow build_flags = ${picow.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${picow.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${picow.lib_deps} diff --git a/variants/picow/target.h b/variants/picow/target.h index 72da4ada..a89b5ba8 100644 --- a/variants/picow/target.h +++ b/variants/picow/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index eb7cb366..e7099d1e 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -46,6 +46,8 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 -D DISPLAY_CLASS=SSD1306Display +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -61,6 +63,8 @@ build_flags = ${Faketec.build_flags} -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -D DISPLAY_CLASS=SSD1306Display +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -69,6 +73,8 @@ extends = Faketec build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${Faketec.lib_deps} @@ -81,6 +87,8 @@ build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=SSD1306Display +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} +<../examples/companion_radio> + @@ -94,8 +102,11 @@ build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SSD1306Display +; -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} + +<../examples/companion_radio> @@ -134,6 +145,8 @@ build_flags = ${ProMicroLLCC68.build_flags} -D ADVERT_NAME='"ProMicroLLCC68 Repeater"' -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${ProMicroLLCC68.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -145,6 +158,8 @@ build_flags = ${ProMicroLLCC68.build_flags} -D ADVERT_NAME='"ProMicroLLCC68 Room"' -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${ProMicroLLCC68.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -153,6 +168,8 @@ extends = ProMicroLLCC68 build_flags = ${ProMicroLLCC68.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${ProMicroLLCC68.lib_deps} @@ -164,6 +181,8 @@ extends = ProMicroLLCC68 build_flags = ${ProMicroLLCC68.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/companion_radio> lib_deps = ${ProMicroLLCC68.lib_deps} @@ -176,7 +195,10 @@ build_flags = ${ProMicroLLCC68.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${ProMicroLLCC68.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/promicro/target.h b/variants/promicro/target.h index a1c00f93..c634d18a 100644 --- a/variants/promicro/target.h +++ b/variants/promicro/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/rak3x72/target.h b/variants/rak3x72/target.h index 4efa7335..c39b69b1 100644 --- a/variants/rak3x72/target.h +++ b/variants/rak3x72/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index 7becc7b1..3014bc59 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -35,6 +35,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_repeater> @@ -49,6 +51,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_room_server> @@ -60,6 +64,8 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + +<../examples/companion_radio> @@ -75,7 +81,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + + @@ -92,8 +101,11 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D ENV_INCLUDE_GPS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + + @@ -108,6 +120,8 @@ build_flags = ${rak4631.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h index 06c5b4c8..3e6db0aa 100644 --- a/variants/rak4631/target.h +++ b/variants/rak4631/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index 28f8a4f5..8ba368bd 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -36,6 +36,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} +<../examples/simple_repeater> lib_deps = @@ -53,6 +55,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -64,6 +68,8 @@ build_flags = -D DISPLAY_CLASS=SH1106Display -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + +<../examples/companion_radio> @@ -79,7 +85,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + + diff --git a/variants/station_g2/target.h b/variants/station_g2/target.h index 1519259d..695e700a 100644 --- a/variants/station_g2/target.h +++ b/variants/station_g2/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index 50927483..00974208 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -40,6 +40,9 @@ build_flags = ${t1000-e.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 -D OFFLINE_QUEUE_SIZE=256 -D RX_BOOSTED_GAIN=true -D RF_SWITCH_TABLE diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h index f8cb66da..1b569481 100644 --- a/variants/t1000-e/target.h +++ b/variants/t1000-e/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/t114/platformio.ini b/variants/t114/platformio.ini index b2cb0167..dac12da9 100644 --- a/variants/t114/platformio.ini +++ b/variants/t114/platformio.ini @@ -51,6 +51,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 [env:Heltec_t114_room_server] extends = Heltec_t114 @@ -63,6 +65,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 [env:Heltec_t114_companion_radio_ble] extends = Heltec_t114 @@ -71,7 +75,10 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + +<../examples/companion_radio> @@ -85,6 +92,10 @@ build_flags = ${Heltec_t114.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/t114/target.h b/variants/t114/target.h index 53c12f5a..0f6ebaa1 100644 --- a/variants/t114/target.h +++ b/variants/t114/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/techo/platformio.ini b/variants/techo/platformio.ini index b7894819..8ad5ca03 100644 --- a/variants/techo/platformio.ini +++ b/variants/techo/platformio.ini @@ -41,6 +41,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 [env:LilyGo_T-Echo_room_server] extends = LilyGo_Techo @@ -51,6 +53,8 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 [env:LilyGo_T-Echo_companion_radio_ble] extends = LilyGo_Techo @@ -60,8 +64,11 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D DISPLAY_CLASS=GxEPDDisplay -D OFFLINE_QUEUE_SIZE=256 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_Techo.build_src_filter} + + diff --git a/variants/techo/target.h b/variants/techo/target.h index 98d4e565..8fb8b6ca 100644 --- a/variants/techo/target.h +++ b/variants/techo/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index 84b5d04d..2104a080 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -41,6 +41,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} +<../examples/simple_repeater/main.cpp> lib_deps = @@ -54,6 +56,8 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} +<../examples/simple_room_server/main.cpp> lib_deps = @@ -67,10 +71,13 @@ build_flags = -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 -D DISPLAY_ROTATION=4 -D DISPLAY_CLASS=GxEPDDisplay -D OFFLINE_QUEUE_SIZE=256 -D PIN_BUZZER=6 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} + + diff --git a/variants/thinknode_m1/target.h b/variants/thinknode_m1/target.h index 8c8a5991..550ee62a 100644 --- a/variants/thinknode_m1/target.h +++ b/variants/thinknode_m1/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index fa6a9aae..2730734d 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -3,18 +3,28 @@ [waveshare_rp2040_lora] extends = rp2040_base + board = pico board_build.filesystem_size = 0.5m + build_flags = ${rp2040_base.build_flags} -I variants/waveshare_rp2040_lora + -D SX126X_CURRENT_LIMIT=140 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 - -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 +; Debug options + ; -D DEBUG_RP2040_WIRE=1 + ; -D DEBUG_RP2040_SPI=1 + ; -D DEBUG_RP2040_CORE=1 + ; -D RADIOLIB_DEBUG_SPI=1 + ; -D DEBUG_RP2040_PORT=Serial + build_src_filter = ${rp2040_base.build_src_filter} + +<../variants/waveshare_rp2040_lora> + lib_deps = ${rp2040_base.lib_deps} [env:waveshare_rp2040_lora_Repeater] @@ -25,6 +35,8 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/simple_repeater> @@ -36,6 +48,8 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/simple_room_server> @@ -44,16 +58,49 @@ extends = waveshare_rp2040_lora build_flags = ${waveshare_rp2040_lora.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/companion_radio> lib_deps = ${waveshare_rp2040_lora.lib_deps} densaugeo/base64 @ ~1.4.0 +; [env:waveshare_rp2040_lora_companion_radio_ble] +; extends = waveshare_rp2040_lora +; build_flags = ${waveshare_rp2040_lora.build_flags} +; -D MAX_CONTACTS=100 +; -D MAX_GROUP_CHANNELS=8 +; -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 +; ; -D MESH_PACKET_LOGGING=1 +; ; -D MESH_DEBUG=1 +; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +; +<../examples/companion_radio> +; lib_deps = ${waveshare_rp2040_lora.lib_deps} +; densaugeo/base64 @ ~1.4.0 + +; [env:waveshare_rp2040_lora_companion_radio_wifi] +; extends = waveshare_rp2040_lora +; build_flags = ${waveshare_rp2040_lora.build_flags} +; -D MAX_CONTACTS=100 +; -D MAX_GROUP_CHANNELS=8 +; -D WIFI_DEBUG_LOGGING=1 +; -D WIFI_SSID='"myssid"' +; -D WIFI_PWD='"mypwd"' +; ; -D MESH_PACKET_LOGGING=1 +; ; -D MESH_DEBUG=1 +; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +; +<../examples/companion_radio> +; lib_deps = ${waveshare_rp2040_lora.lib_deps} +; densaugeo/base64 @ ~1.4.0 + [env:waveshare_rp2040_lora_terminal_chat] extends = waveshare_rp2040_lora build_flags = ${waveshare_rp2040_lora.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = ${waveshare_rp2040_lora.lib_deps} diff --git a/variants/waveshare_rp2040_lora/target.h b/variants/waveshare_rp2040_lora/target.h index 831a2640..3ebe0570 100644 --- a/variants/waveshare_rp2040_lora/target.h +++ b/variants/waveshare_rp2040_lora/target.h @@ -1,5 +1,7 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 + #include #include #include diff --git a/variants/wio-e5-dev/target.h b/variants/wio-e5-dev/target.h index 9ac78093..83fd9cf1 100644 --- a/variants/wio-e5-dev/target.h +++ b/variants/wio-e5-dev/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/wio-e5-mini/target.h b/variants/wio-e5-mini/target.h index 33698e0f..4b510d56 100644 --- a/variants/wio-e5-mini/target.h +++ b/variants/wio-e5-mini/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini index b802ce8a..55baf2b8 100644 --- a/variants/xiao_c3/platformio.ini +++ b/variants/xiao_c3/platformio.ini @@ -35,6 +35,8 @@ build_flags = -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.lib_deps} ${esp32_ota.lib_deps} @@ -53,6 +55,8 @@ build_flags = -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.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/xiao_c3/target.h b/variants/xiao_c3/target.h index 8bb9c6ee..0aea87dd 100644 --- a/variants/xiao_c3/target.h +++ b/variants/xiao_c3/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index 5dfc3f15..c4934e04 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -64,6 +64,9 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} + +<../examples/companion_radio> @@ -77,6 +80,8 @@ build_flags = ${Xiao_nrf52.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} + +<../examples/companion_radio> @@ -99,6 +104,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} +<../examples/simple_repeater/main.cpp> @@ -116,5 +123,7 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} +<../examples/simple_room_server/main.cpp> \ No newline at end of file diff --git a/variants/xiao_nrf52/target.h b/variants/xiao_nrf52/target.h index 6c53e2d2..eb299006 100644 --- a/variants/xiao_nrf52/target.h +++ b/variants/xiao_nrf52/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index ac2764ed..4d6fed88 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -38,6 +38,8 @@ build_flags = -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_S3_WIO.lib_deps} ${esp32_ota.lib_deps} @@ -53,6 +55,8 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 lib_deps = ${Xiao_S3_WIO.lib_deps} ${esp32_ota.lib_deps} @@ -63,6 +67,8 @@ build_flags = ${Xiao_S3_WIO.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = @@ -78,6 +84,9 @@ build_flags = -D BLE_PIN_CODE=123456 -D DISPLAY_CLASS=SSD1306Display -D OFFLINE_QUEUE_SIZE=256 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + @@ -95,6 +104,8 @@ build_flags = -D MAX_GROUP_CHANNELS=8 -D SERIAL_TX=D6 -D SERIAL_RX=D7 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} + +<../examples/companion_radio> diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h index 1709129f..609248ae 100644 --- a/variants/xiao_s3_wio/target.h +++ b/variants/xiao_s3_wio/target.h @@ -1,5 +1,6 @@ #pragma once +#define RADIOLIB_STATIC_ONLY 1 #include #include #include From 8663434bee222ea10ae8a852cf2e78c0b3c51ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Tue, 1 Jul 2025 14:09:46 +0100 Subject: [PATCH 3/3] MACRO debug flag centralisation --- platformio.ini | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 90e7cfb0..9bd4c3a7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,15 +23,36 @@ lib_deps = adafruit/RTClib @ ^2.1.3 melopero/Melopero RV3028 @ ^1.1.0 electroniccats/CayenneLPP @ 1.4.0 -build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1 +build_src_filter = + +<*.cpp> + + +build_flags = -w -D NDEBUG +;-- radiolib settings + -D RADIOLIB_STATIC_ONLY=1 + -D RADIOLIB_GODMODE=1 +;-- LoRa defaults -D LORA_FREQ=869.525 -D LORA_BW=250 -D LORA_SF=11 - -D ENABLE_PRIVATE_KEY_IMPORT=1 ; NOTE: comment these out for more secure firmware + -D LORA_CR=5 +;-- comment these out for more secure firmware + -D ENABLE_PRIVATE_KEY_IMPORT=1 -D ENABLE_PRIVATE_KEY_EXPORT=1 -build_src_filter = - +<*.cpp> - + +;-- meshcore debug options +; -D BLE_DEBUG_LOGGING +; -D ESPNOW_DEBUG_LOGGING +; -D MESH_DEBUG +; -D MESH_PACKET_LOGGING +;-- arduino-pico debug options +; -D DEBUG_RP2040_SPI +; -D DEBUG_RP2040_WIRE +; -D DEBUG_RP2040_CORE +; -D DEBUG_RP2040_PORT=Serial +;-- radiolib debug options +; -D RADIOLIB_DEBUG_SPI +; -D RADIOLIB_DEBUG_BASIC +; -D RADIOLIB_DEBUG_PROTOCOL +; -D RADIOLIB_DEBUG_PORT=Serial ; ----------------- ESP32 ---------------------