From f3be1445e4f163499dd47a3c32c3cfdc017f277e Mon Sep 17 00:00:00 2001 From: gemu2015 Date: Fri, 21 Jan 2022 08:03:12 +0100 Subject: [PATCH 1/2] esp8266 email, scripter on 1m devices --- lib/lib_ssl/tls_mini/src/StackThunk_light.cpp | 2 +- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp | 2 +- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h | 2 +- tasmota/xdrv_10_scripter.ino | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp b/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp index f41c8df59..f31aa61ba 100644 --- a/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp +++ b/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp @@ -27,7 +27,7 @@ #include "tasmota_options.h" -#if defined(ESP8266) && defined(USE_TLS) +#if defined(ESP8266) && (defined(USE_TLS) || defined(USE_SENDMAIL)) #include #include #include "StackThunk_light.h" diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp index 63d21e45d..02db47ab9 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -21,7 +21,7 @@ */ #include "tasmota_options.h" -#if defined(USE_TLS) +#if defined(USE_TLS) || defined(USE_SENDMAIL) // #define DEBUG_TLS // #define DEBUG_ESP_SSL diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h index 65a3544be..2760ac310 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -24,7 +24,7 @@ #ifndef wificlientlightbearssl_h #define wificlientlightbearssl_h -#ifdef USE_TLS +#if defined(USE_TLS) || defined(USE_SENDMAIL) #include #include "WiFiClient.h" #include diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino index ea3283456..036b440d4 100755 --- a/tasmota/xdrv_10_scripter.ino +++ b/tasmota/xdrv_10_scripter.ino @@ -1354,7 +1354,7 @@ float DoMedian5(uint8_t index, float in) { return median_array(mf->buffer, MEDIAN_SIZE); } - +#ifdef USE_UFILESYS void fread_str(uint8_t fref, char *sp, uint16_t slen) { uint16_t index = 0; while (glob_script_mem.files[fref].available()) { @@ -1371,6 +1371,7 @@ void fread_str(uint8_t fref, char *sp, uint16_t slen) { } *sp = 0; } +#endif #ifdef USE_FEXTRACT @@ -8889,8 +8890,8 @@ uint32_t call2https(const char *host, const char *path) { uint32_t status = 0; #ifdef TESLA_POWERWALL - authCookie = powerwall.getAuthCookie(); - return 0; +// authCookie = powerwall.getAuthCookie(); +// return 0; #endif #ifdef ESP32 From 1339d5e792399e9cb24bf2ede5069a8a4d129bba Mon Sep 17 00:00:00 2001 From: gemu2015 Date: Fri, 21 Jan 2022 11:57:52 +0100 Subject: [PATCH 2/2] revert --- lib/lib_ssl/tls_mini/src/StackThunk_light.cpp | 2 +- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp | 2 +- lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp b/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp index f31aa61ba..f41c8df59 100644 --- a/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp +++ b/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp @@ -27,7 +27,7 @@ #include "tasmota_options.h" -#if defined(ESP8266) && (defined(USE_TLS) || defined(USE_SENDMAIL)) +#if defined(ESP8266) && defined(USE_TLS) #include #include #include "StackThunk_light.h" diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp index 02db47ab9..d714c4bd0 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -21,7 +21,7 @@ */ #include "tasmota_options.h" -#if defined(USE_TLS) || defined(USE_SENDMAIL) +#ifdef USE_TLS // #define DEBUG_TLS // #define DEBUG_ESP_SSL diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h index 2760ac310..65a3544be 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -24,7 +24,7 @@ #ifndef wificlientlightbearssl_h #define wificlientlightbearssl_h -#if defined(USE_TLS) || defined(USE_SENDMAIL) +#ifdef USE_TLS #include #include "WiFiClient.h" #include