Fix firmware merge

Author: joined

esp/lcd_8048s070c.cpp

@@ -74,6 +74,7 @@ static esp_err_t app_lcd_init(void) {
     backlight_init(PIN_BL, 50);
 
     ESP_LOGD(TAG, "Install LCD driver");
+    // See e.g. https://github.com/MMlodzinski/Sunton_ESP32-8048S070c_ESP_IDF_LVGL_example/blob/main/example/main/bsp.h
     const esp_lcd_rgb_panel_config_t panel_config = {
         .clk_src = LCD_CLK_SRC_PLL160M,
         .timings =

partitions_esp32s3.csv partitions_esp32s2.csvpartitions_esp32s3.csv renamed to partitions_esp32s2.csv

@@ -1,11 +1,56 @@
 #!/usr/bin/env bash
 
-esptool.py --chip esp32 merge_bin \
+# Detect target - priority: command line arg > IDF_TARGET env var > sdkconfig fallback
+if [ $# -gt 0 ]; then
+    TARGET="$1"
+    echo "Using target from command line: $TARGET"
+elif [ -n "$IDF_TARGET" ]; then
+    TARGET="$IDF_TARGET"
+    echo "Using target from IDF_TARGET environment variable: $TARGET"
+else
+    echo "Error: No target specified. Use:"
+    echo "  $0 <target>           # Command line argument"
+    echo "  IDF_TARGET=<target>   # Environment variable"
+    echo ""
+    echo "Supported targets: esp32, esp32s3"
+    exit 1
+fi
+
+# Set parameters based on target
+case "$TARGET" in
+    "esp32")
+        CHIP="esp32"
+        FLASH_MODE="qio"
+        FLASH_FREQ="80m"
+        FLASH_SIZE="4MB"
+        APP_OFFSET="0x10000"
+        WWW_OFFSET="0x300000"
+        ;;
+    "esp32s3")
+        CHIP="esp32s3"
+        FLASH_MODE="qio"
+        FLASH_FREQ="80m"
+        FLASH_SIZE="16MB"
+        APP_OFFSET="0x10000"
+        WWW_OFFSET="0xEE0000"
+        ;;
+    *)
+        echo "Error: Unsupported target $TARGET"
+        exit 1
+        ;;
+esac
+
+echo "Building merged firmware for $TARGET..."
+echo "  Flash mode: $FLASH_MODE"
+echo "  Flash freq: $FLASH_FREQ"
+echo "  Flash size: $FLASH_SIZE"
+
+esptool.py --chip "$CHIP" merge_bin \
     -o ../build/merged-firmware.bin \
-    --flash_mode dio \
-    --flash_freq 80m \
-    --flash_size 4MB \
+    --flash_mode "$FLASH_MODE" \
+    --flash_freq "$FLASH_FREQ" \
+    --flash_size "$FLASH_SIZE" \
     0x1000 ../build/bootloader/bootloader.bin \
     0x8000 ../build/partition_table/partition-table.bin \
-    0x20000 ../build/suntransit.bin \
-    0x300000 ../build/www.bin \
+    "$APP_OFFSET" ../build/suntransit.bin \
+    "$WWW_OFFSET" ../build/www.bin

scripts/merge_firmware.sh

@@ -1,6 +1,6 @@
 CONFIG_IDF_TARGET="esp32s3"
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_esp32s3.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_esp32s2.csv"
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_MODE_OCT=y
 CONFIG_SPIRAM_XIP_FROM_PSRAM=y