jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9115 from Jason2866/patch-5

Browse Source 
Error in PIO dev version is fixed
This commit is contained in:
Theo Arends 2020-08-17 16:26:55 +02:00 committed by GitHub
commit e6aafda986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -6,7 +6,7 @@
- [ ] The pull request is done against the latest dev branch - [ ] The pull request is done against the latest dev branch
- [ ] Only relevant files were touched - [ ] Only relevant files were touched
- [ ] Only one feature/fix was added per PR. - [ ] Only one feature/fix was added per PR.
- [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.3.2 - [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.1
- [ ] The code change is tested and works on core ESP32 V.1.12.2 - [ ] The code change is tested and works on core ESP32 V.1.12.2
- [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla). - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).

9
platformio.ini
View File

@ -85,7 +85,9 @@ extra_scripts = pio/strip-floats.py
[esp_defaults] [esp_defaults]
; *** remove undesired all warnings ; *** remove undesired all warnings
build_unflags = -Wall build_unflags = -Wall
build_flags = -D_IR_ENABLE_DEFAULT_=false -Wdeprecated-declarations
build_flags = -Wno-deprecated-declarations
-D_IR_ENABLE_DEFAULT_=false
-DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
-DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6 ; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
@ -98,6 +100,7 @@ build_flags = -D_IR_ENABLE_DEFAULT_=false
[esp82xx_defaults] [esp82xx_defaults]
build_flags = ${esp_defaults.build_flags} build_flags = ${esp_defaults.build_flags}
-Wl,-Map,firmware.map -Wl,-Map,firmware.map
-D CORE_DEBUG_LEVEL=0
-D NDEBUG -D NDEBUG
-mtarget-align -mtarget-align
-DFP_IN_IROM -DFP_IN_IROM
@ -120,8 +123,8 @@ build_flags = -DUSE_IR_REMOTE_FULL
[core] [core]
; *** Esp8266 Arduino core core 2.7.4 ; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4
platform = espressif8266@2.6.2 platform = espressif8266@2.6.2
platform_packages = ;framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.3.2/esp8266-2.7.3.2.zip platform_packages = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.4.1/esp8266-2.7.4.1.zip
build_unflags = ${esp_defaults.build_unflags} build_unflags = ${esp_defaults.build_unflags}
build_flags = ${esp82xx_defaults.build_flags} build_flags = ${esp82xx_defaults.build_flags}

4
platformio_override_sample.ini
View File

@ -88,7 +88,7 @@ extra_scripts = ${scripts_defaults.extra_scripts}
[tasmota_stage] [tasmota_stage]
; *** Esp8266 core for Arduino version Tasmota stage ; *** Esp8266 core for Arduino version Tasmota stage
platform = espressif8266@2.6.1 platform = espressif8266@2.6.2
platform_packages = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.4.1/esp8266-2.7.4.1.zip platform_packages = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.4.1/esp8266-2.7.4.1.zip
build_unflags = ${esp_defaults.build_unflags} build_unflags = ${esp_defaults.build_unflags}
build_flags = ${esp82xx_defaults.build_flags} build_flags = ${esp82xx_defaults.build_flags}
@ -124,7 +124,7 @@ build_flags = ${esp82xx_defaults.build_flags}
[core_stage] [core_stage]
; *** Esp8266 core version. Tasmota stage or Arduino stage version. Built with GCC 10.1 toolchain ; *** Esp8266 core version. Tasmota stage or Arduino stage version. Built with GCC 10.1 toolchain
platform = espressif8266@2.6.1 platform = espressif8266@2.6.2
platform_packages = framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.0/framework-arduinoespressif8266-3.20900.0.tar.gz platform_packages = framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.0/framework-arduinoespressif8266-3.20900.0.tar.gz
;framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git ;framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
toolchain-xtensa @ ~2.100100.0 toolchain-xtensa @ ~2.100100.0