From a0f6b7f1a31f39703262d00a99c488c298b78351 Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Fri, 29 Dec 2023 23:10:26 +0100
Subject: [PATCH] Relax checks of Partition Wizard for newest Shelly (#20349)

---
 CHANGELOG.md                                  |   1 +
 tasmota/berry/modules/Partition_Wizard.tapp   | Bin 35678 -> 35680 bytes
 .../Partition_Wizard/partition_wizard.be      |   4 ++--
 .../Partition_Wizard/partition_wizard.bec     | Bin 16720 -> 16661 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b34fad6bb..ce8b3922a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Support syslog updates every sleep or every second if `#define SYSLOG_UPDATE_SECOND` (#20260)
 - Moved Berry animate to its own `berry_animate` lib (#20309)
+- Relax checks of Partition Wizard for newest Shelly
 
 ### Fixed
 - Matter Contact sensor was not triggering any update (#20232)
diff --git a/tasmota/berry/modules/Partition_Wizard.tapp b/tasmota/berry/modules/Partition_Wizard.tapp
index 1f4e94e0a28bc106209cb68eda6653e3ebb4c616..8198ccd14cac3222ccbec601defb071169aa4c85 100644
GIT binary patch
delta 114
zcmcaNjp@NOrU^zYwr+Z<6U`codlt?Ozg?{$v%Hgm0fdDaWEct(i%K#}GV}A|%QLGI
zi&FHGQbR*H8JNYT`coyO`ZvBj<~dp4o@?`VFBb=16ayx6bnAkYO}6M(U|Z0|00aOq
C=_eon

delta 93
zcmaDbjp^PrrU^zY)l1$bO*Cr|UcJ*PJjeS(;nGe91`rlzkeMvkEyl&kz+7Y`omyff
hz47HS&&?aXd>nXD)K2E=)&(h<Y}Kv6Hm{2T2mpy<ApigX

diff --git a/tasmota/berry/modules/Partition_Wizard/partition_wizard.be b/tasmota/berry/modules/Partition_Wizard/partition_wizard.be
index 022e12295..47a59ef00 100644
--- a/tasmota/berry/modules/Partition_Wizard/partition_wizard.be
+++ b/tasmota/berry/modules/Partition_Wizard/partition_wizard.be
@@ -4,7 +4,7 @@
 # use : `import partition_wizard`
 #
 # Provides low-level objects and a Web UI
-# rm Partition_Wizard.tapp; zip Partition_Wizard.tapp -j -0 Partition_Wizard/*
+# rm Partition_Wizard.tapp; zip Partition_Wizard.tapp -j -0 Partition_Wizard/autoexec.be Partition_Wizard/partition_wizard.be
 #######################################################################
 
 var partition_wizard = module('partition_wizard')
@@ -480,7 +480,7 @@ class Partition_wizard_UI
     if safeboot_size > (self.app_size_min * 1024)  raise "internal_error", "safeboot is too large "+str(safeboot_size / 1024)+"kB" end
     tasmota.log(string.format("UPL: flashing `safeboot` from %s %ikB", safeboot_url, (safeboot_size / 1024) + 1), 2)
     var app0 = p.get_ota_slot(0)
-    if app0.start != 0x10000    raise "internal_error", "`app0` offset is not 0x10000" end
+    # if app0.start != 0x10000    raise "internal_error", "`app0` offset is not 0x10000" end
     cl.write_flash(app0.start)
     cl.close()
     return true
diff --git a/tasmota/berry/modules/Partition_Wizard/partition_wizard.bec b/tasmota/berry/modules/Partition_Wizard/partition_wizard.bec
index e6e82953351dc4f9cefc1fa6255d1485af6aa58d..3f884314cae6823852fe0e93558d63d085cbed6f 100644
GIT binary patch
delta 412
zcmZ{fy-EW?5P)ZI_bz+6&CkU(Ug9OJ;f$a*3W8N)Wo2P;U>Tz*3Ko(a81xEBwO|S{
zm!}X!+$XTM@c{%|U&6#qQadnwGsAwv&SxKu`snr6LMQ6Zx<<Ye419M}0tw=ZuE7Xm
zorh2$_f@q_W3=eNP3JN?Yn@-UyBB#Ax>36msSo>wmFl6*0-DPSY3BvdYV|Si2)#oL
zpNdB%U;a*3LYnoHQf@Yl)2{FUYRXvp%AyDLz50v-7s@>gdvZLfgem4F3mIRsjF8%c
z39e0jrry?C=^fL64CugAKhA`h&;)=TV8Vn6*&Z^P9OFVrET+X78CYt6`^Pz@29*9$
zU9AFU`mgR(O`1>$QHo0=<>^bj*h+I4<8nCVWKPzAdEcCqnKVz;sIh^NJ$!HOZgFk$
n*nwh%Z7zw!1%+Y{VJ=OF4;c8z2nz{@A6q$}0O4wVua5ozLFQG?

delta 471
zcmZ{fK}sV*6oy}=x;xdKYEx-3R5ER*7~0sVizo`N%mrpKiv~f2Bn#sR!x&71L3<%C
zq!w8SM(_@b2z3xWfCq5r2~7K(tmi@Tzgm2J|GT{;FPG%$%pr&7+!>HoCDM7ml6XO+
z0Ggw4-g#OqMdNRkH4RpjHE@SQl;QgYfpziS6j??#Z5XD#lT?Jz?F|O4t~&1bhX<)T
z8mhm?scMbZTR5Twrzc10L8t$xH~ekx+(%wR6^~iD9BEX7+h|;inc}8X-K{D8kuN2#
z2q(32jN&-+7GepoVxFt7b7X8DmhMR$Kz-y;si*m3Qsi<n?<>vyNV`HoPMgRp4kFw)
z=gS>$%PD{lIFupaC)8pS0P)kZgt8$R5nJdfttK`T2>(kC%#=6YN{3zn>i<ClM1czI
zyMQR4w4t7mVyFv6g}qhA=0cd#AIVqdv*bH4`?qJwu{#4U_RZeTDk0v@ReO6~A}zBL
j)Klt8ZTV6$yq4g#wlBvVRF}|5e;J&LvcQt&z1<|AXIf_N