diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index 1c04b1059..d08d06489 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -39,11 +39,11 @@ jobs: - tasmota32-lvgl - tasmota32c3 - tasmota32solo1 - - tasmota32solo1-safemode - - tasmota32-safemode - - tasmota32c3-safemode - - tasmota32s2-safemode - - tasmota32s3-safemode + - tasmota32solo1-safeboot + - tasmota32-safeboot + - tasmota32c3-safeboot + - tasmota32s2-safeboot + - tasmota32s3-safeboot steps: - uses: actions/checkout@v2 with: @@ -122,7 +122,7 @@ jobs: [ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./firmware/tasmota32/ - [ ! -f ./mv_firmware/firmware/tasmota32-safemode* ] || mv ./mv_firmware/firmware/tasmota32-safemode* ./firmware/tasmota32/ + [ ! -f ./mv_firmware/firmware/tasmota32-safeboot* ] || mv ./mv_firmware/firmware/tasmota32-safeboot* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32-* ] || mv ./mv_firmware/firmware/tasmota32-* ./firmware/tasmota32/languages/ [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./firmware/tasmota/languages/ diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml index 9e6839403..f81bae9df 100644 --- a/.github/workflows/build_all_the_things.yml +++ b/.github/workflows/build_all_the_things.yml @@ -43,11 +43,11 @@ jobs: - tasmota32s2 - tasmota32c3 - tasmota32solo1 - - tasmota32solo1-safemode - - tasmota32-safemode - - tasmota32c3-safemode - - tasmota32s2-safemode - - tasmota32s3-safemode + - tasmota32solo1-safeboot + - tasmota32-safeboot + - tasmota32c3-safeboot + - tasmota32s2-safeboot + - tasmota32s3-safeboot steps: - uses: actions/checkout@v2 - name: Set up Python diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json index b034f6b77..84ece18d0 100644 --- a/boards/esp32-cam.json +++ b/boards/esp32-cam.json @@ -31,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32-safemode.bin" + "variants/tasmota/tasmota32-safeboot.bin" ] ] }, diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json index e872ec7af..4821878f7 100644 --- a/boards/esp32_4M.json +++ b/boards/esp32_4M.json @@ -31,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32-safemode.bin" + "variants/tasmota/tasmota32-safeboot.bin" ] ] }, diff --git a/boards/esp32_4M_FS.json b/boards/esp32_4M_FS.json index 6178700f9..30c1fd74f 100644 --- a/boards/esp32_4M_FS.json +++ b/boards/esp32_4M_FS.json @@ -31,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32-safemode.bin" + "variants/tasmota/tasmota32-safeboot.bin" ] ] }, diff --git a/boards/esp32_solo1_4M.json b/boards/esp32_solo1_4M.json index cbd2ac2fd..d95940d68 100644 --- a/boards/esp32_solo1_4M.json +++ b/boards/esp32_solo1_4M.json @@ -31,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32solo1-safemode.bin" + "variants/tasmota/tasmota32solo1-safeboot.bin" ] ] }, diff --git a/boards/esp32c3.json b/boards/esp32c3.json index cfbb41aec..f5e7321e4 100644 --- a/boards/esp32c3.json +++ b/boards/esp32c3.json @@ -28,7 +28,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32c3-safemode.bin" + "variants/tasmota/tasmota32c3-safeboot.bin" ] ] }, diff --git a/boards/esp32s2.json b/boards/esp32s2.json index b6dc307ca..7f48731af 100644 --- a/boards/esp32s2.json +++ b/boards/esp32s2.json @@ -28,7 +28,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32s2-safemode.bin" + "variants/tasmota/tasmota32s2-safeboot.bin" ] ] }, diff --git a/boards/esp32s3.json b/boards/esp32s3.json index 6299a5317..a86ea38f9 100644 --- a/boards/esp32s3.json +++ b/boards/esp32s3.json @@ -31,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "variants/tasmota/tasmota32s3-safemode.bin" + "variants/tasmota/tasmota32s3-safeboot.bin" ] ] }, diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index f0e670a72..715265490 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -35,23 +35,23 @@ import esptool FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32") variants_dir = join(FRAMEWORK_DIR, "variants", "tasmota") -def esp32_fetch_safemode_bin(chip): - safemode_fw_url = "https://github.com/arendst/Tasmota-firmware/raw/main/firmware/tasmota32/tasmota" + chip[3:] + "-safemode.bin" - safemode_fw_name = join(variants_dir,"tasmota" + ("32solo1" if "solo1" in env.subst("$BUILD_DIR") else chip[3:]) + "-safemode.bin") - if(exists(safemode_fw_name)): - print("Safemode binary already in place.") +def esp32_fetch_safeboot_bin(chip): + safeboot_fw_url = "https://github.com/arendst/Tasmota-firmware/raw/main/firmware/tasmota32/tasmota" + chip[3:] + "-safeboot.bin" + safeboot_fw_name = join(variants_dir,"tasmota" + ("32solo1" if "solo1" in env.subst("$BUILD_DIR") else chip[3:]) + "-safeboot.bin") + if(exists(safeboot_fw_name)): + print("safeboot binary already in place.") return - print("Will download safemode binary from URL:") - print(safemode_fw_url) - response = requests.get(safemode_fw_url) - open(safemode_fw_name, "wb").write(response.content) - print("Safemode binary written to variants dir.") + print("Will download safeboot binary from URL:") + print(safeboot_fw_url) + response = requests.get(safeboot_fw_url) + open(safeboot_fw_name, "wb").write(response.content) + print("safeboot binary written to variants dir.") -def esp32_copy_new_safemode_bin(chip,new_local_safemode_fw): - print("Copy new local safemode firmware to variants dir -> using it for further flashing operations") - safemode_fw_name = join(variants_dir,"tasmota" + ("32solo1" if "solo1" in env.subst("$BUILD_DIR") else chip[3:]) + "-safemode.bin") +def esp32_copy_new_safeboot_bin(chip,new_local_safeboot_fw): + print("Copy new local safeboot firmware to variants dir -> using it for further flashing operations") + safeboot_fw_name = join(variants_dir,"tasmota" + ("32solo1" if "solo1" in env.subst("$BUILD_DIR") else chip[3:]) + "-safeboot.bin") if os.path.exists(variants_dir): - shutil.copy(new_local_safemode_fw, safemode_fw_name) + shutil.copy(new_local_safeboot_fw, safeboot_fw_name) def esp32_create_combined_bin(source, target, env): #print("Generating combined binary for serial flashing") @@ -86,10 +86,10 @@ def esp32_create_combined_bin(source, target, env): chip = env.get("BOARD_MCU") if not os.path.exists(variants_dir): os.makedirs(variants_dir) - if("safemode" in firmware_name): - esp32_copy_new_safemode_bin(chip,firmware_name) + if("safeboot" in firmware_name): + esp32_copy_new_safeboot_bin(chip,firmware_name) else: - esp32_fetch_safemode_bin(chip) + esp32_fetch_safeboot_bin(chip) flash_size = env.BoardConfig().get("upload.flash_size") cmd = [ "--chip", @@ -107,12 +107,12 @@ def esp32_create_combined_bin(source, target, env): print(f" - {sect_adr} | {sect_file}") cmd += [sect_adr, sect_file] - # "main" firmware to app0 - mandatory, except we just built a new safemode bin locally - if("safemode" not in firmware_name): + # "main" firmware to app0 - mandatory, except we just built a new safeboot bin locally + if("safeboot" not in firmware_name): print(f" - {hex(app_offset)} | {firmware_name}") cmd += [hex(app_offset), firmware_name] else: - print("Upload new safemode binary only") + print("Upload new safeboot binary only") #print('Using esptool.py arguments: %s' % ' '.join(cmd)) diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index 63ba038c8..18e1fa60a 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -116,9 +116,9 @@ lib_ignore = Micro-RTSP epdiy -[env:tasmota32-safemode] +[env:tasmota32-safeboot] extends = env:tasmota32_base -build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEMODE +build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = TTGO TWatch Library @@ -126,12 +126,12 @@ lib_ignore = Micro-RTSP epdiy -[env:tasmota32solo1-safemode] +[env:tasmota32solo1-safeboot] extends = env:tasmota32_base board = esp32_solo1_4M platform = ${core32solo1.platform} platform_packages = ${core32solo1.platform_packages} -build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEMODE +build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = TTGO TWatch Library @@ -139,9 +139,10 @@ lib_ignore = Micro-RTSP epdiy -[env:tasmota32s2-safemode] +[env:tasmota32s2-safeboot] extends = env:tasmota32_base -build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEMODE +board = esp32s2 +build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = TTGO TWatch Library @@ -149,9 +150,10 @@ lib_ignore = Micro-RTSP epdiy -[env:tasmota32s3-safemode] +[env:tasmota32s3-safeboot] extends = env:tasmota32_base -build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEMODE +board = esp32s3 +build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = TTGO TWatch Library @@ -159,12 +161,13 @@ lib_ignore = Micro-RTSP epdiy -[env:tasmota32c3-safemode] +[env:tasmota32c3-safeboot] extends = env:tasmota32_base +board = esp32c3 build_unflags = ${env:tasmota32_base.build_unflags} -flto -mtarget-align -build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEMODE +build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT -fno-lto lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 6786c67e4..c6cedc578 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Skakel JavaScript aan om Tasmota te gebruik" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware
gradeer asseblief op" #define D_WEBSERVER_ACTIVE_ON "Webbediener aktief op" #define D_WITH_IP_ADDRESS "met IP-adres" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Begin opgradering" #define D_UPGRADE_BY_FILE_UPLOAD "Gradeer op volgens lêeroplaai" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Oplaai begin" #define D_UPGRADE_STARTED "Opgradering is begin" #define D_UPLOAD_DONE "Oplaai gedoen" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index 475e67f14..3f2c5c370 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "За да използвате Tasmota разрешете JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Вграденият софтуер е MINIMAL
надградете го" #define D_WEBSERVER_ACTIVE_ON "Уеб сървърът е достъпен на" #define D_WITH_IP_ADDRESS "с адрес по IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "Адрес на сървър за OTA" #define D_START_UPGRADE "Начало на обновяване" #define D_UPGRADE_BY_FILE_UPLOAD "Обновяване от файл" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Качване" #define D_UPGRADE_STARTED "Обновяване" #define D_UPLOAD_DONE "Качването завърши" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index a64798a84..80c8ba5a2 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Pro používání prostředí Tasmota povolte JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNÍ
prosím zaktualizujte" #define D_WEBSERVER_ACTIVE_ON "Aktivní Web server" #define D_WITH_IP_ADDRESS "na IP adrese" @@ -373,7 +373,7 @@ #define D_OTA_URL "URL OTA" #define D_START_UPGRADE "Start aktualizace" #define D_UPGRADE_BY_FILE_UPLOAD "Aktualizace nahráním souboru" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Nahrávání zahájeno" #define D_UPGRADE_STARTED "Zahájení aktualizace" #define D_UPLOAD_DONE "Nahrávání ukončeno" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 022ca04d1..e4bad7f49 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "JavaScript aktivieren um Tasmota benutzen zu können" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMUM-Firmware
bitte upgraden" #define D_WEBSERVER_ACTIVE_ON "Web-Server aktiv bei" #define D_WITH_IP_ADDRESS "mit IP-Adresse" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA-URL" #define D_START_UPGRADE "Update starten" #define D_UPGRADE_BY_FILE_UPLOAD "Update Datei hochladen" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Upload gestartet" #define D_UPGRADE_STARTED "Update gestartet" #define D_UPLOAD_DONE "Upload abgeschlossen" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 62faa826b..30d6e8656 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -243,7 +243,7 @@ // webserver.ino #define D_NOSCRIPT "To use Tasmota, please enable JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware
παρακαλώ αναβαθμίστε" #define D_WEBSERVER_ACTIVE_ON "Ενεργός διακομιστής Web στο" #define D_WITH_IP_ADDRESS "με διεύθυνση IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA URL" #define D_START_UPGRADE "Εκκίνηση αναβάθμισης" #define D_UPGRADE_BY_FILE_UPLOAD "Αναβάθμιση με μεταφόρτωση αρχείου" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Η μεταφόρτωση ξεκίνησε" #define D_UPGRADE_STARTED "Η αναβάθμιση ξεκίνησε" #define D_UPLOAD_DONE "Η μεταφόρτωση ολοκληρώθηκε" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 2fe59ac05..4627b882e 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "To use Tasmota, please enable JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware
please upgrade" #define D_WEBSERVER_ACTIVE_ON "Web server active on" #define D_WITH_IP_ADDRESS "with IP address" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Start upgrade" #define D_UPGRADE_BY_FILE_UPLOAD "Upgrade by file upload" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Upload started" #define D_UPGRADE_STARTED "Upgrade started" #define D_UPLOAD_DONE "Upload done" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 37fe02bf4..d7fc1168d 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Habilitar JavaScript para usar Tasmota" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MÍNIMO
actualice por favor" #define D_WEBSERVER_ACTIVE_ON "Servidor web activo en" #define D_WITH_IP_ADDRESS "con dirección IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Comenzar actualización" #define D_UPGRADE_BY_FILE_UPLOAD "Actualizar cargando archivo bin" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Cargando archivo" #define D_UPGRADE_STARTED "Actualización iniciada" #define D_UPLOAD_DONE "Carga finalizada" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 823898c8a..84fe4e0b4 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Pour utiliser Tasmota, veuillez activer JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMAL
merci de mettre à jour" #define D_WEBSERVER_ACTIVE_ON "Serveur web actif sur" #define D_WITH_IP_ADDRESS "avec l'adresse IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "URL OTA" #define D_START_UPGRADE "Lancer la mise à jour" #define D_UPGRADE_BY_FILE_UPLOAD "Mise à jour par téléchargement fichier" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Téléchargement lancé" #define D_UPGRADE_STARTED "Mise à jour lancée" #define D_UPLOAD_DONE "Téléchargement terminé" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 32dc0a11f..2fef871f2 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Aktivearje JavaScript foar Tasmota" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMALE firmware
upgrade" #define D_WEBSERVER_ACTIVE_ON "Webserver aktyf op" #define D_WITH_IP_ADDRESS "mei IP-adres" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Begjin upgrade" #define D_UPGRADE_BY_FILE_UPLOAD "Upgrade op bestân upload" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Upload begon" #define D_UPGRADE_STARTED "Upgrade begon" #define D_UPLOAD_DONE "Upload dien" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index 451dd939f..41174d639 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "JavaScript - כדי להשתמש בקושחת אסמוטה אנא הפעל" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "קושחה מינימלית
בבקשה אנא שדרג" #define D_WEBSERVER_ACTIVE_ON "שרת ווב פעיל" #define D_WITH_IP_ADDRESS "IP עם כתובת" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA כתובת" #define D_START_UPGRADE "התחל בשדרוג" #define D_UPGRADE_BY_FILE_UPLOAD "שדרוג דרך קובץ נכשל" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "העלאה מתחילה" #define D_UPGRADE_STARTED "שדרוג מתחיל" #define D_UPLOAD_DONE "העלאה הסתיימה" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index c049063cf..d48c29048 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "A Tasmota használatához engedélyezd a Javascriptet!" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMÁLIS firmware
frissítsd!" #define D_WEBSERVER_ACTIVE_ON "Webszerver aktív:" #define D_WITH_IP_ADDRESS "IP cím:" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA URL" #define D_START_UPGRADE "Frissítés" #define D_UPGRADE_BY_FILE_UPLOAD "Frissítés helyi fájllal" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Feltöltés elindítva" #define D_UPGRADE_STARTED "Frissítés elindítva" #define D_UPLOAD_DONE "Feltöltés kész" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index 0d4692009..65000c4ab 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Per usare Tasmota abilita JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMALE
Effettua aggiornamento" #define D_WEBSERVER_ACTIVE_ON "Server web attivo in" #define D_WITH_IP_ADDRESS "con indirizzo IP" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index fcaf0397b..a6075d40c 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Tasmota를 사용하려면 JavaScript를 활성화 하십시오." -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware
업그레이드가 필요합니다" #define D_WEBSERVER_ACTIVE_ON "Web 서버 작동 중" #define D_WITH_IP_ADDRESS "IP 주소" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "업그레이드 시작" #define D_UPGRADE_BY_FILE_UPLOAD "파일에서 업로드해 업그레이드" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "업로드 시작됨" #define D_UPGRADE_STARTED "업그레이드 시작됨" #define D_UPLOAD_DONE "업그레이드 완료" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index c278872c3..5d1a6fc55 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Zet JavaScript aan voor Tasmota" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware
opwaarderen" #define D_WEBSERVER_ACTIVE_ON "Webserver actief op" #define D_WITH_IP_ADDRESS "met IP adres" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Start opwaarderen" #define D_UPGRADE_BY_FILE_UPLOAD "Opwaarderen dmv verzenden bestand" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Verzending gestart" #define D_UPGRADE_STARTED "Opwaarderen gestart" #define D_UPLOAD_DONE "Opwaarderen klaar" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index d21bb7c46..984b96104 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Aby korzystać z Tasmota, włącz obsługę JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Oprogramowanie MINIMAL
proszę uaktualnić" #define D_WEBSERVER_ACTIVE_ON "Aktywny serwer Web" #define D_WITH_IP_ADDRESS "z adresem IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "Adres serwera" #define D_START_UPGRADE "Aktualizuj" #define D_UPGRADE_BY_FILE_UPLOAD "Aktualizacja z pliku" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Wgrywanie rozpoczęte" #define D_UPGRADE_STARTED "Aktualizacja rozpoczęta" #define D_UPLOAD_DONE "Wgrywanie zakończone" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 44828d477..09387c275 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Para usar o Tasmota, por favor habilite o JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware mínimo
Atualizar por favor" #define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em" #define D_WITH_IP_ADDRESS "com o endereço IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA URL" #define D_START_UPGRADE "Iniciar atualização" #define D_UPGRADE_BY_FILE_UPLOAD "Atualização por arquivo local" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Início do envio" #define D_UPGRADE_STARTED "Atualização iniciada" #define D_UPLOAD_DONE "Atualização finalizada" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 2c67c2ee6..437e85ed9 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Para utilizar o Tasmota, por favor ative o JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MÍNIMO
Por favor atualize" #define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em" #define D_WITH_IP_ADDRESS "com o endereço IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "Url OTA" #define D_START_UPGRADE "Iniciar atualização" #define D_UPGRADE_BY_FILE_UPLOAD "Atualizar por envio de ficheiro" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Envio Iniciado" #define D_UPGRADE_STARTED "Atualização Iniciada" #define D_UPLOAD_DONE "Atualização Finalizada" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 1378ec958..43e1c76ea 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Pentru a folosi Tasmota, vă rugăm activați JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "firmware MINIMAL
vă rugăm actualizați" #define D_WEBSERVER_ACTIVE_ON "Server Web activ" #define D_WITH_IP_ADDRESS "cu adresa IP " @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Porneste actualizare" #define D_UPGRADE_BY_FILE_UPLOAD "Actualizare prin încărcare fișier" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Încărcare începută" #define D_UPGRADE_STARTED "Actualizare începută" #define D_UPLOAD_DONE "Încărcare terminată" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 9d231fef7..e37ac3773 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "To use Tasmota, please enable JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL
пожалуйста обновите" #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активен" #define D_WITH_IP_ADDRESS "с IP-адресом" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Начать обновление" #define D_UPGRADE_BY_FILE_UPLOAD "Обновление путем загрузки файлов" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Загрузка началась" #define D_UPGRADE_STARTED "Обновление началось" #define D_UPLOAD_DONE "Загрузка завершена" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 63b978443..3c05c08b1 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Pre používanie prostredia Tasmota povoľte JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNY
prosím aktualizujte" #define D_WEBSERVER_ACTIVE_ON "Aktívny Web server" #define D_WITH_IP_ADDRESS "na IP adrese" @@ -373,7 +373,7 @@ #define D_OTA_URL "URL OTA" #define D_START_UPGRADE "Spustiť aktualizáciu" #define D_UPGRADE_BY_FILE_UPLOAD "Aktualizácia nahraním súboru" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Nahrávanie spustené" #define D_UPGRADE_STARTED "Aktualizácia spustená" #define D_UPLOAD_DONE "Nahrávanie ukončené" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index e8e9a4d38..39cefc9f1 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "För att använda Tasmota, aktivera JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware
var god uppgradera" #define D_WEBSERVER_ACTIVE_ON "Webbserver aktiv på" #define D_WITH_IP_ADDRESS "med IP-adress" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Starta uppdatering" #define D_UPGRADE_BY_FILE_UPLOAD "Uppgradering via filuppladdning" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Uppladdning startad" #define D_UPGRADE_STARTED "Uppgradeing startad" #define D_UPLOAD_DONE "Uppladdning klar" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index a6d24574d..6a9ba1894 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "To use Tasmota, please enable JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Donanım yazılımı çok düşük
lütfen yükseltin" #define D_WEBSERVER_ACTIVE_ON "Web sunucusu aktif" #define D_WITH_IP_ADDRESS "IP adres ile" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA Url" #define D_START_UPGRADE "Yükseltmeyi başlat" #define D_UPGRADE_BY_FILE_UPLOAD "Dosya kullanrak yükset" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Yükleme başlatıldı" #define D_UPGRADE_STARTED "YÜkestlme başlatıldı" #define D_UPLOAD_DONE "Yükleme Tamamlandı" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 79ec52539..f889bd07e 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Для використання Tasmota треба увімкнути JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL
будь-ласка оновіть" #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активний" #define D_WITH_IP_ADDRESS "з IP-адресою" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA URL" #define D_START_UPGRADE "Почати оновлення" #define D_UPGRADE_BY_FILE_UPLOAD "Оновлення шляхом завантаження файлів" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Завантаження почалось" #define D_UPGRADE_STARTED "Оновлення почалось" #define D_UPLOAD_DONE "Завантаження завершено" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index f69e61f57..aaec75778 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "Để sử dụng Tasmota, vui lòng bật JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Đang sử dụng bản MINIMAL
vui lòng nâng cấp" #define D_WEBSERVER_ACTIVE_ON "Máy chủ Web đã bật" #define D_WITH_IP_ADDRESS "với địa chỉ IP" @@ -373,7 +373,7 @@ #define D_OTA_URL "Đường dẫn OTA" #define D_START_UPGRADE "Bắt đầu nâng cấp" #define D_UPGRADE_BY_FILE_UPLOAD "Nâng cấp thông qua tải lên tệp" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "Bắt đầu tải lên" #define D_UPGRADE_STARTED "Bắt đầu nâng cấp" #define D_UPLOAD_DONE "Hoàn thành tải tệp" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index cd9c91fd2..d57121242 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -243,7 +243,7 @@ // webserver.ino #define D_NOSCRIPT "Tasmota 要求浏览器支持 JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "当前是精简版固件
请升级" #define D_WEBSERVER_ACTIVE_ON "Web 服务器地址:" #define D_WITH_IP_ADDRESS "IP 地址:" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA 地址" #define D_START_UPGRADE "开始升级" #define D_UPGRADE_BY_FILE_UPLOAD "通过文件升级" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "开始上传" #define D_UPGRADE_STARTED "开始升级" #define D_UPLOAD_DONE "上传完成" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 68deb4a6b..749e44626 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -243,7 +243,7 @@ // xdrv_02_webserver.ino #define D_NOSCRIPT "為了要使用 Tasmota，請啟用 JavaScript" -#define D_SAFEMODE "SAFEMODE" +#define D_SAFEBOOT "SAFEBOOT" #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL韌體
請升級" #define D_WEBSERVER_ACTIVE_ON "網頁伺服器已經啟動，位於:" #define D_WITH_IP_ADDRESS "IP位址:" @@ -373,7 +373,7 @@ #define D_OTA_URL "OTA網址" #define D_START_UPGRADE "開始升級" #define D_UPGRADE_BY_FILE_UPLOAD "透過檔案升級" -#define D_UPLOAD_FACTORY "Switching to safemode partition" +#define D_UPLOAD_FACTORY "Switching to safeboot partition" #define D_UPLOAD_STARTED "已開始上傳" #define D_UPGRADE_STARTED "已開始升級" #define D_UPLOAD_DONE "已上傳完成" diff --git a/tasmota/support_esp.ino b/tasmota/support_esp.ino index 11f00911c..c3835ecdc 100644 --- a/tasmota/support_esp.ino +++ b/tasmota/support_esp.ino @@ -304,7 +304,7 @@ bool EspRunningFactoryPartition(void) { return (cur_part->type == 0 && cur_part->subtype == 0); } -void EspPrepRestartToSafeMode(void) { +void EspPrepRestartToSafeBoot(void) { // esp_ota_mark_app_invalid_rollback_and_reboot(); // Doesn't work 20220501 const esp_partition_t *otadata_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_OTA, NULL); if (otadata_partition) { diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino index 2753b33c9..d438bae8b 100644 --- a/tasmota/support_tasmota.ino +++ b/tasmota/support_tasmota.ino @@ -1246,10 +1246,10 @@ void Every250mSeconds(void) #ifdef ESP32 #ifndef FIRMWARE_MINIMAL if (EspSingleOtaPartition()) { - RtcSettings.ota_loader = 1; // Try safemode image next + RtcSettings.ota_loader = 1; // Try safeboot image next SettingsSaveAll(); AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING)); - EspPrepRestartToSafeMode(); + EspPrepRestartToSafeBoot(); EspRestart(); } #endif // FIRMWARE_MINIMAL diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index 39a6c39c2..eb96edc9f 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -23,16 +23,16 @@ #ifdef ESP32 /*********************************************************************************************\ - * [tasmota32x-safemode.bin] + * [tasmota32x-safeboot.bin] * Provide an image with useful supported sensors enabled * * Is a copy of FIRMWARE_MINIMAL with some additional features enabled \*********************************************************************************************/ -#ifdef FIRMWARE_SAFEMODE +#ifdef FIRMWARE_SAFEBOOT #undef CODE_IMAGE_STR -#define CODE_IMAGE_STR "safemode" +#define CODE_IMAGE_STR "safeboot" #undef FIRMWARE_LITE // Disable tasmota-lite with no sensors #undef FIRMWARE_SENSORS // Disable tasmota-sensors with useful sensors enabled @@ -161,7 +161,7 @@ /*-------------------------------------------------------------------------------------------*\ * End copy of all undefines from FIRMWARE_MINIMAL * - * Start FIRMWARE_SAFEMODE specific additions + * Start FIRMWARE_SAFEBOOT specific additions \*-------------------------------------------------------------------------------------------*/ #define FIRMWARE_MINIMAL @@ -181,7 +181,7 @@ #define USE_WEBCLIENT #define USE_WEBCLIENT_HTTPS -#endif // FIRMWARE_SAFEMODE +#endif // FIRMWARE_SAFEBOOT /*********************************************************************************************\ * [tasmota32-webcam.bin] diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index 33d509885..4489b5576 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -243,11 +243,11 @@ const char HTTP_HEAD_STYLE3[] PROGMEM = "" "
" // COLOR_TEXT #ifdef FIRMWARE_MINIMAL -#ifdef FIRMWARE_SAFEMODE - "

" D_SAFEMODE "

" // COLOR_TEXT_WARNING +#ifdef FIRMWARE_SAFEBOOT + "

" D_SAFEBOOT "

" // COLOR_TEXT_WARNING #else "

" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "

" // COLOR_TEXT_WARNING -#endif // FIRMWARE_SAFEMODE +#endif // FIRMWARE_SAFEBOOT #endif // FIRMWARE_MINIMAL "
" // COLOR_TITLE /* @@ -2969,7 +2969,7 @@ void HandleSwitchFactory(void) if (switch_factory || switch_ota) { SettingsSaveAll(); if (switch_factory) { - EspPrepRestartToSafeMode(); + EspPrepRestartToSafeBoot(); } else { const esp_partition_t* partition = esp_ota_get_next_update_partition(nullptr); esp_ota_set_boot_partition(partition);