mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C3 (#185) 

* fix linker error C3
* Stage IDF335
This commit is contained in:
Jason2866 2021-06-01 19:44:26 +02:00 committed by GitHub
parent e59ce3da97
commit 80d188bd37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platformio_tasmota_cenv_sample.ini
View File

@ -23,6 +23,17 @@ build_flags = ${esp82xx_defaults.build_flags}
-Wno-switch-unreachable
; *** Tasmota version Stage ESP32 IDF3.3.5
[env:tasmota32idf3]
extends = env:tasmota32_base
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/raw/framework-arduinoespressif32/framework-arduinoespressif32-release_v3.3-6aaddf972.tar.gz
;framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#release/v1.0
platformio/tool-esptoolpy @ ~1.30100
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags}
;-DESP32_STAGE=true
;*** EXPERIMENTAL Tasmota version for ESP32-S2
[env:tasmota32s2]
extends = env:tasmota32_base

4
tasmota/support_button.ino
View File

@ -167,6 +167,7 @@ void ButtonHandler(void) {
if (PinUsed(GPIO_KEY1, button_index)) {
button_present = 1;
#ifdef ESP32
#ifndef CONFIG_IDF_TARGET_ESP32C3
if (bitRead(Button.touch_mask, button_index)) { // Touch
uint32_t _value = touchRead(Pin(GPIO_KEY1, button_index));
button = NOT_PRESSED;
@ -187,6 +188,7 @@ void ButtonHandler(void) {
AddLog(LOG_LEVEL_INFO, PSTR("PLOT: %u, %u, %u,"), button_index+1, _value, Button.touch_hits[button_index]); // Button number (1..4), value, continuous hits under threshold
}
} else
#endif // not ESP32C3
#endif // ESP32
{ // Normal button
button = (digitalRead(Pin(GPIO_KEY1, button_index)) != bitRead(Button.inverted_mask, button_index));
@ -406,4 +408,4 @@ void ButtonLoop(void) {
}
}
#endif // BUTTON_V2
#endif // BUTTON_V2