From 246bfe0cb9c6c3f7286f745ff5e990a849e7e4e1 Mon Sep 17 00:00:00 2001
From: David Gwilliam <dhgwilliam@gmail.com>
Date: Tue, 17 Feb 2026 01:13:28 -0800
Subject: [PATCH] fix(doorbell-touch): correct LovyanGFX library integration
 and build

---
 mise.toml | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/mise.toml b/mise.toml
index 8d2c9b3..7738bcb 100644
--- a/mise.toml
+++ b/mise.toml
@@ -28,22 +28,41 @@ echo "[OK] TFT_eSPI 2.5.43 vendored + configured"
 """
 
 [tasks.install-libs-s3-43]
+description = "Vendor LovyanGFX into vendor/esp32-s3-lcd-43"
 run = """
 #!/usr/bin/env bash
 set -euo pipefail
 
+LOVyanGFX_DIR="vendor/esp32-s3-lcd-43/LovyanGFX"
+
 # Clone LovyanGFX (latest)
-if [ ! -d "vendor/esp32-s3-lcd-43/LovyanGFX" ]; then
+if [ ! -d "$LOVyanGFX_DIR" ]; then
   echo "Cloning LovyanGFX..."
   git clone --depth 1 \
     https://github.com/lovyan03/LovyanGFX.git \
-    vendor/esp32-s3-lcd-43/LovyanGFX
+    "$LOVyanGFX_DIR"
 else
   echo "LovyanGFX already exists, skipping"
 fi
 
-# Remove any old library.properties (let Arduino detect automatically)
-rm -f vendor/esp32-s3-lcd-43/LovyanGFX/library.properties
+# Create library.properties that correctly points to source
+cat > "$LOVyanGFX_DIR/library.properties" << 'EOF'
+name=LovyanGFX
+version=1.2.0
+author=lovyan03
+maintainer=lovyan03
+sentence=Display and touch driver library for ESP32
+paragraph=Universal graphics library for ESP32 with support for various displays and touch controllers
+category=Display
+url=https://github.com/lovyan03/LovyanGFX
+architectures=esp32
+includes=LovyanGFX.hpp
+# This tells Arduino to build from src/
+# Arduino will look in src/ for .cpp files
+EOF
+
+# Create a empty src to ensure sources are found
+mkdir -p "$LOVyanGFX_DIR/src"
 
 echo "[OK] LovyanGFX vendored"
 """
@@ -92,8 +111,8 @@ run = """
 arduino-cli compile \
   --fqbn "esp32:esp32:waveshare_esp32_s3_touch_lcd_43:PSRAM=enabled,FlashSize=16M,USBMode=hwcdc,PartitionScheme=app3M_fat9M_16MB" \
   --libraries ./libraries \
-  --libraries ./vendor/esp32-s3-lcd-43/LovyanGFX/src \
-  --build-property "compiler.cpp.extra_flags=-DDEBUG_MODE -DBOARD_HAS_PSRAM" \
+  --library ./vendor/esp32-s3-lcd-43/LovyanGFX \
+  --build-property "compiler.cpp.extra_flags=-DDEBUG_MODE -DBOARD_HAS_PSRAM -DLGFX_USE_V1" \
   --warnings default \
   ./boards/esp32-s3-lcd-43
 """