Skip to content

make g2 more in line with other variants #2426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liamcottle merged 1 commit into from
Apr 30, 2026
+42 −23
Merged

make g2 more in line with other variants #2426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 42 additions & 23 deletions variants/nano_g2_ultra/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
[nrf52840_g2_ultra]
[Nano_G2_Ultra]
extends = nrf52_base
platform_packages = framework-arduinoadafruitnrf52
board = nano-g2-ultra
board_build.ldscript = boards/nrf52840_s140_v6.ld
build_flags = ${nrf52_base.build_flags}
-I src/helpers/nrf52
-I lib/nrf52/s140_nrf52_6.1.1_API/include
-I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
lib_deps =
${nrf52_base.lib_deps}
rweather/Crypto @ ^0.4.0
lewisxhe/PCF8563_Library@^1.0.1

[Nano_G2_Ultra]
extends = nrf52840_g2_ultra
board = nano-g2-ultra
board_build.ldscript = boards/nrf52840_s140_v6.ld
build_flags = ${nrf52840_g2_ultra.build_flags}
-I variants/nano_g2_ultra
-D NANO_G2_ULTRA
-D RADIO_CLASS=CustomSX1262
Expand All @@ -23,11 +14,47 @@ build_flags = ${nrf52840_g2_ultra.build_flags}
-D SX126X_CURRENT_LIMIT=140
-D SX126X_RX_BOOSTED_GAIN=1
-D PIN_USER_BTN=38
build_src_filter = ${nrf52840_g2_ultra.build_src_filter}
build_src_filter = ${nrf52_base.build_src_filter}
+<helpers/*.cpp>
+<../variants/nano_g2_ultra>
debug_tool = jlink
upload_protocol = nrfutil
lib_deps = ${nrf52_base.lib_deps}
adafruit/Adafruit SH110X @ ~2.1.13
adafruit/Adafruit GFX Library @ ^1.12.1
stevemarple/MicroNMEA @ ^2.0.6

[env:Nano_G2_Ultra_repeater]
extends = Nano_G2_Ultra
build_flags =
${Nano_G2_Ultra.build_flags}
-D DISPLAY_CLASS=SH1106Display
-D ADVERT_NAME='"Nano G2 Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+<helpers/ui/SH1106Display.cpp>
+<../examples/simple_repeater>

[env:Nano_G2_Ultra_room_server]
extends = Nano_G2_Ultra
build_flags =
${Nano_G2_Ultra.build_flags}
-D DISPLAY_CLASS=SH1106Display
-D ADVERT_NAME='"Nano G2 Room"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+<helpers/ui/SH1106Display.cpp>
+<../examples/simple_room_server>

[env:Nano_G2_Ultra_companion_radio_ble]
extends = Nano_G2_Ultra
Expand All @@ -54,12 +81,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps =
${Nano_G2_Ultra.lib_deps}
lib_deps = ${Nano_G2_Ultra.lib_deps}
densaugeo/base64 @ ~1.4.0
adafruit/Adafruit SH110X @ ~2.1.13
adafruit/Adafruit GFX Library @ ^1.12.1
stevemarple/MicroNMEA @ ^2.0.6
end2endzone/NonBlockingRTTTL@^1.3.0

[env:Nano_G2_Ultra_companion_radio_usb]
Expand All @@ -84,10 +107,6 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps =
${Nano_G2_Ultra.lib_deps}
lib_deps = ${Nano_G2_Ultra.lib_deps}
densaugeo/base64 @ ~1.4.0
adafruit/Adafruit SH110X @ ~2.1.13
adafruit/Adafruit GFX Library @ ^1.12.1
stevemarple/MicroNMEA @ ^2.0.6
end2endzone/NonBlockingRTTTL@^1.3.0
Loading