From 1f7f5031ff6fc54925fb7cf9ba59f13b6ed44f65 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:32:18 +0100
Subject: [PATCH 1/3] mno-target-align default

---
 platformio.ini | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index e2958caa2..4ad533b86 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -100,10 +100,11 @@ extra_scripts               = pio/strip-floats.py
 
 [esp_defaults]
 ; *** remove undesired all warnings
-build_unflags               = -Wall
+build_unflags               = -mtarget-align
+                              -Wall
                               -Wdeprecated-declarations
-build_flags                 = -Wno-deprecated-declarations
-                              -mtarget-align
+build_flags                 = -mno-target-align
+                              -Wno-deprecated-declarations
                               -D_IR_ENABLE_DEFAULT_=false
                               -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
                               -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
@@ -140,7 +141,7 @@ build_flags                 = -DUSE_IR_REMOTE_FULL
 [core]
 ; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4
 platform                    = espressif8266 @ 2.6.2
-platform_packages           = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.4.5/esp8266-2.7.4.5.zip
+platform_packages           = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.4.7/esp8266-2.7.4.7.zip
                               platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
 build_flags                 = ${esp82xx_defaults.build_flags}

From aca6cac66085791c6880bf3912aba90650f0e7a2 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:36:32 +0100
Subject: [PATCH 2/3] mno-target-align is default

---
 platformio_override_sample.ini | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index acf9708ff..2cbb6d864 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -91,9 +91,7 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 platform_packages           = framework-arduinoespressif8266 @ https://github.com/Jason2866/Arduino/releases/download/2.7.4.7/esp8266-2.7.4.7.zip
                               platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
-                              -mtarget-align
 build_flags                 = ${esp82xx_defaults.build_flags}
-                              -mno-target-align
 
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
@@ -132,10 +130,8 @@ platform_packages           = framework-arduinoespressif8266 @ https://github.co
                               platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wswitch-unreachable
-                              -mtarget-align
 build_flags                 = ${esp82xx_defaults.build_flags}
                               -Wno-switch-unreachable
-                              -mno-target-align
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@@ -195,9 +191,7 @@ platform                    = espressif32 @ 2.0.0
 platform_packages           = tool-esptoolpy @ 1.20800.0
                               framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#f7fb00632e04d74a7890a77fa7dbbb8ae572e866
 build_unflags               = ${esp32_defaults.build_unflags}
-                              -mtarget-align
 build_flags                 = ${esp32_defaults.build_flags}
-                              -mno-target-align
                               -DESP32_STAGE=true
 
 [library]

From 4543dda54d498b14c3bcc5c5a1fd6a8449b11cc8 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:37:51 +0100
Subject: [PATCH 3/3] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6dc6e0d4e..7b8daf732 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,8 +6,8 @@
   - [ ] The pull request is done against the latest dev branch
   - [ ] Only relevant files were touched
   - [ ] Only one feature/fix was added per PR.
-  - [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.5
-  - [ ] The code change is tested and works on core ESP32 V.1.12.2
+  - [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.7
+  - [ ] The code change is tested and works on core ESP32 V.1.12.4
   - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
 
 _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_