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

Remove ESP32 minimal support

Browse Source
This commit is contained in:
Theo Arends 2021-02-12 16:26:51 +01:00
parent d4537ea208
commit 42c5af1b70
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformio_override_sample.ini
View File

@ -29,7 +29,6 @@ default_envs =
; tasmota32 ; tasmota32
; tasmota32-bluetooth ; tasmota32-bluetooth
; tasmota32-webcam ; tasmota32-webcam
; tasmota32-minimal
; tasmota32-lite ; tasmota32-lite
; tasmota32-knx ; tasmota32-knx
; tasmota32-sensors ; tasmota32-sensors

2
platformio_tasmota32.ini
View File

@ -7,10 +7,10 @@
default_envs = ${build_envs.default_envs} default_envs = ${build_envs.default_envs}
; *** Uncomment by deleting ";" in the line(s) below to select version(s) ; *** Uncomment by deleting ";" in the line(s) below to select version(s)
; tasmota32 ; tasmota32
; tasmota32-bluetooth
; tasmota32-webcam ; tasmota32-webcam
; tasmota32-odroidgo ; tasmota32-odroidgo
; tasmota32-core2 ; tasmota32-core2
; tasmota32-minimal
; tasmota32-lite ; tasmota32-lite
; tasmota32-knx ; tasmota32-knx
; tasmota32-sensors ; tasmota32-sensors

5
platformio_tasmota_env32.ini
View File

@ -63,11 +63,6 @@ extends = env:tasmota32
build_flags = ${common32.build_flags} -DFIRMWARE_BLUETOOTH build_flags = ${common32.build_flags} -DFIRMWARE_BLUETOOTH
lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_ssl lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_ssl
[env:tasmota32-minimal]
extends = env:tasmota32
build_flags = ${common32.build_flags} -DFIRMWARE_MINIMAL
lib_extra_dirs = lib/libesp32
[env:tasmota32-lite] [env:tasmota32-lite]
extends = env:tasmota32 extends = env:tasmota32
build_flags = ${common32.build_flags} -DFIRMWARE_LITE build_flags = ${common32.build_flags} -DFIRMWARE_LITE

4
tasmota/support_tasmota.ino
View File

@ -1043,6 +1043,7 @@ void Every250mSeconds(void)
if (ota_retry_counter) { if (ota_retry_counter) {
char ota_url[TOPSZ]; char ota_url[TOPSZ];
strlcpy(TasmotaGlobal.mqtt_data, GetOtaUrl(ota_url, sizeof(ota_url)), sizeof(TasmotaGlobal.mqtt_data)); strlcpy(TasmotaGlobal.mqtt_data, GetOtaUrl(ota_url, sizeof(ota_url)), sizeof(TasmotaGlobal.mqtt_data));
#ifdef ESP8266
#ifndef FIRMWARE_MINIMAL #ifndef FIRMWARE_MINIMAL
if (RtcSettings.ota_loader) { if (RtcSettings.ota_loader) {
// OTA File too large so try OTA minimal version // OTA File too large so try OTA minimal version
@ -1077,7 +1078,6 @@ void Every250mSeconds(void)
snprintf_P(TasmotaGlobal.mqtt_data, sizeof(TasmotaGlobal.mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), TasmotaGlobal.mqtt_data, ota_url_type); // Minimal filename must be filename-minimal snprintf_P(TasmotaGlobal.mqtt_data, sizeof(TasmotaGlobal.mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), TasmotaGlobal.mqtt_data, ota_url_type); // Minimal filename must be filename-minimal
} }
#endif // FIRMWARE_MINIMAL #endif // FIRMWARE_MINIMAL
#ifdef ESP8266
if (ota_retry_counter < OTA_ATTEMPTS / 2) { if (ota_retry_counter < OTA_ATTEMPTS / 2) {
if (!strcasecmp_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) { if (!strcasecmp_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) {
ota_retry_counter = 1; ota_retry_counter = 1;
@ -1093,9 +1093,11 @@ void Every250mSeconds(void)
#ifndef FIRMWARE_MINIMAL #ifndef FIRMWARE_MINIMAL
int ota_error = ESPhttpUpdate.getLastError(); int ota_error = ESPhttpUpdate.getLastError();
DEBUG_CORE_LOG(PSTR("OTA: Error %d"), ota_error); DEBUG_CORE_LOG(PSTR("OTA: Error %d"), ota_error);
#ifdef ESP8266
if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) { if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) {
RtcSettings.ota_loader = 1; // Try minimal image next RtcSettings.ota_loader = 1; // Try minimal image next
} }
#endif // ESP8266
#endif // FIRMWARE_MINIMAL #endif // FIRMWARE_MINIMAL
TasmotaGlobal.ota_state_flag = 2; // Upgrade failed - retry TasmotaGlobal.ota_state_flag = 2; // Upgrade failed - retry
} }

2
tasmota/tasmota_globals.h
View File

@ -132,6 +132,8 @@ String EthernetMacAddress(void);
#define USE_UFILESYS #define USE_UFILESYS
#undef FIRMWARE_MINIMAL // Minimal is not supported as not needed
// Hardware has no ESP32 // Hardware has no ESP32
#undef USE_TUYA_DIMMER #undef USE_TUYA_DIMMER
#undef USE_PWM_DIMMER #undef USE_PWM_DIMMER