Merge pull request #219 from recrof/dev

bugfix: Faketec: only include SSD1306Display during build
2026-03-30 19:15:49 +00:00 · 2025-04-23 19:06:47 +10:00
parent a87b5231cc 669597ea4f
commit 977b76c47e
1 changed files with 59 additions and 62 deletions
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -17,84 +17,84 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52840_base.build_src_filter}
  +<helpers/nrf52/PromicroBoard.cpp>
  +<../variants/promicro>
-lib_deps=
-  ${nrf52840_base.lib_deps}
+lib_deps= ${nrf52840_base.lib_deps}
 	adafruit/Adafruit SSD1306 @ ^2.5.13

 [env:Faketec_Repeater]
 extends = Faketec
-build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_repeater> +<helpers/ui/*.cpp>
+build_src_filter = ${Faketec.build_src_filter}
+  +<../examples/simple_repeater>
+  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
  ${Faketec.build_flags}
-  -D ADVERT_NAME="\"Faketec Repeater\""
+  -D ADVERT_NAME='"Faketec Repeater"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps =
-  ${Faketec.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3

 [env:Faketec_room_server]
 extends = Faketec
-build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_room_server> +<helpers/ui/*.cpp>
-build_flags =
-  ${Faketec.build_flags}
-  -D ADVERT_NAME="\"Test Room\""
+build_src_filter = ${Faketec.build_src_filter}
+  +<../examples/simple_room_server>
+  +<helpers/ui/SSD1306Display.cpp>
+build_flags = ${Faketec.build_flags}
+  -D ADVERT_NAME='"Faketec Room"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps =
-  ${Faketec.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3

 [env:Faketec_terminal_chat]
 extends = Faketec
-build_flags =
-  ${Faketec.build_flags}
+build_flags = ${Faketec.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
-lib_deps =
-  ${Faketec.lib_deps}
+build_src_filter = ${Faketec.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
+lib_deps = ${Faketec.lib_deps}
  densaugeo/base64 @ ~1.4.0
  adafruit/RTClib @ ^2.1.3

 [env:Faketec_companion_radio_usb]
 extends = Faketec
-build_flags =
-  ${Faketec.build_flags}
+build_flags = ${Faketec.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter} +<../examples/companion_radio>  +<../examples/companion_radio> +<helpers/ui/*.cpp>
-lib_deps =
-  ${Faketec.lib_deps}
+build_src_filter = ${Faketec.build_src_filter}
+  +<../examples/companion_radio>
+  +<helpers/ui/SSD1306Display.cpp>
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

 [env:Faketec_companion_radio_ble]
 extends = Faketec
-build_flags =
-  ${Faketec.build_flags}
+build_flags = ${Faketec.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D ENABLE_PRIVATE_KEY_EXPORT=1
  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D MESH_PACKET_LOGGING=1
+  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Faketec.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp> +<../examples/companion_radio> +<helpers/ui/*.cpp>
-lib_deps =
-  ${Faketec.lib_deps}
+build_src_filter = ${Faketec.build_src_filter}
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+  +<../examples/companion_radio>
+  +<helpers/ui/SSD1306Display.cpp>
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

@@ -109,69 +109,65 @@ build_flags = ${nrf52840_base.build_flags}
  -D LORA_TX_POWER=22
  -D SX126X_CURRENT_LIMIT=130
  -D SX126X_RX_BOOSTED_GAIN=1
-build_src_filter = ${nrf52840_base.build_src_filter}
+build_src_filter =
+  ${nrf52840_base.build_src_filter}
  +<helpers/nrf52/PromicroBoard.cpp>
  +<../variants/promicro>

 [env:ProMicroLLCC68_Repeater]
 extends = ProMicroLLCC68
-build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_repeater/main.cpp>
-build_flags =
-  ${ProMicroLLCC68.build_flags}
-  -D ADVERT_NAME="\"ProMicroLLCC68 Repeater\""
-  -D ADMIN_PASSWORD="\"password\""
+build_src_filter = ${ProMicroLLCC68.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
+build_flags = ${ProMicroLLCC68.build_flags}
+  -D ADVERT_NAME='"ProMicroLLCC68 Repeater"'
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps =
-  ${ProMicroLLCC68.lib_deps}
+lib_deps = ${ProMicroLLCC68.lib_deps}
  adafruit/RTClib @ ^2.1.3

 [env:ProMicroLLCC68_room_server]
 extends = ProMicroLLCC68
-build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_room_server/main.cpp>
-build_flags =
-  ${ProMicroLLCC68.build_flags}
-  -D ADVERT_NAME="\"ProMicroLLCC68 Room\""
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+build_src_filter = ${ProMicroLLCC68.build_src_filter}
+  +<../examples/simple_room_server/main.cpp>
+build_flags = ${ProMicroLLCC68.build_flags}
+  -D ADVERT_NAME='"ProMicroLLCC68 Room"'
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps =
-  ${ProMicroLLCC68.lib_deps}
+lib_deps = ${ProMicroLLCC68.lib_deps}
  adafruit/RTClib @ ^2.1.3

 [env:ProMicroLLCC68_terminal_chat]
 extends = ProMicroLLCC68
-build_flags =
-  ${ProMicroLLCC68.build_flags}
+build_flags = ${ProMicroLLCC68.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
-lib_deps =
-  ${ProMicroLLCC68.lib_deps}
+build_src_filter = ${ProMicroLLCC68.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
+lib_deps = ${ProMicroLLCC68.lib_deps}
  densaugeo/base64 @ ~1.4.0
  adafruit/RTClib @ ^2.1.3

 [env:ProMicroLLCC68_companion_radio_usb]
 extends = ProMicroLLCC68
-build_flags =
-  ${ProMicroLLCC68.build_flags}
+build_flags = ${ProMicroLLCC68.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${ProMicroLLCC68.lib_deps}
+build_src_filter = ${ProMicroLLCC68.build_src_filter}
+  +<../examples/companion_radio/main.cpp>
+lib_deps = ${ProMicroLLCC68.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

 [env:ProMicroLLCC68_companion_radio_ble]
 extends = ProMicroLLCC68
-build_flags =
-  ${ProMicroLLCC68.build_flags}
+build_flags = ${ProMicroLLCC68.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
@@ -180,8 +176,9 @@ build_flags =
  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${ProMicroLLCC68.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp> +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${ProMicroLLCC68.lib_deps}
+build_src_filter = ${ProMicroLLCC68.build_src_filter}
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+  +<../examples/companion_radio/main.cpp>
+lib_deps = ${ProMicroLLCC68.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0