klubhaus/klubhaus-doorbell
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use compiler.cpp.extra_flags to avoid clobbering platform defines

Browse Source 
build.extra_flags replaces the esp32 core's platform-level flags,
which include CONFIG_IDF_TARGET_ESP32S3 — required by Arduino_GFX
for RGB panel support. compiler.cpp.extra_flags appends safely.
This commit is contained in:
David Gwilliam
2026-02-16 15:23:03 -08:00
parent 6d45dae9c9
commit 35016940b5
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sketches/doorbell-touch-esp32-32e/mise.toml
View File

@@ -1,15 +1,10 @@
[tools] [tools]
arduino-cli = "latest" arduino-cli = "latest"
lazygit = "latest" lazygit = "latest"
python = "latest" python = "latest"
ruby = "latest" ruby = "latest"
# ═══════════════════════════════════════════════════════════════════
# Default target — override with: BOARD_TARGET=waveshare_s3 mise run compile
# ═══════════════════════════════════════════════════════════════════
[env]
BOARD_TARGET = "e32r35t"
[tasks.install-core] [tasks.install-core]
run = "arduino-cli core update-index && arduino-cli core install esp32:esp32" run = "arduino-cli core update-index && arduino-cli core install esp32:esp32"
@@ -62,7 +57,7 @@ echo "║ FQBN: $FQBN"
echo "║ Flags: $BUILD_FLAGS" echo "║ Flags: $BUILD_FLAGS"
echo "╚══════════════════════════════════════════════════╝" echo "╚══════════════════════════════════════════════════╝"
arduino-cli compile --fqbn "$FQBN" \ arduino-cli compile --fqbn "$FQBN" \
--build-property "build.extra_flags=$BUILD_FLAGS" . --build-property "compiler.cpp.extra_flags=$BUILD_FLAGS" .
""" """
[tasks.upload] [tasks.upload]
@@ -105,9 +100,9 @@ case "${BOARD_TARGET:-e32r35t}" in
esac esac
PORT=$(arduino-cli board list | grep -iE "$PORT_PATTERN" | head -1 | awk '{print $1}') PORT=$(arduino-cli board list | grep -iE "$PORT_PATTERN" | head -1 | awk '{print $1}')
if [ -z "$PORT" ]; then if [ -z "$PORT" ]; then
echo "No matching port for pattern: $PORT_PATTERN" echo "No matching port for pattern: $PORT_PATTERN"
arduino-cli board list arduino-cli board list
exit 1 exit 1
fi fi
arduino-cli monitor -p "$PORT" -c baudrate=115200 arduino-cli monitor -p "$PORT" -c baudrate=115200
""" """