From f6eb92443a6dfdf14c77ad282bd8cd17ba93addf Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Tue, 18 Oct 2022 23:00:01 +0200
Subject: [PATCH] SC01 Plus configuration tweaks #390

---
 tools/esp_merge_bin.py                 | 4 ++--
 user_setups/esp32s3/wt01_sc01-plus.ini | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/esp_merge_bin.py b/tools/esp_merge_bin.py
index 13443484..1fcaeea3 100644
--- a/tools/esp_merge_bin.py
+++ b/tools/esp_merge_bin.py
@@ -50,13 +50,13 @@ def copy_merge_bins(source, target, env):
     flash_size = env.GetProjectOption("board_upload.flash_size")
 
     board = env.BoardConfig()
-    mcu = board.get("build.mcu", "esp32")
     flash_mode = board.get("build.flash_mode", "dio")
     f_flash = board.get("build.f_flash", "40000000L")
     flash_freq = '40m'
     if (f_flash == '80000000L'):
         flash_freq = '80m'
 
+    mcu = board.get("build.mcu", "esp32")
     bootloader = "{}tools{}sdk{}{}{}bin{}bootloader_{}_{}.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, mcu, os.path.sep, os.path.sep, flash_mode, flash_freq)
     # if not os.path.isfile(bootloader):
     #     bootloader = "{}tools{}sdk{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep, os.path.sep, os.path.sep)
@@ -65,7 +65,7 @@ def copy_merge_bins(source, target, env):
     bootloader_location = '0x1000'
     if (mcu == 'esp32s3'):
         bootloader_location = '0x0000'
-        
+
     partitions = "{}{}partitions.bin".format(env.subst("$BUILD_DIR"), os.path.sep)
     boot_app0 = "{}tools{}partitions{}boot_app0.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep)
     firmware_dst ="{}firmware{}{}_full_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, name, flash_size, version)
diff --git a/user_setups/esp32s3/wt01_sc01-plus.ini b/user_setups/esp32s3/wt01_sc01-plus.ini
index 6063af52..8e4aea06 100644
--- a/user_setups/esp32s3/wt01_sc01-plus.ini
+++ b/user_setups/esp32s3/wt01_sc01-plus.ini
@@ -7,7 +7,8 @@
 
 [env:wt01_sc01-plus]
 extends = esp32s3_8mb_v2
-board = um_tinys3
+;board = um_tinys3
+board = esp32s3
 ;board = esp32s3_opi
 
 build_flags =
@@ -27,7 +28,6 @@ build_flags =
     -D TFT_WIDTH=320
     -D TFT_HEIGHT=480
     -D SPI_FREQUENCY=20000000
-    -D INVERT_COLORS=1
     -D TFT_RD=-1
     -D TFT_WR=47
     -D TFT_RS=0
@@ -43,7 +43,7 @@ build_flags =
     -D TFT_CS=-1
     -D TFT_RST=4
     -D TFT_BUSY=-1
-    -D TFT_BL=-1
+    -D TFT_BCKL=45
     -D I2C_TOUCH_FREQUENCY=400000
     -D I2C_TOUCH_ADDRESS=0x38
     -D I2C_TOUCH_PORT=1