From e94dbe366a4bb5a3f0a5a4e670150c93ee8fd5d1 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sat, 14 May 2022 11:37:56 +0200 Subject: [PATCH] Partition Manager rename SPIFFS to filesystem --- tasmota/berry/modules/Partition_Manager.tapp | Bin 17005 -> 17087 bytes .../modules/Partition_Manager/autoexec.be | 1 + .../modules/Partition_Manager/partition.bec | Bin 16636 -> 16636 bytes tasmota/berry/modules/partition.be | 32 +++++++++--------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tasmota/berry/modules/Partition_Manager.tapp b/tasmota/berry/modules/Partition_Manager.tapp index 013bd556ed34a419418ff93590f13532cc06a35f..282490659078c0c4c69a6d99bed5c0a4ecc6c005 100644 GIT binary patch delta 655 zcmaFc!nnVc(KNuDnT3l11m?!93sGy#`CbcTgD^LP3`1gRNq%ZYYO-EZYG?>21G8mC zeG(8)G}Q`JRw&9<2uLg{$t=mt&x`j>%u7s9Ez&DVEGV#6sLCwBA*Z05rJ!qoDXFhD zF-}Ie3+RRkH{`niI504PFfY&z1u#2+jz|W(LKx@@Al|rKPnuPf!7pE7^F3)1Rz|nU z_Y`F&^D7FnspTaV7g$eLP~6Mt2o%&n2#9W$RyxZBRQggyS(JfIriOtWiz|yu zQgfkBR@4^TJWc+g;2XWL}LyUqtoP%S_V*`ZC2F& z#>K?WFj>~jUR8p@C$YFhp*SbML?N?SArDBo1uK+P7NiR3F?i;cCFW$NC`|4&(_@lg zn7r3)5;P1W%uQGsr%dj($>VZ^J8Lte?LHP>l%z5FjH9X@C?S+qa5FHn{9t4NdKu`; n0B=SnIc7*&!i+}=pb7|B(s*dHzLO|3Fa{^PJ1MZSI)TIiz%09$ delta 647 zcmdnr%J{a0(KNuDnT3l11U%>UhV&oLSJeixL71CCh9R-EBtNwxHCZnyH8g~ifjNpd zJSmPhe4?q=#EsIr2~BH5`q__s`QyOA0K&XL9R-O+C7C6e`FTJs$zVNKGU}3mc;in! zX--K7zkG$@08h8gIx-@xj1H3>6?G>kD2Yz)R9wMm4dls8_EX~7oS^iGiP3$sv#PQr z8?#Oa1BXlv1B*xv6T3(cGp9@sJA+CD$K+~Nbv{lIi&>+CNkoI;Kl9`SRk2VmpwNG2 ztq?924ITzIghrruB4CE_AhCgthKqv?=R+}4FN9k}gNI|Xw3@agKaxrTC>t0~4T6*7 z)eIS3CQno|lUFUa(ND6o(a%XuPt8lQ6JTX1E&+xJkj_a=O3j(PURz=_i@G!;qu*o& z4RfjDg3PqE;`rjss#JA_vc#OyR9kh`Om#bfpvk!!mTaJqatq$PL1PXRqs?SrZG+9t z+TXa?xEVnDCRdx;>&h_rBo>z_6zAlZC}b8ZZ$`2G2a8v6(3fU>*0( z^w?w=Knf=Fn@>WDjb-L0tc(*T-?qtv*%@rRkA)W{Nlcb=QndpmfYJ(X21b@2j10iw r1o}U~n~_P58Ip!DQ-lOi1q3WBOg7 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 5520f9af96c038dffe33ff1cccd8ed584f51a267..30064881a02ce6af29da439b9829443844b18f01 100644 GIT binary patch delta 434 zcmey<$oQv`af6&Rt0;qCzQW{%X2P4Tq#0Qm-6q>8=(4HhB^4J~Pxe<7om{7|g3%Eu zC?gb(+04qar3D7T_Z>kzIGI~w^XDdBfLtTbFtvJ3ovnqA6m7NC{!hp?l z)#orVIWbJ`SJmZEErtfp9#y%`9a=ZInAjO6rUN)Op0FzsKt^fc4 delta 376 zcmey<$oQv`af6&RrzC@4zCv(-r`u*_X%SXNhsm0XGLu6T1Se-J>}9kD@-#MwD?Vak zbf0XcqAbbAtkc23AydP^B2vS|F4DuyDbvHwpc26`xkyEwl@rXGry|eDHF=+k_~eHw z5~{omG7-qC`9NxzH9D9?G#LIf>xFQOXz*}M7E;xg%WV5RD2Yl?AB+Mhu>LK%+BL6u>&Jnd-60Fn|") - 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