From 14c23d79ede8fca7eaff3dffed2a114f3b5e1ceb Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Sat, 13 Jun 2020 22:40:34 +0200
Subject: [PATCH] Update User Configs

---
 user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini         | 4 +---
 user_setups/stm32f4xx/stm32f407-black_ili9341.ini          | 1 -
 user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini | 1 -
 user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini     | 1 -
 user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini        | 5 ++---
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index afc0221a..7fa01018 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 ; !Warning! Make sure to purchase a compatible screen, preferably from the same vendor
-; There are FSMC 2 interfaces: One is marked "TFT" and the other one is marked "New-TFT"
+; There are multiple FSMC interfaces: e.g. One is marked "TFT" and the other one is marked "New-TFT"
 ; The pinout is different and you can NOT interchange screens from these 2 interfaces!
 
 ; Versions:
@@ -24,13 +24,11 @@
 [env:STM32F407VET6_black_fsmc]
 platform = ststm32
 board = black_f407ve
-;board_build.mcu = stm32f407vet6
 ; upload_protocol = dfu
 upload_protocol = dfu
 debug_tool = stlink
 ;monitor_port = COM19     ; To change the port, use platform_override.ini
 build_flags =
-    ${env.build_flags}
     ${flags.stm32_flags}
     -I include/stm32f4
     -I include/GxTFT/src
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
index 361239a4..60b44ffd 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -12,7 +12,6 @@ board_build.mcu = stm32f407vgt6
 upload_protocol = dfu
 monitor_port = COM7     ; To change the port, use platform_override.ini
 build_flags =
-    ${env.build_flags}
     ${flags.stm32_flags}
     -I include/stm32f4
 ; -- TFT_eSPI build options ------------------------
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
index 3519c4ef..2cadc47b 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
@@ -12,7 +12,6 @@ board_build.mcu = stm32f407vet6
 upload_protocol = dfu
 monitor_port = COM7     ; To change the port, use platform_override.ini
 build_flags =
-    ${env.build_flags}
     ${flags.stm32_flags}
     -I include/stm32f4
 ; -- TFT_eSPI build options ------------------------
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
index 23894dd2..56f8419b 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
@@ -12,7 +12,6 @@ board_build.mcu = stm32f407vgt6
 upload_protocol = dfu
 monitor_port = COM7     ; To change the port, use platform_override.ini
 build_flags =
-    ${env.build_flags}
     ${flags.stm32_flags}
     -I include/stm32f4
     -I include/espspi
diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
index 79280379..328a4347 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -17,13 +17,12 @@
 [env:DevEBox_STM32F4xx]
 platform = ststm32
 board = black_f407vg
-board_build.mcu = stm32f407vgt6
+board_upload.maximum_size = 1048576 ; Flash size is wrong in variant
 ; upload_protocol = dfu
 upload_protocol = stlink
 debug_tool = stlink
 ;monitor_port = COM19     ; To change the port, use platform_override.ini
 build_flags =
-    ${env.build_flags}
     ${flags.stm32_flags}
     -I include/stm32f4
 ; -- TFT_eSPI build options ------------------------
@@ -48,7 +47,7 @@ build_flags =
     -D HASP_USE_SPIFFS=0
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=1
-    -D HASP_USE_TASMOTA_SLAVE=1
+    -D HASP_USE_TASMOTA_SLAVE=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
     -D STM32_SERIAL1                ; Set this option to use Serial1 as default sersial port, leave out if using Serial2