Skip to content

Commit 8e0df1b

Browse files
committed
Switch NanoC6 to pioarduino, set Tab5 16MB partition, and adjust test envs
1 parent 2c27d6f commit 8e0df1b

1 file changed

Lines changed: 25 additions & 20 deletions

File tree

platformio.ini

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
[platformio]
55

66
[env]
7-
build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr
8-
7+
build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr -Wl,--allow-multiple-definition
98
test_framework = googletest
109
test_build_src = true
11-
1210
lib_ldf_mode = deep
1311
lib_deps=m5stack/M5Unified
14-
m5stack/M5Utility
15-
m5stack/M5HAL
1612

1713
; --------------------------------
1814
; Board definitions
@@ -80,7 +76,9 @@ lib_deps = ${env.lib_deps}
8076
[NanoC6]
8177
extends = m5base
8278
board = m5stack-nanoc6
83-
board_build.partitions = default.csv
79+
build_flags =
80+
-DARDUINO_USB_CDC_ON_BOOT=1
81+
-DARDUINO_USB_MODE=1
8482
lib_deps = ${env.lib_deps}
8583

8684
[StickCPlus]
@@ -131,6 +129,9 @@ extends = m5base
131129
board = esp32-p4-evboard
132130
board_build.mcu = esp32p4
133131
board_build.flash_mode = qio
132+
board_build.partitions = default_16MB.csv
133+
;monitor_dtr = 0
134+
;monitor_rts = 0
134135
build_flags =
135136
-DBOARD_HAS_PSRAM
136137
-DARDUINO_USB_CDC_ON_BOOT=1
@@ -161,13 +162,6 @@ lib_deps = ${env.lib_deps}
161162
platform = espressif32 @ 6.12.0
162163
framework = arduino
163164

164-
[nanoc6_latest]
165-
platform = espressif32 @ 6.12.0
166-
platform_packages =
167-
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.7
168-
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
169-
framework = arduino
170-
171165
[pioarduino_latest]
172166
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
173167
framework = arduino
@@ -218,10 +212,12 @@ lib_deps = google/googletest@1.12.1
218212
; M5HAL, M5Utility, M5Unit-* are resolved via symlinks in lib/
219213
; M5Unified via lib_deps (depends on M5GFX etc.)
220214
lib_extra_dirs = lib
221-
.
222-
lib_deps = m5stack/M5Unified
215+
.
216+
lib_deps = ${env.lib_deps}
223217
${test_fw.lib_deps}
224218
lib_ignore = M5UnitUnified
219+
test_filter = embedded/test_update
220+
test_ignore = embedded/test_readme
225221

226222
[env:test_Core]
227223
extends=Core, option_release, test_base, arduino_latest
@@ -251,7 +247,9 @@ extends=AtomS3, option_release, test_base, arduino_latest
251247
extends=AtomS3R, option_release, test_base, arduino_latest
252248

253249
[env:test_NanoC6]
254-
extends=NanoC6, option_release, test_base, nanoc6_latest
250+
extends=NanoC6, option_release, test_base, pioarduino_latest
251+
build_flags = ${NanoC6.build_flags}
252+
${option_release.build_flags}
255253
lib_ignore = ${test_base.lib_ignore}
256254
bsec2
257255

@@ -281,6 +279,8 @@ build_flags = ${Cardputer.build_flags}
281279
extends=Tab5, option_release, test_base, pioarduino_latest
282280
build_flags = ${Tab5.build_flags}
283281
${option_release.build_flags}
282+
lib_ignore = ${test_base.lib_ignore}
283+
bsec2
284284

285285
[env:test_NessoN1]
286286
extends=NessoN1, option_release, test_base, pioarduino_latest
@@ -291,10 +291,11 @@ extends=NessoN1, option_release, test_base, pioarduino_latest
291291
; Works in CI without lib/ symlinks
292292
; --------------------------------
293293
[readme_base]
294-
lib_deps = m5stack/M5Unified
295-
m5stack/M5Utility
296-
m5stack/M5HAL
294+
lib_extra_dirs = lib
295+
.
296+
lib_deps = ${env.lib_deps}
297297
${test_fw.lib_deps}
298+
lib_ignore = M5UnitUnified
298299
test_filter = embedded/test_readme
299300
test_ignore = embedded/test_update
300301
build_flags = ${option_release.build_flags}
@@ -328,7 +329,9 @@ extends=AtomS3, readme_base, arduino_latest
328329
extends=AtomS3R, readme_base, arduino_latest
329330

330331
[env:test_readme_NanoC6]
331-
extends=NanoC6, readme_base, nanoc6_latest
332+
extends=NanoC6, readme_base, pioarduino_latest
333+
build_flags = ${NanoC6.build_flags}
334+
${option_release.build_flags}
332335

333336
[env:test_readme_StickCPlus]
334337
extends=StickCPlus, readme_base, arduino_latest
@@ -356,6 +359,8 @@ build_flags = ${Cardputer.build_flags}
356359
extends=Tab5, readme_base, pioarduino_latest
357360
build_flags = ${Tab5.build_flags}
358361
${readme_base.build_flags}
362+
lib_ignore = ${test_base.lib_ignore}
363+
bsec2
359364

360365
[env:test_readme_NessoN1]
361366
extends=NessoN1, readme_base, pioarduino_latest

0 commit comments

Comments
 (0)