diff --git a/tasmota/berry/modules/Partition_Manager.tapp b/tasmota/berry/modules/Partition_Manager.tapp index 013bd556e..282490659 100644 Binary files a/tasmota/berry/modules/Partition_Manager.tapp and b/tasmota/berry/modules/Partition_Manager.tapp differ diff --git a/tasmota/berry/modules/Partition_Manager/autoexec.be b/tasmota/berry/modules/Partition_Manager/autoexec.be index 87af9edd9..e934b0715 100644 --- a/tasmota/berry/modules/Partition_Manager/autoexec.be +++ b/tasmota/berry/modules/Partition_Manager/autoexec.be @@ -1,2 +1,3 @@ # start Partition Manager +# rm Partition_Manager.tapp; zip Partition_Manager.tapp -j -0 Partition_Manager/* import partition diff --git a/tasmota/berry/modules/Partition_Manager/partition.bec b/tasmota/berry/modules/Partition_Manager/partition.bec index 5520f9af9..30064881a 100644 Binary files a/tasmota/berry/modules/Partition_Manager/partition.bec and b/tasmota/berry/modules/Partition_Manager/partition.bec differ diff --git a/tasmota/berry/modules/partition.be b/tasmota/berry/modules/partition.be index 99381e4cd..e039f3723 100644 --- a/tasmota/berry/modules/partition.be +++ b/tasmota/berry/modules/partition.be @@ -488,7 +488,7 @@ class Partition import flash #- we expect the SPIFFS partition to be the last one -# var spiffs = self.slots[-1] - if !spiffs.is_spiffs() raise 'value_error', 'No SPIFFS partition found' end + if !spiffs.is_spiffs() raise 'value_error', 'No FS partition found' end var b = bytes("00") #- flash memory: we can turn bits from '1' to '0' -# flash.write(spiffs.start , b) #- block #0 -# @@ -522,7 +522,7 @@ class Partition_manager_UI import string #- define `bdis` style for gray disabled buttons -# webserver.content_send("
") - webserver.content_send(string.format(" %s%s", + webserver.content_send(string.format(" %s%s ", slot.start / 0x1000, slot.label, active ? " (active)" : "")) webserver.content_send(string.format("

Partition size: %i KB

", slot.size / 1024)) @@ -564,8 +564,8 @@ class Partition_manager_UI def page_show_spiffs(slot, free_mem) import webserver import string - webserver.content_send(string.format("
 %s", - slot.start / 0x1000, slot.label)) + webserver.content_send(string.format("
 filesystem ", + slot.start / 0x1000)) webserver.content_send(string.format("

Partition size: %i KB

", slot.size / 1024)) @@ -578,8 +578,8 @@ class Partition_manager_UI webserver.content_send("

New size: (multiple of 16 KB)

") webserver.content_send("
") - webserver.content_send(string.format("", (slot.size + free_mem) / 1024, ((slot.size + free_mem) / 1024 / 16)*16)) - webserver.content_send("

") + webserver.content_send(string.format("", (slot.size + free_mem) / 1024, ((slot.size + free_mem) / 1024 / 16)*16)) + webserver.content_send("

") webserver.content_send("

") end @@ -624,7 +624,7 @@ class Partition_manager_UI var flash_size_kb = tasmota.memory()['flash'] - webserver.content_send("

Resize app Partitions.
It is highly recommended to set
both partition with the same size.
SPIFFS is adjusted accordinlgy.

") + webserver.content_send("

Resize app Partitions.
It is highly recommended to set
both partition with the same size.
Filesystem is adjusted accordinlgy.

") webserver.content_send("
") @@ -659,13 +659,13 @@ class Partition_manager_UI webserver.content_send_style() #- send standard Tasmota styles -# # webserver.content_send("

Warning: This can brick your device. Don't use unless you know what you are doing.

") - webserver.content_send("
 Partition Manager

") + webserver.content_send("
 Partition Manager 

") webserver.content_send("

Warning: This can brick your device.

") self.page_show_partitions(p) webserver.content_send("

") if p.otadata.maxota > 0 - webserver.content_send("
 Re-partition

") + webserver.content_send("
 Re-partition 

") self.page_show_repartition_asym(p) webserver.content_send("

") end @@ -711,19 +711,19 @@ class Partition_manager_UI #---------------------------------------------------------------------# # Resize the SPIFFS partition, generally to extend it to full free size #---------------------------------------------------------------------# - elif webserver.has_arg("spiffs_size") + elif webserver.has_arg("fs_size") #- SPIFFS size change -# - var spiffs_size_kb = int(webserver.arg("spiffs_size")) + var spiffs_size_kb = int(webserver.arg("fs_size")) var spiffs_slot = p.slots[-1] # last slot var spiffs_max_size = ((tasmota.memory()['flash'] - (spiffs_slot.start / 1024)) / 16) * 16 - if spiffs_slot == nil || !spiffs_slot.is_spiffs() raise "value_error", "Last slot is not SPIFFS type" end + if spiffs_slot == nil || !spiffs_slot.is_spiffs() raise "value_error", "Last slot is not FS type" end var flash_size_kb = tasmota.memory()['flash'] if spiffs_size_kb < 0 || spiffs_size_kb > spiffs_max_size - raise "value_error", string.format("Invalid spiffs_size %i, should be between 0 and %i", spiffs_size_kb, spiffs_max_size) + raise "value_error", string.format("Invalid fs_size %i, should be between 0 and %i", spiffs_size_kb, spiffs_max_size) end - if spiffs_size_kb == spiffs_slot.size/1024 raise "value_error", "SPIFFS size unchanged, abort" end + if spiffs_size_kb == spiffs_slot.size/1024 raise "value_error", "FS size unchanged, abort" end #- write the new SPIFFS partition size -# spiffs_slot.size = spiffs_size_kb * 1024 @@ -743,7 +743,7 @@ class Partition_manager_UI var app1 = p.get_ota_slot(1) var spiffs = p.slots[-1] - if !spiffs.is_spiffs() raise 'internal_error', 'No SPIFFS partition found' end + if !spiffs.is_spiffs() raise 'internal_error', 'No FS partition found' end if app0 == nil || app1 == nil raise "internal_error", "Unable to find partitions app0 and app1" end @@ -785,7 +785,7 @@ class Partition_manager_UI var app1 = p.get_ota_slot(1) var spiffs = p.slots[-1] - if !spiffs.is_spiffs() raise 'internal_error', 'No SPIFFS partition found' end + if !spiffs.is_spiffs() raise 'internal_error', 'No FS partition found' end if app0 == nil || app1 == nil raise "internal_error", "Unable to find partitions app0 and app1" end