From 1e63c8924e3bd5ad0a9d06d52b3da1edecc4e54e Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 4 May 2024 15:34:11 +0200 Subject: [PATCH] use "minimal" instead of "safeboot" (#21346) --- tasmota/tasmota_support/support_button_v4.ino | 4 ++-- tasmota/tasmota_support/support_command.ino | 12 ++++++------ tasmota/tasmota_support/support_crash_recorder.ino | 4 ++-- tasmota/tasmota_support/support_tasmota.ino | 4 ++-- tasmota/tasmota_support/support_wifi.ino | 4 ++-- tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino | 2 -- tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino | 4 ++-- tasmota/tasmota_xsns_sensor/xsns_02_analog.ino | 4 ++-- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tasmota/tasmota_support/support_button_v4.ino b/tasmota/tasmota_support/support_button_v4.ino index 00fbfd2f9..7766eadd7 100644 --- a/tasmota/tasmota_support/support_button_v4.ino +++ b/tasmota/tasmota_support/support_button_v4.ino @@ -407,14 +407,14 @@ void ButtonHandler(void) { } #ifdef USE_ADC -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL else if (PinUsed(GPIO_ADC_BUTTON, button_index)) { button = AdcGetButton(Pin(GPIO_ADC_BUTTON, button_index)); } else if (PinUsed(GPIO_ADC_BUTTON_INV, button_index)) { button = AdcGetButton(Pin(GPIO_ADC_BUTTON_INV, button_index)); } -#endif // FIRMWARE_SAFEBOOT +#endif // FIRMWARE_MINIMAL #endif // USE_ADC XdrvMailbox.index = button_index; diff --git a/tasmota/tasmota_support/support_command.ino b/tasmota/tasmota_support/support_command.ino index 9616c885d..3b6fcf5da 100644 --- a/tasmota/tasmota_support/support_command.ino +++ b/tasmota/tasmota_support/support_command.ino @@ -812,9 +812,9 @@ void CmndStatus(void) if (payload > MAX_STATUS) { return; } // {"Command":"Error"} if (!Settings->flag.mqtt_enabled && (6 == payload)) { return; } // SetOption3 - Enable MQTT if (!TasmotaGlobal.energy_driver && (9 == payload)) { return; } - #ifndef FIRMWARE_SAFEBOOT + #ifndef FIRMWARE_MINIMAL if (!CrashFlag() && (12 == payload)) { return; } - #endif // FIRMWARE_SAFEBOOT + #endif // FIRMWARE_MINIMAL if (!Settings->flag3.shutter_mode && (13 == payload)) { return; } char stemp[200]; @@ -1044,7 +1044,7 @@ void CmndStatus(void) CmndStatusResponse(11); } -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL if (CrashFlag()) { if ((0 == payload) || (12 == payload)) { Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS12_STATUS "\":")); @@ -1053,7 +1053,7 @@ void CmndStatus(void) CmndStatusResponse(12); } } -#endif // FIRMWARE_SAFEBOOT +#endif // FIRMWARE_MINIMAL #ifdef USE_SHUTTER if ((0 == payload) || (13 == payload)) { @@ -1256,7 +1256,7 @@ void CmndRestart(void) TasmotaGlobal.restart_deepsleep = true; ResponseCmndChar(PSTR("Go to sleep")); break; -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL case -1: CmndCrash(); // force a crash break; @@ -1266,7 +1266,7 @@ void CmndRestart(void) case -3: CmndBlockedLoop(); break; -#endif // FIRMWARE_SAFEBOOT +#endif // FIRMWARE_MINIMAL case 99: AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING)); EspRestart(); diff --git a/tasmota/tasmota_support/support_crash_recorder.ino b/tasmota/tasmota_support/support_crash_recorder.ino index 9e41f938f..325f10075 100644 --- a/tasmota/tasmota_support/support_crash_recorder.ino +++ b/tasmota/tasmota_support/support_crash_recorder.ino @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL // Generate a crash to test the crash recorder void CmndCrash(void) @@ -364,4 +364,4 @@ void CrashDump(void) #endif #endif -#endif // FIRMWARE_SAFEBOOT \ No newline at end of file +#endif // FIRMWARE_MINIMAL \ No newline at end of file diff --git a/tasmota/tasmota_support/support_tasmota.ino b/tasmota/tasmota_support/support_tasmota.ino index 4816f271c..c8e3de1b9 100644 --- a/tasmota/tasmota_support/support_tasmota.ino +++ b/tasmota/tasmota_support/support_tasmota.ino @@ -1021,7 +1021,7 @@ bool MqttShowSensor(bool call_show_sensor) { GetSensorValues(); -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL if (TasmotaGlobal.global_update && Settings->flag.mqtt_add_global_info) { // SetOption2 (MQTT) Add global temperature/humidity/pressure info to JSON sensor message if ((TasmotaGlobal.humidity > 0) || !isnan(TasmotaGlobal.temperature_celsius) || (TasmotaGlobal.pressure_hpa != 0)) { uint32_t add_comma = 0; @@ -1056,7 +1056,7 @@ bool MqttShowSensor(bool call_show_sensor) { ResponseJsonEnd(); } } -#endif // FIRMWARE_SAFEBOOT +#endif // FIRMWARE_MINIMAL bool json_data_available = (ResponseLength() - json_data_start); MqttAppendSensorUnits(); diff --git a/tasmota/tasmota_support/support_wifi.ino b/tasmota/tasmota_support/support_wifi.ino index f0f0c6e42..ef71eef38 100644 --- a/tasmota/tasmota_support/support_wifi.ino +++ b/tasmota/tasmota_support/support_wifi.ino @@ -1159,9 +1159,9 @@ void WifiDisable(void) { void EspRestart(void) { ResetPwm(); WifiShutdown(true); -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL CrashDumpClear(); // Clear the stack dump in RTC -#endif // FIRMWARE_SAFEBOOT +#endif // FIRMWARE_MINIMAL #ifdef CONFIG_IDF_TARGET_ESP32C3 GpioForceHoldRelay(); // Retain the state when the chip or system is reset, for example, when watchdog time-out or Deep-sleep diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino index 44ad0508d..e2db0dedc 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino @@ -249,11 +249,9 @@ const char HTTP_HEAD_STYLE3[] PROGMEM = "" "
" // COLOR_BACKGROUND, COLOR_TEXT #ifdef FIRMWARE_MINIMAL -#ifdef FIRMWARE_SAFEBOOT "

" D_SAFEBOOT "

" // COLOR_TEXT_WARNING #else "

" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "

" // COLOR_TEXT_WARNING -#endif // FIRMWARE_SAFEBOOT #endif // FIRMWARE_MINIMAL "
" // COLOR_TITLE /* diff --git a/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino b/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino index d349ddea2..9a793f8d1 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino @@ -1037,11 +1037,11 @@ void MqttConnected(void) { } #endif // USE_WEBSERVER Response_P(PSTR("{\"Info3\":{\"" D_JSON_RESTARTREASON "\":")); -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL if (CrashFlag()) { CrashDump(); } else -#endif // FIRMWARE_SAFEBOOT +#endif // FIRMWARE_MINIMAL { ResponseAppend_P(PSTR("\"%s\""), GetResetReason().c_str()); } diff --git a/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino b/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino index a4dac9104..1cd0f623b 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_02_analog.ino @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#ifndef FIRMWARE_SAFEBOOT +#ifndef FIRMWARE_MINIMAL #ifdef USE_ADC /*********************************************************************************************\ @@ -934,4 +934,4 @@ bool Xsns02(uint32_t function) { } #endif // USE_ADC -#endif // FIRMWARE_SAFEBOOT \ No newline at end of file +#endif // FIRMWARE_MINIMAL \ No newline at end of file