dandri/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-03-29 08:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1616 from jbrazio/2026/raknorm

Browse Source 
Refactor environment names and build flags for RAK variants
This commit is contained in:
Liam Cottle
2026-02-09 01:33:26 +13:00
committed by GitHub
parent f6fc05601c fcfbb458f8
commit b1094c2842
4 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
variants/rak11310/platformio.ini
View File

@@ -7,6 +7,7 @@ board = rakwireless_rak11300
board_build.filesystem_size = 0.5m
build_flags = ${rp2040_base.build_flags}
-I variants/rak11310
-D RAK_11310
-D ARDUINO_RAKWIRELESS_RAK11300=1
-D SX126X_CURRENT_LIMIT=140
-D RADIO_CLASS=CustomSX1262
@@ -34,7 +35,7 @@ build_src_filter = ${rp2040_base.build_src_filter}
+<../variants/rak11310>
lib_deps = ${rp2040_base.lib_deps}
[env:rak11310_repeater]
[env:RAK_11310_repeater]
extends = rak11310
build_flags = ${rak11310.build_flags}
-D ADVERT_NAME='"RAK11310 Repeater"'
@@ -47,7 +48,7 @@ build_flags = ${rak11310.build_flags}
build_src_filter = ${rak11310.build_src_filter}
+<../examples/simple_repeater>
[env:rak11310_repeater_bridge_rs232]
[env:RAK_11310_repeater_bridge_rs232]
extends = rak11310
build_flags = ${rak11310.build_flags}
-D ADVERT_NAME='"RS232 Bridge"'
@@ -65,7 +66,7 @@ build_src_filter = ${rak11310.build_src_filter}
+<helpers/bridges/RS232Bridge.cpp>
+<../examples/simple_repeater>
[env:rak11310_room_server]
[env:RAK_11310_room_server]
extends = rak11310
build_flags = ${rak11310.build_flags}
-D ADVERT_NAME='"RAK11310 Room"'
@@ -78,7 +79,7 @@ build_flags = ${rak11310.build_flags}
build_src_filter = ${rak11310.build_src_filter}
+<../examples/simple_room_server>
[env:rak11310_companion_radio_usb]
[env:RAK_11310_companion_radio_usb]
extends = rak11310
build_flags = ${rak11310.build_flags}
-D MAX_CONTACTS=100
@@ -90,7 +91,7 @@ build_src_filter = ${rak11310.build_src_filter}
lib_deps = ${rak11310.lib_deps}
densaugeo/base64 @ ~1.4.0
; [env:rak11310_companion_radio_ble]
; [env:RAK_11310_companion_radio_ble]
; extends = rak11310
; build_flags = ${rak11310.build_flags}
; -D MAX_CONTACTS=100
@@ -104,7 +105,7 @@ lib_deps = ${rak11310.lib_deps}
; lib_deps = ${rak11310.lib_deps}
; densaugeo/base64 @ ~1.4.0
; [env:rak11310_companion_radio_wifi]
; [env:RAK_11310_companion_radio_wifi]
; extends = rak11310
; build_flags = ${rak11310.build_flags}
; -D MAX_CONTACTS=100
@@ -119,7 +120,7 @@ lib_deps = ${rak11310.lib_deps}
; lib_deps = ${rak11310.lib_deps}
; densaugeo/base64 @ ~1.4.0
[env:rak11310_terminal_chat]
[env:RAK_11310_terminal_chat]
extends = rak11310
build_flags = ${rak11310.build_flags}
-D MAX_CONTACTS=100

37
variants/rak3112/platformio.ini
View File

@@ -36,11 +36,10 @@ lib_deps =
${esp32_base.lib_deps}
${sensor_base.lib_deps}
[env:RAK3112_repeater]
[env:RAK_3112_repeater]
extends = rak3112
build_flags =
${rak3112.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"RAK3112 Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
@@ -49,18 +48,16 @@ build_flags =
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_repeater>
lib_deps =
${rak3112.lib_deps}
${esp32_ota.lib_deps}
bakercp/CRC32 @ ^2.0.0
[env:RAK3112_repeater_bridge_rs232]
[env:RAK_3112_repeater_bridge_rs232]
extends = rak3112
build_flags =
${rak3112.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"RS232 Bridge"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
@@ -74,17 +71,15 @@ build_flags =
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/bridges/RS232Bridge.cpp>
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_repeater>
lib_deps =
${rak3112.lib_deps}
${esp32_ota.lib_deps}
[env:RAK3112_repeater_bridge_espnow]
[env:RAK_3112_repeater_bridge_espnow]
extends = rak3112
build_flags =
${rak3112.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"ESPNow Bridge"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
@@ -96,17 +91,15 @@ build_flags =
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/bridges/ESPNowBridge.cpp>
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_repeater>
lib_deps =
${rak3112.lib_deps}
${esp32_ota.lib_deps}
[env:RAK3112_room_server]
[env:RAK_3112_room_server]
extends = rak3112
build_flags =
${rak3112.build_flags}
-D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"RAK3112 Room"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
@@ -115,13 +108,12 @@ build_flags =
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_room_server>
lib_deps =
${rak3112.lib_deps}
${esp32_ota.lib_deps}
[env:RAK3112_terminal_chat]
[env:RAK_3112_terminal_chat]
extends = rak3112
build_flags =
${rak3112.build_flags}
@@ -135,33 +127,29 @@ lib_deps =
${rak3112.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:RAK3112_companion_radio_usb]
[env:RAK_3112_companion_radio_usb]
extends = rak3112
build_flags =
${rak3112.build_flags}
-I examples/companion_radio/ui-new
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D DISPLAY_CLASS=SSD1306Display
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps =
${rak3112.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:RAK3112_companion_radio_ble]
[env:RAK_3112_companion_radio_ble]
extends = rak3112
build_flags =
${rak3112.build_flags}
-I examples/companion_radio/ui-new
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D DISPLAY_CLASS=SSD1306Display
-D BLE_PIN_CODE=123456 ; dynamic, random PIN
-D AUTO_SHUTDOWN_MILLIVOLTS=3400
-D BLE_DEBUG_LOGGING=1
@@ -169,8 +157,6 @@ build_flags =
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
@@ -178,14 +164,13 @@ lib_deps =
${rak3112.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:RAK3112_companion_radio_wifi]
[env:RAK_3112_companion_radio_wifi]
extends = rak3112
build_flags =
${rak3112.build_flags}
-I examples/companion_radio/ui-new
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D DISPLAY_CLASS=SSD1306Display
-D WIFI_DEBUG_LOGGING=1
-D WIFI_SSID='"myssid"'
-D WIFI_PWD='"mypwd"'
@@ -193,8 +178,6 @@ build_flags =
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
@@ -202,7 +185,7 @@ lib_deps =
${rak3112.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:RAK3112_sensor]
[env:RAK_3112_sensor]
extends = rak3112
build_flags =
${rak3112.build_flags}
@@ -212,11 +195,9 @@ build_flags =
-D ADMIN_PASSWORD='"password"'
-D ENV_PIN_SDA=33
-D ENV_PIN_SCL=34
-D DISPLAY_CLASS=SSD1306Display
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<../examples/simple_sensor>
lib_deps =
${rak3112.lib_deps}

1
variants/rak3401/platformio.ini
View File

@@ -6,7 +6,6 @@ build_flags = ${nrf52_base.build_flags}
${sensor_base.build_flags}
-I variants/rak3401
-D RAK_3401
-D RAK13302
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D LORA_TX_POWER=22

7
variants/rak3x72/platformio.ini
View File

@@ -3,6 +3,7 @@ extends = stm32_base
board = rak3172
board_upload.maximum_size = 229376 ; 32kb for FS
build_flags = ${stm32_base.build_flags}
-D RAK_3X72
-D RADIO_CLASS=CustomSTM32WLx
-D WRAPPER_CLASS=CustomSTM32WLxWrapper
-D SPI_INTERFACES_COUNT=0
@@ -13,7 +14,7 @@ build_flags = ${stm32_base.build_flags}
build_src_filter = ${stm32_base.build_src_filter}
+<../variants/rak3x72>
[env:rak3x72_repeater]
[env:RAK_3x72_repeater]
extends = rak3x72
build_flags = ${rak3x72.build_flags}
-D ADVERT_NAME='"RAK3x72 Repeater"'
@@ -22,7 +23,7 @@ build_flags = ${rak3x72.build_flags}
build_src_filter = ${rak3x72.build_src_filter}
+<../examples/simple_repeater/*.cpp>
[env:rak3x72_sensor]
[env:RAK_3x72_sensor]
extends = rak3x72
build_flags = ${rak3x72.build_flags}
-D ADVERT_NAME='"RAK3x72 Sensor"'
@@ -30,7 +31,7 @@ build_flags = ${rak3x72.build_flags}
build_src_filter = ${rak3x72.build_src_filter}
+<../examples/simple_sensor>
[env:rak3x72_companion_radio_usb]
[env:RAK_3x72_companion_radio_usb]
extends = rak3x72
build_flags = ${rak3x72.build_flags}
; -D FORMAT_FS=true