From 93b6de61080280ad05201bb8662929ac81549b6d Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Wed, 6 Oct 2021 00:21:05 +0200
Subject: [PATCH] Add esp32-one_st7796

---
 .github/workflows/build.yaml                    |  2 +-
 platformio_override-template.ini                | 17 +++++++++++------
 ...p32-one_ili9486.ini => esp32-one_st7796.ini} |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
 rename user_setups/esp32/{esp32-one_ili9486.ini => esp32-one_st7796.ini} (98%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 773d2698..9c69801e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -44,7 +44,7 @@ jobs:
         run: |
           cat platformio_override.ini
       - name: Run PlatformIO
-        run: pio run -e arduitouch-esp32_ili9341 -e makerfabs-tft35-cap -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
+        run: pio run -e arduitouch-esp32_ili9341 -e esp32-one_st7796 -e makerfabs-tft35-cap -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
       - name: Upload output file
         uses: actions/upload-artifact@v2
         with:
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
index 0d4cdc6c..cc88fbf6 100644
--- a/platformio_override-template.ini
+++ b/platformio_override-template.ini
@@ -28,15 +28,16 @@ extra_default_envs =
     ; d1-r32-unoshield
     ; esp32-9341-unoshield-analog
     ; esp12e-st7735
+    ; esp32-one_st7796
     ; esp32dev-mrb3511
     ; esp32dev-ili9488
     ; lanbon_l8
     ; lolin-d32-pro_ili9341
     ; my_custom_build
     ; nodemcu32s-raspi
-    ; wt32-sc01
     ; ttgo_esp32_poe-ili9341
     ; ttgo-lilygo-pi_ili9481
+    ; wt32-sc01
 ;endregion
 
 ;region -- Define your local COM ports for each environment ---
@@ -63,6 +64,15 @@ upload_flags = --port=3232 ; --auth=haspadmin   ; OTA password
 monitor_port = COM7       ; Leave commented to autodescover
 ; upload_port = ${$env:esp32-9341-unoshield-analog.monitor_port}
 
+[env:esp32-one_st7796]
+upload_port = COM6      ; Change to the correct port
+monitor_port = COM6     ; Change to the correct port
+
+[env:lolin-d32-pro_ili9341]
+monitor_port = COM5       ; Change to the correct port
+upload_port = ${env:lolin-d32-pro_ili9341.monitor_port}
+;endregion
+
 [env:ttgo_esp32_poe-ili9341]
 monitor_port = COM9       ; Change to the correct port
 ;upload_port = ${env:ttgo_esp32_poe-ili9341.monitor_port}
@@ -77,11 +87,6 @@ upload_port = 192.168.4.5 ; IP of the ESP
 upload_protocol = espota  ; Use ArduinoOTA after flashing over serial
 upload_flags = --port=3232 ; --auth=haspadmin   ; OTA password
 
-[env:lolin-d32-pro_ili9341]
-monitor_port = COM5       ; Change to the correct port
-upload_port = ${env:lolin-d32-pro_ili9341.monitor_port}
-;endregion
-
 ;region -- Custom Environment configuration example -----------------
 [env:my_custom_build]
 extends = esp32
diff --git a/user_setups/esp32/esp32-one_ili9486.ini b/user_setups/esp32/esp32-one_st7796.ini
similarity index 98%
rename from user_setups/esp32/esp32-one_ili9486.ini
rename to user_setups/esp32/esp32-one_st7796.ini
index d6502ab6..ec9d9630 100644
--- a/user_setups/esp32/esp32-one_ili9486.ini
+++ b/user_setups/esp32/esp32-one_st7796.ini
@@ -5,7 +5,7 @@
 ;               - XPT2046 touch controller          ;
 ;***************************************************;
 
-[env:esp32-one_ili9486]
+[env:esp32-one_st7796]
 extends = esp32
 board = esp32dev