Skip to content

Commit b1094c2

Browse files
liamcottleliamcottle
authored
Merge pull request #1616 from jbrazio/2026/raknorm
Refactor environment names and build flags for RAK variants
2 parents f6fc056 + fcfbb45 commit b1094c2

4 files changed

Lines changed: 21 additions & 39 deletions

File tree

‎variants/rak11310/platformio.ini‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ board = rakwireless_rak11300
77
board_build.filesystem_size = 0.5m
88
build_flags = ${rp2040_base.build_flags}
99
-I variants/rak11310
10+
-D RAK_11310
1011
-D ARDUINO_RAKWIRELESS_RAK11300=1
1112
-D SX126X_CURRENT_LIMIT=140
1213
-D RADIO_CLASS=CustomSX1262
@@ -34,7 +35,7 @@ build_src_filter = ${rp2040_base.build_src_filter}
3435
+<../variants/rak11310>
3536
lib_deps = ${rp2040_base.lib_deps}
3637

37-
[env:rak11310_repeater]
38+
[env:RAK_11310_repeater]
3839
extends = rak11310
3940
build_flags = ${rak11310.build_flags}
4041
-D ADVERT_NAME='"RAK11310 Repeater"'
@@ -47,7 +48,7 @@ build_flags = ${rak11310.build_flags}
4748
build_src_filter = ${rak11310.build_src_filter}
4849
+<../examples/simple_repeater>
4950

50-
[env:rak11310_repeater_bridge_rs232]
51+
[env:RAK_11310_repeater_bridge_rs232]
5152
extends = rak11310
5253
build_flags = ${rak11310.build_flags}
5354
-D ADVERT_NAME='"RS232 Bridge"'
@@ -65,7 +66,7 @@ build_src_filter = ${rak11310.build_src_filter}
6566
+<helpers/bridges/RS232Bridge.cpp>
6667
+<../examples/simple_repeater>
6768

68-
[env:rak11310_room_server]
69+
[env:RAK_11310_room_server]
6970
extends = rak11310
7071
build_flags = ${rak11310.build_flags}
7172
-D ADVERT_NAME='"RAK11310 Room"'
@@ -78,7 +79,7 @@ build_flags = ${rak11310.build_flags}
7879
build_src_filter = ${rak11310.build_src_filter}
7980
+<../examples/simple_room_server>
8081

81-
[env:rak11310_companion_radio_usb]
82+
[env:RAK_11310_companion_radio_usb]
8283
extends = rak11310
8384
build_flags = ${rak11310.build_flags}
8485
-D MAX_CONTACTS=100
@@ -90,7 +91,7 @@ build_src_filter = ${rak11310.build_src_filter}
9091
lib_deps = ${rak11310.lib_deps}
9192
densaugeo/base64 @ ~1.4.0
9293

93-
; [env:rak11310_companion_radio_ble]
94+
; [env:RAK_11310_companion_radio_ble]
9495
; extends = rak11310
9596
; build_flags = ${rak11310.build_flags}
9697
; -D MAX_CONTACTS=100
@@ -104,7 +105,7 @@ lib_deps = ${rak11310.lib_deps}
104105
; lib_deps = ${rak11310.lib_deps}
105106
; densaugeo/base64 @ ~1.4.0
106107

107-
; [env:rak11310_companion_radio_wifi]
108+
; [env:RAK_11310_companion_radio_wifi]
108109
; extends = rak11310
109110
; build_flags = ${rak11310.build_flags}
110111
; -D MAX_CONTACTS=100
@@ -119,7 +120,7 @@ lib_deps = ${rak11310.lib_deps}
119120
; lib_deps = ${rak11310.lib_deps}
120121
; densaugeo/base64 @ ~1.4.0
121122

122-
[env:rak11310_terminal_chat]
123+
[env:RAK_11310_terminal_chat]
123124
extends = rak11310
124125
build_flags = ${rak11310.build_flags}
125126
-D MAX_CONTACTS=100

‎variants/rak3112/platformio.ini‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ lib_deps =
3636
${esp32_base.lib_deps}
3737
${sensor_base.lib_deps}
3838

39-
[env:RAK3112_repeater]
39+
[env:RAK_3112_repeater]
4040
extends = rak3112
4141
build_flags =
4242
${rak3112.build_flags}
43-
-D DISPLAY_CLASS=SSD1306Display
4443
-D ADVERT_NAME='"RAK3112 Repeater"'
4544
-D ADVERT_LAT=0.0
4645
-D ADVERT_LON=0.0
@@ -49,18 +48,16 @@ build_flags =
4948
; -D MESH_PACKET_LOGGING=1
5049
; -D MESH_DEBUG=1
5150
build_src_filter = ${rak3112.build_src_filter}
52-
+<helpers/ui/SSD1306Display.cpp>
5351
+<../examples/simple_repeater>
5452
lib_deps =
5553
${rak3112.lib_deps}
5654
${esp32_ota.lib_deps}
5755
bakercp/CRC32 @ ^2.0.0
5856

59-
[env:RAK3112_repeater_bridge_rs232]
57+
[env:RAK_3112_repeater_bridge_rs232]
6058
extends = rak3112
6159
build_flags =
6260
${rak3112.build_flags}
63-
-D DISPLAY_CLASS=SSD1306Display
6461
-D ADVERT_NAME='"RS232 Bridge"'
6562
-D ADVERT_LAT=0.0
6663
-D ADVERT_LON=0.0
@@ -74,17 +71,15 @@ build_flags =
7471
; -D MESH_DEBUG=1
7572
build_src_filter = ${rak3112.build_src_filter}
7673
+<helpers/bridges/RS232Bridge.cpp>
77-
+<helpers/ui/SSD1306Display.cpp>
7874
+<../examples/simple_repeater>
7975
lib_deps =
8076
${rak3112.lib_deps}
8177
${esp32_ota.lib_deps}
8278

83-
[env:RAK3112_repeater_bridge_espnow]
79+
[env:RAK_3112_repeater_bridge_espnow]
8480
extends = rak3112
8581
build_flags =
8682
${rak3112.build_flags}
87-
-D DISPLAY_CLASS=SSD1306Display
8883
-D ADVERT_NAME='"ESPNow Bridge"'
8984
-D ADVERT_LAT=0.0
9085
-D ADVERT_LON=0.0
@@ -96,17 +91,15 @@ build_flags =
9691
; -D MESH_DEBUG=1
9792
build_src_filter = ${rak3112.build_src_filter}
9893
+<helpers/bridges/ESPNowBridge.cpp>
99-
+<helpers/ui/SSD1306Display.cpp>
10094
+<../examples/simple_repeater>
10195
lib_deps =
10296
${rak3112.lib_deps}
10397
${esp32_ota.lib_deps}
10498

105-
[env:RAK3112_room_server]
99+
[env:RAK_3112_room_server]
106100
extends = rak3112
107101
build_flags =
108102
${rak3112.build_flags}
109-
-D DISPLAY_CLASS=SSD1306Display
110103
-D ADVERT_NAME='"RAK3112 Room"'
111104
-D ADVERT_LAT=0.0
112105
-D ADVERT_LON=0.0
@@ -115,13 +108,12 @@ build_flags =
115108
; -D MESH_PACKET_LOGGING=1
116109
; -D MESH_DEBUG=1
117110
build_src_filter = ${rak3112.build_src_filter}
118-
+<helpers/ui/SSD1306Display.cpp>
119111
+<../examples/simple_room_server>
120112
lib_deps =
121113
${rak3112.lib_deps}
122114
${esp32_ota.lib_deps}
123115

124-
[env:RAK3112_terminal_chat]
116+
[env:RAK_3112_terminal_chat]
125117
extends = rak3112
126118
build_flags =
127119
${rak3112.build_flags}
@@ -135,74 +127,65 @@ lib_deps =
135127
${rak3112.lib_deps}
136128
densaugeo/base64 @ ~1.4.0
137129

138-
[env:RAK3112_companion_radio_usb]
130+
[env:RAK_3112_companion_radio_usb]
139131
extends = rak3112
140132
build_flags =
141133
${rak3112.build_flags}
142134
-I examples/companion_radio/ui-new
143135
-D MAX_CONTACTS=350
144136
-D MAX_GROUP_CHANNELS=40
145-
-D DISPLAY_CLASS=SSD1306Display
146137
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
147138
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
148139
build_src_filter = ${rak3112.build_src_filter}
149-
+<helpers/ui/SSD1306Display.cpp>
150-
+<helpers/ui/MomentaryButton.cpp>
151140
+<../examples/companion_radio/*.cpp>
152141
+<../examples/companion_radio/ui-new/*.cpp>
153142
lib_deps =
154143
${rak3112.lib_deps}
155144
densaugeo/base64 @ ~1.4.0
156145

157-
[env:RAK3112_companion_radio_ble]
146+
[env:RAK_3112_companion_radio_ble]
158147
extends = rak3112
159148
build_flags =
160149
${rak3112.build_flags}
161150
-I examples/companion_radio/ui-new
162151
-D MAX_CONTACTS=350
163152
-D MAX_GROUP_CHANNELS=40
164-
-D DISPLAY_CLASS=SSD1306Display
165153
-D BLE_PIN_CODE=123456 ; dynamic, random PIN
166154
-D AUTO_SHUTDOWN_MILLIVOLTS=3400
167155
-D BLE_DEBUG_LOGGING=1
168156
-D OFFLINE_QUEUE_SIZE=256
169157
; -D MESH_PACKET_LOGGING=1
170158
; -D MESH_DEBUG=1
171159
build_src_filter = ${rak3112.build_src_filter}
172-
+<helpers/ui/SSD1306Display.cpp>
173-
+<helpers/ui/MomentaryButton.cpp>
174160
+<helpers/esp32/*.cpp>
175161
+<../examples/companion_radio/*.cpp>
176162
+<../examples/companion_radio/ui-new/*.cpp>
177163
lib_deps =
178164
${rak3112.lib_deps}
179165
densaugeo/base64 @ ~1.4.0
180166

181-
[env:RAK3112_companion_radio_wifi]
167+
[env:RAK_3112_companion_radio_wifi]
182168
extends = rak3112
183169
build_flags =
184170
${rak3112.build_flags}
185171
-I examples/companion_radio/ui-new
186172
-D MAX_CONTACTS=350
187173
-D MAX_GROUP_CHANNELS=40
188-
-D DISPLAY_CLASS=SSD1306Display
189174
-D WIFI_DEBUG_LOGGING=1
190175
-D WIFI_SSID='"myssid"'
191176
-D WIFI_PWD='"mypwd"'
192177
-D OFFLINE_QUEUE_SIZE=256
193178
; -D MESH_PACKET_LOGGING=1
194179
; -D MESH_DEBUG=1
195180
build_src_filter = ${rak3112.build_src_filter}
196-
+<helpers/ui/SSD1306Display.cpp>
197-
+<helpers/ui/MomentaryButton.cpp>
198181
+<helpers/esp32/*.cpp>
199182
+<../examples/companion_radio/*.cpp>
200183
+<../examples/companion_radio/ui-new/*.cpp>
201184
lib_deps =
202185
${rak3112.lib_deps}
203186
densaugeo/base64 @ ~1.4.0
204187

205-
[env:RAK3112_sensor]
188+
[env:RAK_3112_sensor]
206189
extends = rak3112
207190
build_flags =
208191
${rak3112.build_flags}
@@ -212,11 +195,9 @@ build_flags =
212195
-D ADMIN_PASSWORD='"password"'
213196
-D ENV_PIN_SDA=33
214197
-D ENV_PIN_SCL=34
215-
-D DISPLAY_CLASS=SSD1306Display
216198
; -D MESH_PACKET_LOGGING=1
217199
; -D MESH_DEBUG=1
218200
build_src_filter = ${rak3112.build_src_filter}
219-
+<helpers/ui/SSD1306Display.cpp>
220201
+<../examples/simple_sensor>
221202
lib_deps =
222203
${rak3112.lib_deps}

‎variants/rak3401/platformio.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ build_flags = ${nrf52_base.build_flags}
66
${sensor_base.build_flags}
77
-I variants/rak3401
88
-D RAK_3401
9-
-D RAK13302
109
-D RADIO_CLASS=CustomSX1262
1110
-D WRAPPER_CLASS=CustomSX1262Wrapper
1211
-D LORA_TX_POWER=22

‎variants/rak3x72/platformio.ini‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ extends = stm32_base
33
board = rak3172
44
board_upload.maximum_size = 229376 ; 32kb for FS
55
build_flags = ${stm32_base.build_flags}
6+
-D RAK_3X72
67
-D RADIO_CLASS=CustomSTM32WLx
78
-D WRAPPER_CLASS=CustomSTM32WLxWrapper
89
-D SPI_INTERFACES_COUNT=0
@@ -13,7 +14,7 @@ build_flags = ${stm32_base.build_flags}
1314
build_src_filter = ${stm32_base.build_src_filter}
1415
+<../variants/rak3x72>
1516

16-
[env:rak3x72_repeater]
17+
[env:RAK_3x72_repeater]
1718
extends = rak3x72
1819
build_flags = ${rak3x72.build_flags}
1920
-D ADVERT_NAME='"RAK3x72 Repeater"'
@@ -22,15 +23,15 @@ build_flags = ${rak3x72.build_flags}
2223
build_src_filter = ${rak3x72.build_src_filter}
2324
+<../examples/simple_repeater/*.cpp>
2425

25-
[env:rak3x72_sensor]
26+
[env:RAK_3x72_sensor]
2627
extends = rak3x72
2728
build_flags = ${rak3x72.build_flags}
2829
-D ADVERT_NAME='"RAK3x72 Sensor"'
2930
-D ADMIN_PASSWORD='"password"'
3031
build_src_filter = ${rak3x72.build_src_filter}
3132
+<../examples/simple_sensor>
3233

33-
[env:rak3x72_companion_radio_usb]
34+
[env:RAK_3x72_companion_radio_usb]
3435
extends = rak3x72
3536
build_flags = ${rak3x72.build_flags}
3637
; -D FORMAT_FS=true

0 commit comments

Comments
 (0)