Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build fixes for nibble_screen_connect and thinknode_m2

Browse Source
This commit is contained in:
taco
2026-06-05 00:55:02 +10:00
parent b4038529b5
commit b4b0a0ee0f
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
variants/nibble_screen_connect/platformio.ini
View File

@@ -18,7 +18,7 @@ build_flags =
-D HAS_NEOPIXEL -D HAS_NEOPIXEL
-D NEOPIXEL_COUNT=1 -D NEOPIXEL_COUNT=1
-D NEOPIXEL_DATA=21 -D NEOPIXEL_DATA=21
-D NEOPIXEL_TYPE=(NEO_GRB+NEO_KHZ800) -D NEOPIXEL_TYPE=NEO_GRB+NEO_KHZ800
-D SX126X_DIO2_AS_RF_SWITCH=true -D SX126X_DIO2_AS_RF_SWITCH=true
-D SX126X_DIO3_TCXO_VOLTAGE=1.8 -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-D SX126X_CURRENT_LIMIT=140 -D SX126X_CURRENT_LIMIT=140
@@ -159,8 +159,8 @@ lib_deps =
${nibble_screen_connect_base.lib_deps} ${nibble_screen_connect_base.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:nibble_screen_connect_kiss_modem] [env:nibble_screen_connect_kiss_modem]
extends = nibble_screen_connect_base extends = nibble_screen_connect_base
build_src_filter = ${nibble_screen_connect_base.build_src_filter} build_src_filter = ${nibble_screen_connect_base.build_src_filter}
+<../examples/kiss_modem/> +<../examples/kiss_modem/>

10
variants/thinknode_m2/platformio.ini
View File

@@ -34,7 +34,6 @@ build_flags = ${esp32_base.build_flags}
build_src_filter = ${esp32_base.build_src_filter} build_src_filter = ${esp32_base.build_src_filter}
+<helpers/ui/SH1106Display.cpp> +<helpers/ui/SH1106Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/buzzer.cpp>
+<../variants/thinknode_m2> +<../variants/thinknode_m2>
lib_deps = ${esp32_base.lib_deps} lib_deps = ${esp32_base.lib_deps}
adafruit/Adafruit SH110X @ ~2.1.13 adafruit/Adafruit SH110X @ ~2.1.13
@@ -144,6 +143,7 @@ build_flags =
build_src_filter = ${ThinkNode_M2.build_src_filter} build_src_filter = ${ThinkNode_M2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/buzzer.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -162,6 +162,7 @@ build_flags =
build_src_filter = ${ThinkNode_M2.build_src_filter} build_src_filter = ${ThinkNode_M2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/buzzer.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -183,6 +184,7 @@ build_flags =
build_src_filter = ${ThinkNode_M2.build_src_filter} build_src_filter = ${ThinkNode_M2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/buzzer.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -197,18 +199,20 @@ build_flags =
-I examples/companion_radio/ui-new -I examples/companion_radio/ui-new
-D MAX_CONTACTS=350 -D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40 -D MAX_GROUP_CHANNELS=40
-D SERIAL_TX=D6 -D SERIAL_TX=43
-D SERIAL_RX=D7 -D SERIAL_RX=44
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${ThinkNode_M2.build_src_filter} build_src_filter = ${ThinkNode_M2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/buzzer.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
${ThinkNode_M2.lib_deps} ${ThinkNode_M2.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
end2endzone/NonBlockingRTTTL@^1.3.0
[env:ThinkNode_M2_kiss_modem] [env:ThinkNode_M2_kiss_modem]
extends = ThinkNode_M2 extends = ThinkNode_M2