From 15668fa8e10a9b3688a484fe762984f0384b2efc Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 10 Jan 2022 18:39:42 +0100 Subject: [PATCH] Allow Tasmota32 minimal setup --- tasmota/tasmota.ino | 2 ++ tasmota/tasmota_configurations.h | 17 ++++++++++------- tasmota/tasmota_globals.h | 2 -- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index a37c78d6b..acae742f5 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -36,7 +36,9 @@ #include // Ota #include // Ota #ifdef ESP32 + #ifdef USE_BERRY #include "HTTPUpdateLight.h" // Ota over HTTPS for ESP32 + #endif // USE_BERRY #endif #include // Webserver, Updater #include diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index 7a417e787..d60d1ca44 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -964,14 +964,17 @@ \*********************************************************************************************/ #ifndef ESP8266_1M -#define USE_UFILESYS -#define GUI_TRASH_FILE -#define GUI_EDIT_FILE -#define USE_PING + #ifndef FIRMWARE_MINIMAL // there might be a ESP32-minimal + #define USE_UFILESYS + #define GUI_TRASH_FILE + #define GUI_EDIT_FILE + #define USE_PING + #endif // FIRMWARE_MINIMAL + #ifdef USE_RULES - #define USE_EXPRESSION - #define SUPPORT_IF_STATEMENT - #define SUPPORT_MQTT_EVENT + #define USE_EXPRESSION + #define SUPPORT_IF_STATEMENT + #define SUPPORT_MQTT_EVENT #endif // USE_RULES #endif // NOT ESP8266_1M diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index 15ec22abe..3056dd974 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -130,8 +130,6 @@ String EthernetMacAddress(void); #define ARDUINO_CORE_RELEASE ARDUINO_ESP32_RELEASE #endif // ARDUINO_ESP32_RELEASE -#undef FIRMWARE_MINIMAL // Minimal is not supported as not needed - // Hardware has no ESP32 #undef USE_EXS_DIMMER #undef USE_ARMTRONIX_DIMMERS