meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #219 from recrof/dev

Browse source 
bugfix: Faketec: only include SSD1306Display during build
This commit is contained in:
ripplebiz 2025-04-23 19:06:47 +10:00 • committed by GitHub
commit 977b76c47e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 59 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

121
variants/promicro/platformio.ini
View file

@ -17,84 +17,84 @@ build_flags = ${nrf52840_base.build_flags}
build_src_filter = ${nrf52840_base.build_src_filter} build_src_filter = ${nrf52840_base.build_src_filter}
+<helpers/nrf52/PromicroBoard.cpp> +<helpers/nrf52/PromicroBoard.cpp>
+<../variants/promicro> +<../variants/promicro>
lib_deps= lib_deps= ${nrf52840_base.lib_deps}
${nrf52840_base.lib_deps}
adafruit/Adafruit SSD1306 @ ^2.5.13 adafruit/Adafruit SSD1306 @ ^2.5.13
[env:Faketec_Repeater] [env:Faketec_Repeater]
extends = Faketec 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 = build_flags =
${Faketec.build_flags} ${Faketec.build_flags}
-D ADVERT_NAME="\"Faketec Repeater\"" -D ADVERT_NAME='"Faketec Repeater"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD="\"password\"" -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
lib_deps = lib_deps = ${Faketec.lib_deps}
${Faketec.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
[env:Faketec_room_server] [env:Faketec_room_server]
extends = Faketec extends = Faketec
build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_room_server> +<helpers/ui/*.cpp> build_src_filter = ${Faketec.build_src_filter}
build_flags = +<../examples/simple_room_server>
${Faketec.build_flags} +<helpers/ui/SSD1306Display.cpp>
-D ADVERT_NAME="\"Test Room\"" build_flags = ${Faketec.build_flags}
-D ADVERT_NAME='"Faketec Room"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD="\"password\"" -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD="\"hello\"" -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
lib_deps = lib_deps = ${Faketec.lib_deps}
${Faketec.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
[env:Faketec_terminal_chat] [env:Faketec_terminal_chat]
extends = Faketec extends = Faketec
build_flags = build_flags = ${Faketec.build_flags}
${Faketec.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp> build_src_filter = ${Faketec.build_src_filter}
lib_deps = +<../examples/simple_secure_chat/main.cpp>
${Faketec.lib_deps} lib_deps = ${Faketec.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
[env:Faketec_companion_radio_usb] [env:Faketec_companion_radio_usb]
extends = Faketec extends = Faketec
build_flags = build_flags = ${Faketec.build_flags}
${Faketec.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${Faketec.build_src_filter} +<../examples/companion_radio> +<../examples/companion_radio> +<helpers/ui/*.cpp> build_src_filter = ${Faketec.build_src_filter}
lib_deps = +<../examples/companion_radio>
${Faketec.lib_deps} +<helpers/ui/SSD1306Display.cpp>
lib_deps = ${Faketec.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:Faketec_companion_radio_ble] [env:Faketec_companion_radio_ble]
extends = Faketec extends = Faketec
build_flags = build_flags = ${Faketec.build_flags}
${Faketec.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1
-D ENABLE_PRIVATE_KEY_EXPORT=1 -D ENABLE_PRIVATE_KEY_EXPORT=1
-D ENABLE_PRIVATE_KEY_IMPORT=1 -D ENABLE_PRIVATE_KEY_IMPORT=1
; -D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Faketec.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp> +<../examples/companion_radio> +<helpers/ui/*.cpp> build_src_filter = ${Faketec.build_src_filter}
lib_deps = +<helpers/nrf52/SerialBLEInterface.cpp>
${Faketec.lib_deps} +<../examples/companion_radio>
+<helpers/ui/SSD1306Display.cpp>
lib_deps = ${Faketec.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@ -109,69 +109,65 @@ build_flags = ${nrf52840_base.build_flags}
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
-D SX126X_CURRENT_LIMIT=130 -D SX126X_CURRENT_LIMIT=130
-D SX126X_RX_BOOSTED_GAIN=1 -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> +<helpers/nrf52/PromicroBoard.cpp>
+<../variants/promicro> +<../variants/promicro>
[env:ProMicroLLCC68_Repeater] [env:ProMicroLLCC68_Repeater]
extends = ProMicroLLCC68 extends = ProMicroLLCC68
build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_repeater/main.cpp> build_src_filter = ${ProMicroLLCC68.build_src_filter}
build_flags = +<../examples/simple_repeater/main.cpp>
${ProMicroLLCC68.build_flags} build_flags = ${ProMicroLLCC68.build_flags}
-D ADVERT_NAME="\"ProMicroLLCC68 Repeater\"" -D ADVERT_NAME='"ProMicroLLCC68 Repeater"'
-D ADMIN_PASSWORD="\"password\"" -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
lib_deps = lib_deps = ${ProMicroLLCC68.lib_deps}
${ProMicroLLCC68.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
[env:ProMicroLLCC68_room_server] [env:ProMicroLLCC68_room_server]
extends = ProMicroLLCC68 extends = ProMicroLLCC68
build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_room_server/main.cpp> build_src_filter = ${ProMicroLLCC68.build_src_filter}
build_flags = +<../examples/simple_room_server/main.cpp>
${ProMicroLLCC68.build_flags} build_flags = ${ProMicroLLCC68.build_flags}
-D ADVERT_NAME="\"ProMicroLLCC68 Room\"" -D ADVERT_NAME='"ProMicroLLCC68 Room"'
-D ADMIN_PASSWORD="\"password\"" -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD="\"hello\"" -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
lib_deps = lib_deps = ${ProMicroLLCC68.lib_deps}
${ProMicroLLCC68.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
[env:ProMicroLLCC68_terminal_chat] [env:ProMicroLLCC68_terminal_chat]
extends = ProMicroLLCC68 extends = ProMicroLLCC68
build_flags = build_flags = ${ProMicroLLCC68.build_flags}
${ProMicroLLCC68.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=1 -D MAX_GROUP_CHANNELS=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/simple_secure_chat/main.cpp> build_src_filter = ${ProMicroLLCC68.build_src_filter}
lib_deps = +<../examples/simple_secure_chat/main.cpp>
${ProMicroLLCC68.lib_deps} lib_deps = ${ProMicroLLCC68.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
[env:ProMicroLLCC68_companion_radio_usb] [env:ProMicroLLCC68_companion_radio_usb]
extends = ProMicroLLCC68 extends = ProMicroLLCC68
build_flags = build_flags = ${ProMicroLLCC68.build_flags}
${ProMicroLLCC68.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${ProMicroLLCC68.build_src_filter} +<../examples/companion_radio/main.cpp> build_src_filter = ${ProMicroLLCC68.build_src_filter}
lib_deps = +<../examples/companion_radio/main.cpp>
${ProMicroLLCC68.lib_deps} lib_deps = ${ProMicroLLCC68.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:ProMicroLLCC68_companion_radio_ble] [env:ProMicroLLCC68_companion_radio_ble]
extends = ProMicroLLCC68 extends = ProMicroLLCC68
build_flags = build_flags = ${ProMicroLLCC68.build_flags}
${ProMicroLLCC68.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
-D MAX_GROUP_CHANNELS=8 -D MAX_GROUP_CHANNELS=8
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
@ -180,8 +176,9 @@ build_flags =
-D ENABLE_PRIVATE_KEY_IMPORT=1 -D ENABLE_PRIVATE_KEY_IMPORT=1
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${ProMicroLLCC68.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp> +<../examples/companion_radio/main.cpp> build_src_filter = ${ProMicroLLCC68.build_src_filter}
lib_deps = +<helpers/nrf52/SerialBLEInterface.cpp>
${ProMicroLLCC68.lib_deps} +<../examples/companion_radio/main.cpp>
lib_deps = ${ProMicroLLCC68.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0