diff --git a/docs/faq.md b/docs/faq.md index c04eb6aa22..f059f2ecb4 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -822,7 +822,7 @@ where `&type` is: ### 7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3? **A:** WiFi firmware requires you to compile it yourself, as you need to set the wifi ssid and password. -Edit WIFI_SSID and WIFI_PWD in `./variants/heltec_v3/platformio.ini` and then flash it to your device. +Edit WIFI_SSID and WIFI_PASSWORD in `platformio.ini` and then flash it to your device. ### 7.7. Q: I have a Station G2, or a Heltec V4, or an Ikoka Stick, or a radio with a EByte E22-900M30S or a E22-900M33S module, what should their transmit power be set to? **A:** diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp index 4395c5b388..e452bb8116 100644 --- a/examples/companion_radio/main.cpp +++ b/examples/companion_radio/main.cpp @@ -174,7 +174,7 @@ void setup() { ); //#ifdef WIFI_SSID - // WiFi.begin(WIFI_SSID, WIFI_PWD); + // WiFi.begin(WIFI_SSID, WIFI_PASSWORD); // serial_interface.begin(TCP_PORT); // #elif defined(BLE_PIN_CODE) // char dev_name[32+16]; @@ -213,7 +213,7 @@ void setup() { } }); - WiFi.begin(WIFI_SSID, WIFI_PWD); + WiFi.begin(WIFI_SSID, WIFI_PASSWORD); serial_interface.begin(TCP_PORT); #elif defined(BLE_PIN_CODE) serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin()); diff --git a/platformio.ini b/platformio.ini index c390c318fc..bfd9ca80ae 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,6 +13,17 @@ extra_configs = variants/*/platformio.ini platformio.local.ini +[local_config] +; Central place for customization shared by variant envs +; Override these values in platformio.local.ini +admin_password = -D ADMIN_PASSWORD='"password"' +room_password = -D ROOM_PASSWORD='"hello"' +wifi_ssid = -D WIFI_SSID='"myssid"' +wifi_password = -D WIFI_PASSWORD='"mypwd"' +espnow_bridge_secret = -D WITH_ESPNOW_BRIDGE_SECRET='"shared-secret"' +tcp_port = -D TCP_PORT=5000 +ble_pin_code = -D BLE_PIN_CODE=123456 + [arduino_base] framework = arduino monitor_speed = 115200 diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini index 15fe761ba5..71cbcf668c 100644 --- a/variants/ebyte_eora_s3/platformio.ini +++ b/variants/ebyte_eora_s3/platformio.ini @@ -50,7 +50,7 @@ build_flags = -D ADVERT_NAME='"EORA_S3-1262 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -83,8 +83,8 @@ build_flags = -D ADVERT_NAME='"EORA_S3-1262 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} @@ -121,7 +121,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini index 2baac2561b..85d85978c6 100644 --- a/variants/gat562_30s_mesh_kit/platformio.ini +++ b/variants/gat562_30s_mesh_kit/platformio.ini @@ -39,7 +39,7 @@ build_flags = -D ADVERT_NAME='"GAT562 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -56,8 +56,8 @@ build_flags = -D ADVERT_NAME='"GAT562 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} @@ -97,7 +97,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/gat562_mesh_evb_pro/platformio.ini b/variants/gat562_mesh_evb_pro/platformio.ini index b3e894174a..db964a7313 100644 --- a/variants/gat562_mesh_evb_pro/platformio.ini +++ b/variants/gat562_mesh_evb_pro/platformio.ini @@ -29,7 +29,7 @@ build_flags = -D ADVERT_NAME='"GAT562 EVB Pro Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -44,8 +44,8 @@ build_flags = -D ADVERT_NAME='"GAT562 EVB Pro Room Server"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini index af153b8fc2..a3588e739e 100644 --- a/variants/gat562_mesh_tracker_pro/platformio.ini +++ b/variants/gat562_mesh_tracker_pro/platformio.ini @@ -35,7 +35,7 @@ build_flags = -D ADVERT_NAME='"GAT562 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -52,8 +52,8 @@ build_flags = -D ADVERT_NAME='"GAT562 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} @@ -92,7 +92,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini index f3510b74aa..997d843afa 100644 --- a/variants/gat562_mesh_watch13/platformio.ini +++ b/variants/gat562_mesh_watch13/platformio.ini @@ -37,7 +37,7 @@ lib_deps = ; -D ADVERT_NAME='"GAT562 Repeater"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ;; -D MESH_PACKET_LOGGING=1 ;; -D MESH_DEBUG=1 @@ -53,8 +53,8 @@ lib_deps = ; -D ADVERT_NAME='"GAT562 Room"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' -; -D ROOM_PASSWORD='"hello"' +; ${local_config.admin_password} +; ${local_config.room_password} ;; -D MESH_PACKET_LOGGING=1 ;; -D MESH_DEBUG=1 ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} @@ -71,7 +71,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D PIN_VIBRATION=36 diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index dfa2ff641f..01031278c1 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -39,7 +39,7 @@ build_flags = -D ADVERT_NAME='"E22 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -60,7 +60,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -85,7 +85,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -112,7 +112,7 @@ build_flags = -D ADVERT_NAME='"E22 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -133,7 +133,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -158,7 +158,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini index 928d5315d1..f1c4870542 100644 --- a/variants/generic_espnow/platformio.ini +++ b/variants/generic_espnow/platformio.ini @@ -41,7 +41,7 @@ build_flags = -D ADVERT_NAME='"ESPNOW Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Generic_ESPNOW.build_src_filter} +<../examples/simple_repeater/*.cpp> @@ -72,8 +72,8 @@ build_flags = -D ADVERT_NAME='"Generic ESPNow Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} build_src_filter = ${Generic_ESPNOW.build_src_filter} +<../examples/simple_room_server/*.cpp> lib_deps = diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini index 0179d9658c..3807347db0 100644 --- a/variants/heltec_ct62/platformio.ini +++ b/variants/heltec_ct62/platformio.ini @@ -40,7 +40,7 @@ build_flags = -D ADVERT_NAME='"HT-CT62 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -57,7 +57,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -79,7 +79,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -119,7 +119,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} @@ -137,7 +137,7 @@ build_flags = -D ADVERT_NAME='"HT-CT62 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D PIN_BOARD_SDA=-1 -D PIN_BOARD_SCL=-1 -D PIN_BOARD_RELAY_CH1=0 diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini index 123edd91c4..941a354d2d 100644 --- a/variants/heltec_e213/platformio.ini +++ b/variants/heltec_e213/platformio.ini @@ -50,7 +50,7 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display -D AUTO_OFF_MILLIS=0 - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_E213_base.build_src_filter} @@ -91,7 +91,7 @@ build_flags = -D ADVERT_NAME='"Heltec E213 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_E213_base.build_src_filter} + @@ -109,7 +109,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -134,7 +134,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -157,8 +157,8 @@ build_flags = -D ADVERT_NAME='"Heltec E213 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} build_src_filter = ${Heltec_E213_base.build_src_filter} + +<../examples/simple_room_server> diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini index c7cd5f21ea..3b492a6cd0 100644 --- a/variants/heltec_e290/platformio.ini +++ b/variants/heltec_e290/platformio.ini @@ -44,7 +44,7 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display -D AUTO_OFF_MILLIS=0 - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_E290_base.build_src_filter} @@ -86,7 +86,7 @@ build_flags = -D ADVERT_NAME='"Heltec E290 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_E290_base.build_src_filter} + @@ -104,7 +104,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -129,7 +129,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -152,8 +152,8 @@ build_flags = -D ADVERT_NAME='"Heltec E290 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} build_src_filter = ${Heltec_E290_base.build_src_filter} + +<../examples/simple_room_server> diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini index 92d641a357..bc4626a89f 100644 --- a/variants/heltec_mesh_solar/platformio.ini +++ b/variants/heltec_mesh_solar/platformio.ini @@ -36,7 +36,7 @@ build_flags = -D ADVERT_NAME='"Heltec_Mesh_Solar Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -50,8 +50,8 @@ build_flags = -D ADVERT_NAME='"Heltec_Mesh_Solar Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -63,7 +63,7 @@ build_flags = ${Heltec_mesh_solar.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -83,7 +83,7 @@ build_flags = ${Heltec_mesh_solar.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini index e820bf58d3..1edd5bc64b 100644 --- a/variants/heltec_t096/platformio.ini +++ b/variants/heltec_t096/platformio.ini @@ -65,7 +65,7 @@ build_flags = -D ADVERT_NAME='"Heltec_t096 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -77,7 +77,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=9 @@ -98,8 +98,8 @@ build_flags = -D ADVERT_NAME='"Heltec_t096 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -110,7 +110,7 @@ build_flags = -D ADVERT_NAME='"Heltec_t096 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SCL=PIN_WIRE1_SCL ; -D MESH_PACKET_LOGGING=1 @@ -129,7 +129,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D ENV_INCLUDE_GPS=1 ; enable the GPS page in UI ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -152,7 +152,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/heltec_t1/platformio.ini b/variants/heltec_t1/platformio.ini index d5c3caf189..2cb0c01dd6 100644 --- a/variants/heltec_t1/platformio.ini +++ b/variants/heltec_t1/platformio.ini @@ -37,7 +37,7 @@ build_flags = -D ADVERT_NAME='"Heltec_t1 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -51,8 +51,8 @@ build_flags = -D ADVERT_NAME='"Heltec_t1 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -65,7 +65,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D ENV_INCLUDE_GPS=1 ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini index 135babb1a2..525c124986 100644 --- a/variants/heltec_t114/platformio.ini +++ b/variants/heltec_t114/platformio.ini @@ -55,7 +55,7 @@ build_flags = -D ADVERT_NAME='"Heltec_T114 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -67,7 +67,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=9 @@ -88,8 +88,8 @@ build_flags = -D ADVERT_NAME='"Heltec_T114 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -103,7 +103,7 @@ build_flags = -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -126,6 +126,7 @@ build_flags = -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 +; ${local_config.ble_pin_code} build_src_filter = ${Heltec_t114.build_src_filter} + +<../examples/companion_radio/*.cpp> @@ -166,7 +167,7 @@ build_flags = -D ADVERT_NAME='"Heltec_T114 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -178,7 +179,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=9 @@ -199,8 +200,8 @@ build_flags = -D ADVERT_NAME='"Heltec_T114 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -213,7 +214,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D ENV_INCLUDE_GPS=1 ; enable the GPS page in UI ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -236,7 +237,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini index 411fee8518..5f24259b2c 100644 --- a/variants/heltec_t190/platformio.ini +++ b/variants/heltec_t190/platformio.ini @@ -55,7 +55,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_T190_base.build_src_filter} @@ -89,7 +89,7 @@ build_flags = -D ADVERT_NAME='"Heltec T190 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_T190_base.build_src_filter} +<../examples/simple_repeater> @@ -104,7 +104,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -126,7 +126,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -146,8 +146,8 @@ build_flags = -D ADVERT_NAME='"Heltec T190 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} build_src_filter = ${Heltec_T190_base.build_src_filter} +<../examples/simple_room_server> lib_deps = diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index 69293d7070..940b7a7380 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -59,7 +59,7 @@ build_flags = -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -; -D BLE_PIN_CODE=123456 ; HWT will use display for pin +; ${local_config.ble_pin_code} ; HWT will use display for pin ; -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -84,7 +84,7 @@ build_flags = -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 ; HWT will use display for pin + ${local_config.ble_pin_code} ; HWT will use display for pin -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -108,7 +108,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -128,7 +128,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -153,7 +153,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -176,8 +176,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini index d57c2113f0..0cb4b1e75b 100644 --- a/variants/heltec_tracker_v2/platformio.ini +++ b/variants/heltec_tracker_v2/platformio.ini @@ -65,7 +65,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -85,7 +85,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -107,8 +107,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} @@ -159,7 +159,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} ; dynamic, random PIN -D AUTO_SHUTDOWN_MILLIVOLTS=3400 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -185,9 +185,9 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' - -D OFFLINE_QUEUE_SIZE=256 + ${local_config.wifi_ssid} + ${local_config.wifi_password} + -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} @@ -207,7 +207,7 @@ build_flags = -D ADVERT_NAME='"Heltec Tracker V2 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D DISPLAY_CLASS=ST7735Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index e5beec235c..850e1d0955 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -35,7 +35,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -55,7 +55,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -80,7 +80,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -103,8 +103,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} @@ -157,7 +157,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=128 ; -D MESH_PACKET_LOGGING=1 @@ -181,8 +181,8 @@ build_flags = -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=128 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index a70a93a508..c739dac641 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -65,7 +65,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=5 @@ -89,7 +89,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -111,8 +111,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} @@ -163,7 +163,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D AUTO_SHUTDOWN_MILLIVOLTS=3400 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -188,8 +188,8 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -210,7 +210,7 @@ build_flags = -D ADVERT_NAME='"Heltec v3 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D ENV_PIN_SDA=33 -D ENV_PIN_SCL=34 -D DISPLAY_CLASS=SSD1306Display @@ -230,7 +230,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -248,7 +248,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=5 @@ -271,7 +271,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -294,8 +294,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -308,7 +308,7 @@ build_flags = ${Heltec_lora32_v3.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -341,8 +341,8 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -360,7 +360,7 @@ build_flags = -D ADVERT_NAME='"Heltec Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index fabf38272d..52c0268deb 100644 --- a/variants/heltec_v4/platformio.ini +++ b/variants/heltec_v4/platformio.ini @@ -90,7 +90,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -110,7 +110,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -132,7 +132,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -154,8 +154,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} @@ -206,7 +206,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} ; dynamic, random PIN -D AUTO_SHUTDOWN_MILLIVOLTS=3400 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -232,8 +232,8 @@ build_flags = -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SSD1306Display -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} @@ -253,7 +253,7 @@ build_flags = -D ADVERT_NAME='"Heltec v4 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D ENV_PIN_SDA=3 -D ENV_PIN_SCL=4 -D DISPLAY_CLASS=SSD1306Display @@ -275,7 +275,7 @@ build_flags = -D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -296,7 +296,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -318,8 +318,8 @@ build_flags = -D ADVERT_NAME='"Heltec Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} @@ -370,7 +370,7 @@ build_flags = -D DISPLAY_CLASS=ST7789LCDDisplay -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D AUTO_SHUTDOWN_MILLIVOLTS=3400 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -396,8 +396,8 @@ build_flags = -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=ST7789LCDDisplay -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} @@ -417,7 +417,7 @@ build_flags = -D ADVERT_NAME='"Heltec v4 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D ENV_PIN_SDA=3 -D ENV_PIN_SCL=4 -D DISPLAY_CLASS=ST7789LCDDisplay diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini index 48723d169a..bd1537b9cd 100644 --- a/variants/heltec_wireless_paper/platformio.ini +++ b/variants/heltec_wireless_paper/platformio.ini @@ -51,7 +51,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} @@ -91,7 +91,7 @@ build_flags = -D ADVERT_NAME='"Heltec WP Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + @@ -109,7 +109,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -133,7 +133,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -156,8 +156,8 @@ build_flags = -D ADVERT_NAME='"Heltec WP Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + +<../examples/simple_room_server> diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini index 51b602e403..a100e84576 100644 --- a/variants/ikoka_handheld_nrf/platformio.ini +++ b/variants/ikoka_handheld_nrf/platformio.ini @@ -54,7 +54,7 @@ build_src_filter = ${ikoka_handheld_nrf.build_src_filter} extends = ikoka_handheld_nrf board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld build_flags = ${ikoka_handheld_nrf_ssd1306_companion.build_flags} - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter} + @@ -63,7 +63,7 @@ build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter} extends = ikoka_handheld_nrf board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld build_flags = ${ikoka_handheld_nrf_ssd1306_companion.build_flags} - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D LORA_TX_POWER=20 -D DISPLAY_ROTATION=2 build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter} @@ -90,7 +90,7 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D ADVERT_NAME='"ikoka_handheld Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} @@ -102,7 +102,7 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D ADVERT_NAME='"ikoka_handheld Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} +<../examples/simple_room_server/*.cpp> diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini index e72f83ce0d..ad37ed850e 100644 --- a/variants/ikoka_nano_nrf/platformio.ini +++ b/variants/ikoka_nano_nrf/platformio.ini @@ -81,7 +81,7 @@ build_flags = ${ikoka_nano_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 -I examples/companion_radio/ui-new -D QSPIFLASH=1 @@ -123,7 +123,7 @@ build_flags = -D ADVERT_NAME='"Ikoka Nano Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -137,7 +137,8 @@ build_flags = -D ADVERT_NAME='"Ikoka Nano Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini index 06e39e84c3..b6f14f7c06 100644 --- a/variants/ikoka_stick_nrf/platformio.ini +++ b/variants/ikoka_stick_nrf/platformio.ini @@ -86,7 +86,7 @@ build_flags = ${ikoka_stick_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 -I examples/companion_radio/ui-new -D QSPIFLASH=1 @@ -128,7 +128,7 @@ build_flags = -D ADVERT_NAME='"Ikoka Stick Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -143,7 +143,8 @@ build_flags = -D ADVERT_NAME='"Ikoka Stick Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini index 27cf809e08..914d96f130 100644 --- a/variants/keepteen_lt1/platformio.ini +++ b/variants/keepteen_lt1/platformio.ini @@ -31,7 +31,7 @@ build_flags = -D ADVERT_NAME='"KeepteenLT1 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 @@ -49,8 +49,8 @@ build_flags = ${KeepteenLT1.build_flags} -D ADVERT_NAME='"KeepteenLT1 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -85,7 +85,7 @@ build_flags = ${KeepteenLT1.build_flags} -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SSD1306Display diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index 54990117cc..8ac47a10e7 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/variants/lilygo_t3s3/platformio.ini @@ -42,7 +42,7 @@ build_flags = -D ADVERT_NAME='"T3S3-1262 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -61,7 +61,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -85,7 +85,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -121,8 +121,8 @@ build_flags = -D ADVERT_NAME='"T3S3-1262 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} @@ -159,7 +159,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini index 5df632020e..f2cf185476 100644 --- a/variants/lilygo_t3s3_sx1276/platformio.ini +++ b/variants/lilygo_t3s3_sx1276/platformio.ini @@ -39,7 +39,7 @@ build_flags = -D ADVERT_NAME='"T3S3-1276 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -58,7 +58,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -82,7 +82,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -118,8 +118,8 @@ build_flags = -D ADVERT_NAME='"T3S3-1276 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} @@ -155,7 +155,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/lilygo_t_impulse_plus/platformio.ini b/variants/lilygo_t_impulse_plus/platformio.ini index 0ed5b9a42f..ff7a15bc5d 100644 --- a/variants/lilygo_t_impulse_plus/platformio.ini +++ b/variants/lilygo_t_impulse_plus/platformio.ini @@ -35,7 +35,7 @@ build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} build_flags = ${LilyGo_T_Impulse_Plus.build_flags} -D ADVERT_NAME='"T-Impulse-Plus Repeater"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -54,7 +54,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini index c7a595520e..f2c84bbeb3 100644 --- a/variants/lilygo_tbeam_1w/platformio.ini +++ b/variants/lilygo_tbeam_1w/platformio.ini @@ -72,7 +72,7 @@ build_flags = -D ADVERT_NAME='"T-Beam 1W Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D PERSISTANT_GPS=1 -D ENV_SKIP_GPS_DETECT=1 @@ -92,8 +92,8 @@ build_flags = -D ADVERT_NAME='"T-Beam 1W Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} -D PERSISTANT_GPS=1 -D ENV_SKIP_GPS_DETECT=1 ; -D MESH_PACKET_LOGGING=1 @@ -131,7 +131,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 -D PERSISTANT_GPS=1 -D ENV_SKIP_GPS_DETECT=1 @@ -156,8 +156,8 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D PERSISTANT_GPS=1 -D ENV_SKIP_GPS_DETECT=1 ; -D MESH_PACKET_LOGGING=1 @@ -178,7 +178,7 @@ build_flags = -D ADVERT_NAME='"T-Beam 1W ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 -D PERSISTANT_GPS=1 diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index 3099f3ab9c..2db7a8166b 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -41,7 +41,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=128 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -65,7 +65,7 @@ build_flags = -D ADVERT_NAME='"Tbeam SX1262 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -82,7 +82,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -104,7 +104,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -124,8 +124,8 @@ build_flags = -D ADVERT_NAME='"Tbeam SX1262 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini index f157623227..0c25aa3b91 100644 --- a/variants/lilygo_tbeam_SX1276/platformio.ini +++ b/variants/lilygo_tbeam_SX1276/platformio.ini @@ -39,7 +39,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=128 ; -D RADIOLIB_DEBUG_BASIC=1 @@ -61,7 +61,7 @@ build_flags = -D ADVERT_NAME='"Tbeam Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D PERSISTANT_GPS=1 ; -D MESH_PACKET_LOGGING=1 @@ -79,7 +79,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D PERSISTANT_GPS=1 ; -D WITH_RS232_BRIDGE=Serial2 @@ -102,7 +102,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D PERSISTANT_GPS=1 -D WITH_ESPNOW_BRIDGE=1 @@ -123,7 +123,8 @@ build_flags = -D ADVERT_NAME='"Tbeam Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index 845dd41500..a3640ccdbc 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"T-Beam S3 Supreme SX1262 Repeater"' -D ADVERT_LAT=0 -D ADVERT_LON=0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -62,7 +62,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0 ; -D ADVERT_LON=0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -84,7 +84,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0 -D ADVERT_LON=0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -104,8 +104,8 @@ build_flags = -D ADVERT_NAME='"T_Beam_S3_Supreme_SX1262 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} @@ -121,7 +121,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=8 @@ -143,8 +143,8 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 - -D WIFI_SSID='"WIFI_SSID"' - -D WIFI_PWD='"Password"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} ; -D WIFI_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=8 ; -D MESH_DEBUG=1 diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini index 745d8ff53d..7ac1f5a856 100644 --- a/variants/lilygo_tdeck/platformio.ini +++ b/variants/lilygo_tdeck/platformio.ini @@ -87,7 +87,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${LilyGo_TDeck.build_src_filter} + @@ -105,7 +105,7 @@ build_flags = -D ADVERT_NAME='"TDeck Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${LilyGo_TDeck.build_src_filter} +<../examples/simple_repeater> diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini index 5df77f95cb..36ffd3c118 100644 --- a/variants/lilygo_techo/platformio.ini +++ b/variants/lilygo_techo/platformio.ini @@ -59,7 +59,7 @@ build_flags = -D ADVERT_NAME='"T-Echo Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -73,7 +73,8 @@ build_flags = -D ADVERT_NAME='"T-Echo Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -88,7 +89,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D UI_RECENT_LIST_SIZE=9 diff --git a/variants/lilygo_techo_card/platformio.ini b/variants/lilygo_techo_card/platformio.ini index 36bdfe0007..c3ef850103 100644 --- a/variants/lilygo_techo_card/platformio.ini +++ b/variants/lilygo_techo_card/platformio.ini @@ -44,7 +44,7 @@ build_flags = -D ADVERT_NAME='"T-Echo Card Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -58,7 +58,7 @@ build_flags = -D ADVERT_NAME='"T-Echo Card Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -74,7 +74,7 @@ build_flags = -D QSPIFLASH=1 -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D UI_RECENT_LIST_SIZE=3 diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini index 4b5edf6918..7aa19fcbea 100644 --- a/variants/lilygo_techo_lite/platformio.ini +++ b/variants/lilygo_techo_lite/platformio.ini @@ -53,7 +53,7 @@ build_flags = -D ADVERT_NAME='"T-Echo-Lite Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -67,7 +67,8 @@ build_flags = -D ADVERT_NAME='"T-Echo-Lite Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -82,7 +83,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D QSPIFLASH=1 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D UI_RECENT_LIST_SIZE=9 @@ -127,7 +128,7 @@ build_flags = -D AUTO_OFF_MILLIS=0 -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 -D UI_RECENT_LIST_SIZE=9 -D AUTO_SHUTDOWN_MILLIVOLTS=3300 diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini index 3acfa7615d..cf0bba2e42 100644 --- a/variants/lilygo_tlora_c6/platformio.ini +++ b/variants/lilygo_tlora_c6/platformio.ini @@ -40,7 +40,7 @@ build_flags = -D ADVERT_NAME='"Tlora C6 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -57,8 +57,8 @@ build_flags = -D ADVERT_NAME='"Tlora C6 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -70,7 +70,7 @@ extends = tlora_c6 build_flags = ${tlora_c6.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D ENABLE_PRIVATE_KEY_IMPORT=1 diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index 3673166861..a643f2cd68 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -47,7 +47,7 @@ build_flags = -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -94,7 +94,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=128 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -118,8 +118,8 @@ build_flags = -D ADVERT_NAME='"TLora-V2.1-1.6 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -133,8 +133,8 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 - -D WIFI_SSID='"ssid"' - -D WIFI_PWD='"password"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D WIFI_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=128 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} @@ -159,7 +159,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=34 @@ -182,7 +182,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 diff --git a/variants/m5stack_unit_c6l/platformio.ini b/variants/m5stack_unit_c6l/platformio.ini index 94083eb486..891326a277 100644 --- a/variants/m5stack_unit_c6l/platformio.ini +++ b/variants/m5stack_unit_c6l/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"Unit C6L Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -62,8 +62,8 @@ build_flags = -D ADVERT_NAME='"Unit C6L Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -75,7 +75,7 @@ extends = M5Stack_Unit_C6L build_flags = ${M5Stack_Unit_C6L.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini index 52a0d83523..2dcffaeaae 100644 --- a/variants/mesh_pocket/platformio.ini +++ b/variants/mesh_pocket/platformio.ini @@ -46,7 +46,7 @@ build_flags = -D ADVERT_NAME='"Heltec_Mesh_Pocket Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -60,8 +60,8 @@ build_flags = -D ADVERT_NAME='"Heltec_Mesh_Pocket Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -74,7 +74,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 -D AUTO_OFF_MILLIS=0 ; -D BLE_DEBUG_LOGGING=1 @@ -99,7 +99,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D AUTO_OFF_MILLIS=0 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index f85be23885..e23b2ffcfd 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -47,7 +47,7 @@ build_flags = -D ADVERT_NAME='"Meshadventurer Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -68,7 +68,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -93,7 +93,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -115,7 +115,7 @@ build_flags = -D ADVERT_NAME='"Meshadventurer Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -137,7 +137,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -162,7 +162,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -206,7 +206,7 @@ build_flags = -D LORA_TX_POWER=22 -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=128 -D MESH_PACKET_LOGGING=1 @@ -242,8 +242,8 @@ build_flags = -D ADVERT_NAME='"Meshadventurer Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} @@ -286,7 +286,7 @@ build_flags = -D LORA_TX_POWER=22 -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=128 -D MESH_PACKET_LOGGING=1 @@ -322,8 +322,8 @@ build_flags = -D ADVERT_NAME='"Meshadventurer Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini index c5439c88f4..e8bab8180d 100644 --- a/variants/meshtiny/platformio.ini +++ b/variants/meshtiny/platformio.ini @@ -55,7 +55,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini index 39d4252deb..7934805cbc 100644 --- a/variants/minewsemi_me25ls01/platformio.ini +++ b/variants/minewsemi_me25ls01/platformio.ini @@ -44,7 +44,7 @@ build_flags = ${me25ls01.build_flags} -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 @@ -64,7 +64,7 @@ extends = me25ls01 build_flags = ${me25ls01.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 @@ -74,7 +74,7 @@ build_flags = ${me25ls01.build_flags} -D ADVERT_NAME='"ME25LS01 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} @@ -85,7 +85,7 @@ extends = me25ls01 build_flags = ${me25ls01.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -95,8 +95,8 @@ build_flags = ${me25ls01.build_flags} -D ADVERT_NAME='"ME25LS01 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} @@ -107,7 +107,7 @@ extends = me25ls01 build_flags = ${me25ls01.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 @@ -117,8 +117,8 @@ build_flags = ${me25ls01.build_flags} -D ADVERT_NAME='"ME25LS01 Chat"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} @@ -132,7 +132,7 @@ build_flags = ${me25ls01.build_flags} -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - ;-D BLE_PIN_CODE=123456 + ;${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 diff --git a/variants/muziworks_r1_neo/platformio.ini b/variants/muziworks_r1_neo/platformio.ini index 3dbecf1e84..9d135ca270 100644 --- a/variants/muziworks_r1_neo/platformio.ini +++ b/variants/muziworks_r1_neo/platformio.ini @@ -36,7 +36,7 @@ build_flags = -D ADVERT_NAME='"R1 Neo Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -50,8 +50,8 @@ build_flags = -D ADVERT_NAME='"R1 Neo Test Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} @@ -87,7 +87,7 @@ build_flags = -D ENV_INCLUDE_GPS=1 -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -125,7 +125,7 @@ build_flags = -D ADVERT_NAME='"R1 Neo Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index 3cdc29ffb1..4fd3071f07 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -32,7 +32,7 @@ build_flags = -D ADVERT_NAME='"Nano G2 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -48,8 +48,8 @@ build_flags = -D ADVERT_NAME='"Nano G2 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} @@ -66,7 +66,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=0 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SH1106Display diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini index a496a2fe68..143c0a1962 100644 --- a/variants/nibble_screen_connect/platformio.ini +++ b/variants/nibble_screen_connect/platformio.ini @@ -42,7 +42,7 @@ build_flags = -D ADVERT_NAME='"Nibble Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${nibble_screen_connect_base.build_src_filter} + @@ -59,7 +59,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 build_src_filter = ${nibble_screen_connect_base.build_src_filter} @@ -90,8 +90,8 @@ build_flags = -D ADVERT_NAME='"Nibble Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} build_src_filter = ${nibble_screen_connect_base.build_src_filter} + +<../examples/simple_room_server> @@ -124,7 +124,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${nibble_screen_connect_base.build_src_filter} @@ -146,8 +146,8 @@ build_flags = -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${nibble_screen_connect_base.build_src_filter} + @@ -159,8 +159,8 @@ lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 - -[env:nibble_screen_connect_kiss_modem] -extends = nibble_screen_connect_base -build_src_filter = ${nibble_screen_connect_base.build_src_filter} - +<../examples/kiss_modem/> + +[env:nibble_screen_connect_kiss_modem] +extends = nibble_screen_connect_base +build_src_filter = ${nibble_screen_connect_base.build_src_filter} + +<../examples/kiss_modem/> diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index 5415e15861..701b3acb09 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -46,7 +46,7 @@ build_flags = -D ADVERT_NAME='"ProMicro Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 @@ -66,7 +66,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=SSD1306Display -D WITH_RS232_BRIDGE=Serial1 @@ -89,8 +89,8 @@ build_flags = ${Promicro.build_flags} -D ADVERT_NAME='"ProMicro Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -138,7 +138,7 @@ build_flags = ${Promicro.build_flags} -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SSD1306Display @@ -161,7 +161,7 @@ build_flags = -D ADVERT_NAME='"ProMicro Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini index 3019f9c55c..5f3b2638ba 100644 --- a/variants/rak11310/platformio.ini +++ b/variants/rak11310/platformio.ini @@ -42,7 +42,7 @@ build_flags = ${rak11310.build_flags} -D ADVERT_NAME='"RAK11310 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -55,7 +55,7 @@ build_flags = ${rak11310.build_flags} -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=9 @@ -73,8 +73,8 @@ build_flags = ${rak11310.build_flags} -D ADVERT_NAME='"RAK11310 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} @@ -97,7 +97,7 @@ lib_deps = ${rak11310.lib_deps} ; build_flags = ${rak11310.build_flags} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 @@ -112,8 +112,8 @@ lib_deps = ${rak11310.lib_deps} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 ; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' +; ${local_config.wifi_ssid} +; ${local_config.wifi_password} ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rak11310.build_src_filter} diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini index 9cd32c4b4d..66d8cd2128 100644 --- a/variants/rak3112/platformio.ini +++ b/variants/rak3112/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"RAK3112 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -63,7 +63,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=5 @@ -85,7 +85,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -105,8 +105,8 @@ build_flags = -D ADVERT_NAME='"RAK3112 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} @@ -152,7 +152,7 @@ build_flags = -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 ; dynamic, random PIN + ${local_config.ble_pin_code} -D AUTO_SHUTDOWN_MILLIVOLTS=3400 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 @@ -174,8 +174,8 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -194,7 +194,7 @@ build_flags = -D ADVERT_NAME='"RAK3112 v3 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D ENV_PIN_SDA=33 -D ENV_PIN_SCL=34 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini index 20a8a548b9..bf186e1bb3 100644 --- a/variants/rak3401/platformio.ini +++ b/variants/rak3401/platformio.ini @@ -32,7 +32,7 @@ build_flags = -D ADVERT_NAME='"RAK3401 1W Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 @@ -48,8 +48,8 @@ build_flags = -D ADVERT_NAME='"Test Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} @@ -87,7 +87,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ;-D MESH_PACKET_LOGGING=1 @@ -122,7 +122,7 @@ build_flags = -D ADVERT_NAME='"RAK3401 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} diff --git a/variants/rak3x72/platformio.ini b/variants/rak3x72/platformio.ini index f966786087..b058d51034 100644 --- a/variants/rak3x72/platformio.ini +++ b/variants/rak3x72/platformio.ini @@ -18,7 +18,7 @@ build_src_filter = ${stm32_base.build_src_filter} extends = rak3x72 build_flags = ${rak3x72.build_flags} -D ADVERT_NAME='"RAK3x72 Repeater"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${rak3x72.build_src_filter} +<../examples/simple_repeater/*.cpp> @@ -27,7 +27,7 @@ build_src_filter = ${rak3x72.build_src_filter} extends = rak3x72 build_flags = ${rak3x72.build_flags} -D ADVERT_NAME='"RAK3x72 Sensor"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} build_src_filter = ${rak3x72.build_src_filter} +<../examples/simple_sensor> diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index ea7e49c355..a223a739cc 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -40,7 +40,7 @@ build_flags = -D ADVERT_NAME='"RAK4631 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -56,7 +56,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial1 -D WITH_RS232_BRIDGE_RX=PIN_SERIAL1_RX @@ -79,7 +79,7 @@ build_flags = -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=PIN_SERIAL2_RX @@ -102,8 +102,8 @@ build_flags = -D ADVERT_NAME='"Test Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} @@ -143,7 +143,7 @@ build_flags = -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -180,7 +180,7 @@ build_flags = -D ADVERT_NAME='"RAK4631 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini index 29124daf49..c2529b4d90 100644 --- a/variants/rak_wismesh_tag/platformio.ini +++ b/variants/rak_wismesh_tag/platformio.ini @@ -41,7 +41,7 @@ build_flags = -D ADVERT_NAME='"RAK WM Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -55,8 +55,8 @@ build_flags = -D ADVERT_NAME='"RAK WM Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} @@ -91,7 +91,7 @@ build_flags = -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D PIN_GPS_EN=34 @@ -114,7 +114,7 @@ build_flags = -D ADVERT_NAME='"RAK WM Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini index 9253d36f65..dfbaadb1c5 100644 --- a/variants/rpi_picow/platformio.ini +++ b/variants/rpi_picow/platformio.ini @@ -34,7 +34,7 @@ build_flags = ${rpi_picow.build_flags} -D ADVERT_NAME='"PicoW Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -47,8 +47,8 @@ build_flags = ${rpi_picow.build_flags} -D ADVERT_NAME='"Test Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} @@ -71,7 +71,7 @@ lib_deps = ${rpi_picow.lib_deps} ; build_flags = ${rpi_picow.build_flags} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 @@ -86,8 +86,8 @@ lib_deps = ${rpi_picow.lib_deps} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 ; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' +; ${local_config.wifi_ssid} +; ${local_config.wifi_password} ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rpi_picow.build_src_filter} diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini index effef38ccd..682594a9cc 100644 --- a/variants/sensecap_solar/platformio.ini +++ b/variants/sensecap_solar/platformio.ini @@ -44,7 +44,7 @@ build_flags = -D ADVERT_NAME='"SenseCap_Solar Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -58,7 +58,8 @@ build_flags = -D ADVERT_NAME='"SenseCap_Solar Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} @@ -72,7 +73,7 @@ build_flags = ${SenseCap_Solar.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index 6432b52386..1e34b70832 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -49,7 +49,7 @@ build_flags = -D ADVERT_NAME='"Station G2 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -66,7 +66,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -88,7 +88,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -108,7 +108,7 @@ build_flags = -D ADVERT_NAME='"Station G2 Logging Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D MESH_PACKET_LOGGING=1 -D SX126X_RX_BOOSTED_GAIN=1 @@ -127,7 +127,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D SX126X_RX_BOOSTED_GAIN=1 @@ -150,7 +150,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D MESH_PACKET_LOGGING=1 -D SX126X_RX_BOOSTED_GAIN=1 @@ -173,8 +173,8 @@ build_flags = -D ADVERT_NAME='"Station G2 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -205,7 +205,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -226,8 +226,8 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/station_g3_esp32/platformio.ini b/variants/station_g3_esp32/platformio.ini index b29388ef7e..af2f4ad3e6 100644 --- a/variants/station_g3_esp32/platformio.ini +++ b/variants/station_g3_esp32/platformio.ini @@ -52,7 +52,7 @@ build_flags = -D ADVERT_NAME='"Station G3 ESP32 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -69,7 +69,7 @@ build_flags = -D ADVERT_NAME='"Station G3 ESP32 Logging Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -88,8 +88,8 @@ build_flags = -D ADVERT_NAME='"Station G3 ESP32 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -120,7 +120,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 @@ -141,8 +141,8 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} -D OFFLINE_QUEUE_SIZE=256 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index 43a3d93f61..70117e2b57 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -42,7 +42,7 @@ build_flags = ${t1000-e.build_flags} -D ADVERT_NAME='"t1000-e Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -58,8 +58,8 @@ build_flags = ${t1000-e.build_flags} -D ADVERT_NAME='"t1000-e Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 -D RF_SWITCH_TABLE @@ -99,7 +99,7 @@ build_flags = ${t1000-e.build_flags} -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_TX_POWER=0 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/tenstar_c3/platformio.ini b/variants/tenstar_c3/platformio.ini index e798882366..3969c823a9 100644 --- a/variants/tenstar_c3/platformio.ini +++ b/variants/tenstar_c3/platformio.ini @@ -36,7 +36,7 @@ build_flags = -D ADVERT_NAME='"Tenstar C3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -58,7 +58,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -84,7 +84,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -106,7 +106,7 @@ build_flags = -D ADVERT_NAME='"Tenstar C3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -127,7 +127,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -152,7 +152,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index 356edfee69..4b4ac21a00 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -41,7 +41,7 @@ build_flags = -D ADVERT_NAME='"ThinkNode Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -57,7 +57,8 @@ build_flags = -D ADVERT_NAME='"ThinkNode Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} @@ -75,7 +76,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D DISPLAY_ROTATION=4 -D DISPLAY_CLASS=GxEPDDisplay diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini index 9901550178..e1b6458519 100644 --- a/variants/thinknode_m2/platformio.ini +++ b/variants/thinknode_m2/platformio.ini @@ -49,7 +49,7 @@ build_flags = -D ADVERT_NAME='"Thinknode M2 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=8 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -67,7 +67,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=8 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -88,10 +88,10 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=8 -D WITH_ESPNOW_BRIDGE=1 - -D WITH_ESPNOW_BRIDGE_SECRET='"shared-secret"' + ${local_config.espnow_bridge_secret} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -107,8 +107,8 @@ build_flags = -D ADVERT_NAME='"Thinknode M2 Room Server"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -136,7 +136,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -178,8 +178,8 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} build_src_filter = ${ThinkNode_M2.build_src_filter} + + diff --git a/variants/thinknode_m3/platformio.ini b/variants/thinknode_m3/platformio.ini index 0a3d4eda92..da91621bfd 100644 --- a/variants/thinknode_m3/platformio.ini +++ b/variants/thinknode_m3/platformio.ini @@ -44,7 +44,7 @@ build_flags = ${ThinkNode_M3.build_flags} -D ADVERT_NAME='"ThinkNode_M3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -60,8 +60,8 @@ build_flags = ${ThinkNode_M3.build_flags} -D ADVERT_NAME='"ThinkNode_M3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 -D RF_SWITCH_TABLE @@ -101,7 +101,7 @@ build_flags = ${ThinkNode_M3.build_flags} -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_TX_POWER=0 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini index 8572d1ebe0..b7ca0a5dff 100644 --- a/variants/thinknode_m5/platformio.ini +++ b/variants/thinknode_m5/platformio.ini @@ -61,7 +61,7 @@ build_flags = -D ADVERT_NAME='"Thinknode M5 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=8 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -79,7 +79,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=8 ; -D WITH_RS232_BRIDGE=Serial2 ; -D WITH_RS232_BRIDGE_RX=5 @@ -100,10 +100,10 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=8 -D WITH_ESPNOW_BRIDGE=1 - -D WITH_ESPNOW_BRIDGE_SECRET='"shared-secret"' + ${local_config.espnow_bridge_secret} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -119,8 +119,8 @@ build_flags = -D ADVERT_NAME='"Thinknode M5 Room Server"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -148,7 +148,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 -D UI_RECENT_LIST_SIZE=9 ; -D BLE_DEBUG_LOGGING=1 @@ -193,8 +193,8 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} build_src_filter = ${ThinkNode_M5.build_src_filter} + + diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini index 6fe9043668..8f54112907 100644 --- a/variants/thinknode_m6/platformio.ini +++ b/variants/thinknode_m6/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"ThinkNode Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 @@ -62,7 +62,8 @@ build_flags = -D ADVERT_NAME='"ThinkNode Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M6.build_src_filter} @@ -80,7 +81,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D AUTO_SHUTDOWN_MILLIVOLTS=3300 diff --git a/variants/tiny_relay/platformio.ini b/variants/tiny_relay/platformio.ini index 82cb251fdb..fd8dfd3caf 100644 --- a/variants/tiny_relay/platformio.ini +++ b/variants/tiny_relay/platformio.ini @@ -21,7 +21,7 @@ build_flags = ${Tiny_Relay.build_flags} -D ADVERT_NAME='"tiny_relay Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Tiny_Relay.build_src_filter} +<../examples/simple_repeater> @@ -32,7 +32,7 @@ build_flags = ${Tiny_Relay.build_flags} -D ADVERT_NAME='"tiny_relay Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${Tiny_Relay.build_src_filter} +<../examples/simple_sensor> diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index 36658d824d..11a2ddad79 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -41,7 +41,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_NAME='"RP2040-LoRa Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -54,7 +54,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=9 @@ -72,8 +72,8 @@ build_flags = ${waveshare_rp2040_lora.build_flags} -D ADVERT_NAME='"RP2040-LoRa Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} @@ -96,7 +96,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps} ; build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 @@ -111,8 +111,8 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 ; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' +; ${local_config.wifi_ssid} +; ${local_config.wifi_password} ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} diff --git a/variants/wio-e5-dev/platformio.ini b/variants/wio-e5-dev/platformio.ini index 22bdc3c837..922cba7f35 100644 --- a/variants/wio-e5-dev/platformio.ini +++ b/variants/wio-e5-dev/platformio.ini @@ -20,7 +20,7 @@ extends = lora_e5 build_flags = ${lora_e5.build_flags} -D LORA_TX_POWER=22 -D ADVERT_NAME='"WIO-E5 Repeater"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${lora_e5.build_src_filter} +<../examples/simple_repeater/*.cpp> @@ -30,7 +30,7 @@ extends = lora_e5 build_flags = ${lora_e5.build_flags} -D LORA_TX_POWER=22 -D ADVERT_NAME='"WIO-E5 Repeater"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D ENABLE_HWSERIAL2 -D WITH_RS232_BRIDGE=Serial2 diff --git a/variants/wio-e5-mini/platformio.ini b/variants/wio-e5-mini/platformio.ini index 82f01331bb..16b74f5662 100644 --- a/variants/wio-e5-mini/platformio.ini +++ b/variants/wio-e5-mini/platformio.ini @@ -22,7 +22,7 @@ extends = lora_e5_mini build_flags = ${lora_e5_mini.build_flags} -D LORA_TX_POWER=22 -D ADVERT_NAME='"wio-e5-mini Repeater"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 build_src_filter = ${lora_e5_mini.build_src_filter} +<../examples/simple_repeater/*.cpp> @@ -32,7 +32,7 @@ extends = lora_e5_mini build_flags = ${lora_e5_mini.build_flags} -D LORA_TX_POWER=22 -D ADVERT_NAME='"wio-e5-mini Sensor"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} build_src_filter = ${lora_e5_mini.build_src_filter} +<../examples/simple_sensor> diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index 2c74baded3..6cd5950ef5 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -46,7 +46,7 @@ build_flags = ${WioTrackerL1Eink.build_flags} -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=GxEPDDisplay diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index 7bb175bb9a..839a17c5b2 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -33,7 +33,7 @@ build_src_filter = ${WioTrackerL1.build_src_filter} build_flags = ${WioTrackerL1.build_flags} -D ADVERT_NAME='"WioTrackerL1 Repeater"' - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=SH1106Display ; -D MESH_PACKET_LOGGING=1 @@ -47,8 +47,8 @@ build_src_filter = ${WioTrackerL1.build_src_filter} +<../examples/simple_room_server> build_flags = ${WioTrackerL1.build_flags} -D ADVERT_NAME='"WioTrackerL1 Room"' - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} -D DISPLAY_CLASS=SH1106Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -89,7 +89,7 @@ build_flags = ${WioTrackerL1.build_flags} -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D DISPLAY_CLASS=SH1106Display diff --git a/variants/wio_wm1110/platformio.ini b/variants/wio_wm1110/platformio.ini index a7eac916b0..31a28c070b 100644 --- a/variants/wio_wm1110/platformio.ini +++ b/variants/wio_wm1110/platformio.ini @@ -43,7 +43,7 @@ build_flags = -D ADVERT_NAME='"WM1110 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -57,8 +57,8 @@ build_flags = -D ADVERT_NAME='"WM1110 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} @@ -72,7 +72,7 @@ build_flags = ${wio_wm1110.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D QSPIFLASH=1 -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 @@ -84,8 +84,8 @@ build_src_filter = ${wio_wm1110.build_src_filter} lib_deps = ${wio_wm1110.lib_deps} densaugeo/base64 @ ~1.4.0 - -[env:wio_wm1110_kiss_modem] -extends = wio_wm1110 -build_src_filter = ${wio_wm1110.build_src_filter} - +<../examples/kiss_modem/> + +[env:wio_wm1110_kiss_modem] +extends = wio_wm1110 +build_src_filter = ${wio_wm1110.build_src_filter} + +<../examples/kiss_modem/> diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini index c0e8458d0e..6f3ef6aded 100644 --- a/variants/xiao_c3/platformio.ini +++ b/variants/xiao_c3/platformio.ini @@ -39,7 +39,7 @@ build_flags = -D ADVERT_NAME='"Xiao C3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -61,8 +61,8 @@ build_flags = -D ADVERT_NAME='"Xiao C3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -80,7 +80,7 @@ build_flags = ${Xiao_esp32_C3.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -119,8 +119,8 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini index 9f504b8ed0..593359d684 100644 --- a/variants/xiao_c6/platformio.ini +++ b/variants/xiao_c6/platformio.ini @@ -40,7 +40,7 @@ build_flags = -D ADVERT_NAME='"Xiao C6 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -53,7 +53,7 @@ extends = Xiao_C6 build_flags = ${Xiao_C6.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D ENABLE_PRIVATE_KEY_IMPORT=1 @@ -100,7 +100,7 @@ build_flags = -D ADVERT_NAME='"Meshimi Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 lib_deps = ${Meshimi.lib_deps} @@ -110,7 +110,7 @@ extends = Meshimi build_flags = ${Meshimi.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D ENABLE_PRIVATE_KEY_IMPORT=1 @@ -157,7 +157,7 @@ build_flags = -D ADVERT_NAME='"WHY2025 Badge Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -170,7 +170,7 @@ extends = WHY2025_badge build_flags = ${WHY2025_badge.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 -D ENABLE_PRIVATE_KEY_IMPORT=1 diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index a085433688..2910499cfd 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -49,7 +49,7 @@ build_flags = -I examples/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -90,7 +90,7 @@ build_flags = -D ADVERT_NAME='"Xiao_nrf52 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -104,7 +104,8 @@ build_flags = -D ADVERT_NAME='"Xiao_nrf52 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini index 9a0fdaf4a2..f14d0789e5 100644 --- a/variants/xiao_rp2040/platformio.ini +++ b/variants/xiao_rp2040/platformio.ini @@ -36,7 +36,7 @@ build_flags = ${Xiao_rp2040.build_flags} -D ADVERT_NAME='"Xiao Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 @@ -49,8 +49,8 @@ build_flags = ${Xiao_rp2040.build_flags} -D ADVERT_NAME='"Xiao Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} @@ -73,7 +73,7 @@ lib_deps = ${Xiao_rp2040.lib_deps} ; build_flags = ${Xiao_rp2040.build_flags} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 +; ${local_config.ble_pin_code} ; -D BLE_DEBUG_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 @@ -88,8 +88,8 @@ lib_deps = ${Xiao_rp2040.lib_deps} ; -D MAX_CONTACTS=100 ; -D MAX_GROUP_CHANNELS=8 ; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' +; ${local_config.wifi_ssid} +; ${local_config.wifi_password} ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Xiao_rp2040.build_src_filter} diff --git a/variants/xiao_s3/platformio.ini b/variants/xiao_s3/platformio.ini index bc00022048..7f66f98c28 100644 --- a/variants/xiao_s3/platformio.ini +++ b/variants/xiao_s3/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"Xiao S3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -63,7 +63,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -82,8 +82,8 @@ build_flags = -D ADVERT_NAME='"Xiao S3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -97,7 +97,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D DISPLAY_CLASS=SSD1306Display -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 @@ -146,7 +146,7 @@ build_flags = -D ADVERT_NAME='"Xiao S3 Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index db8c5a9486..8b49e6a3d7 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D ADVERT_NAME='"XiaoS3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -63,7 +63,7 @@ lib_deps = ; -D ADVERT_NAME='"RS232 Bridge"' ; -D ADVERT_LAT=0.0 ; -D ADVERT_LON=0.0 -; -D ADMIN_PASSWORD='"password"' +; ${local_config.admin_password} ; -D MAX_NEIGHBOURS=50 ; -D WITH_RS232_BRIDGE=Serial2 ; RS232 bridge Pins have been relocated from 5,6 which is the i2c bus on xiao_s3 @@ -86,7 +86,7 @@ build_flags = -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 ; -D BRIDGE_DEBUG=1 @@ -105,8 +105,8 @@ build_flags = -D ADVERT_NAME='"XiaoS3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' + ${local_config.admin_password} + ${local_config.room_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -156,7 +156,7 @@ build_flags = -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -D BLE_PIN_CODE=123456 + ${local_config.ble_pin_code} -D DISPLAY_CLASS=SSD1306Display -D OFFLINE_QUEUE_SIZE=256 ; -D BLE_DEBUG_LOGGING=1 @@ -210,8 +210,8 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"password"' + ${local_config.wifi_ssid} + ${local_config.wifi_password} ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -228,7 +228,7 @@ build_flags = -D ADVERT_NAME='"XiaoS3 sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' + ${local_config.admin_password} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps =