more merge error fixes

This commit is contained in:
Jason2866
2025-07-23 18:02:58 +02:00
parent c95f289c2d
commit 8e3cdf0ee7
30 changed files with 10 additions and 748 deletions
@@ -28,6 +28,13 @@ lib_ignore = wifi
build_flags = -DBUILTIN_RGBLED_PIN=8
-DNR_OF_LEDS=1
[env:esp32-c5]
platform = espressif32
framework = arduino
board = esp32-c5-devkitc-1
build_flags = -DBUILTIN_RGBLED_PIN=27
-DNR_OF_LEDS=1
[env:esp32-c6]
platform = espressif32
framework = arduino