From 970d813115617b691ebfc12358f02013b03858a2 Mon Sep 17 00:00:00 2001
From: antoniovillena <_@antoniovillena.es>
Date: Sat, 8 Aug 2020 02:56:39 +0200
Subject: [PATCH] Arreglo bug ZX3

---
 firmware/FIRMWARE.ZX3 | Bin 16384 -> 16384 bytes
 firmware/firmware.asm |  19 ++++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/firmware/FIRMWARE.ZX3 b/firmware/FIRMWARE.ZX3
index 3c8e4a8ff6ca43565dca1360b303d25039c1a8ad..b269c89d775c851393e23cf6ccb9bd918b5ab191 100644
GIT binary patch
delta 1355
zcmV-R1+@BrfB}Gj0T3~;sy+k(JN)f=1nqG3AwaPZSpfk*vuXif0RaTF$^uUU0f)01
z1snwdhqE^d6#@Y>lT8ee0W-7S4C4a<hqJ;EJ^=xTvjGxK1_7(HPZ*H}e^ymPA0461
zM<|P&sc<?kFM4<bWV|kJ;Frs}{b4Rl?jhw!l8LmHaCyqWmOYFhjf+;Mbz@r*<q}#r
zFhkicHBCr*2LP97uY@&_(Mv9)YiFaQ)^iP-Zj$n);t&XbW4XGVF@h~&7Az_HOhIsl
z%0I;^FS}*p@BfM25=CTBfBO?Wz8uC`<2>W4K2Xt&O_z0O+>v79tl>haI_G>*+g|`(
zBy}Jh#p@kIA#DrPXiuzV`*{$W`MyO`l-WyM@PX3dOhAQLPzPP=j_+*ZiUixIZDEk-
z5@mdlGv4k12=R}u;xFVW<>$W3)nD!f^QZ~fL1cD;oD1QA&k|QCe;H5!gN+>y>b7ct
z0E=)KP?5C^nnFoWQ?RF;|2H{_#D4)YFd!OQSS?i$`axw6^Wv7MX*e8C6Gsi#P3=Vt
zxKr|q3td!}aSV<dAfxzjlWL6_Akxv2n5x2HfM%FNC4))IABv>QBLGxsZ3Xj7u-}#w
zlHT?TT}??X5&r-qf3-(gF2-bN*Onlwt+f{dYDDb-N%fx~+6wOg1nbJO0JvxlQy12Z
z93UMVc=j$yTV|mthO_`jaukthy1NS|3FXO-;W|$D!ew`5@+~$}Ix`@>zFq%rw(sl1
zV=M}7DA5RcB@1&6arHBy&3P`;NU&Ppe{%p$^O_~6*CqgJe{TYjX(jVc&8*|e%8dj4
zu@TyD7h`Wd>rMPZ1o{AXf}tK|7sF|~q@+PjGVHei;52e4c6Uup&*+D+t1O`{tS;q)
zUlWRQLf&B{2)zLFV9?z)J*@tYV|DV6!<$?5C2RzF+p>gwC_-UR?PDNGRt`BrWhZmd
zaxINwTGo;_f9WvIGjfg1Bt}K$n7?D@Pv+VBXw%Dgq@x9Cd7Q8Sz-&)6svslBOM|r)
z6%Qr(2fR;bY(w*zuh*-$2Lv%}u1Zrf6|u7oho1jN=RVLQ#8G`gb8t;NK};~AR8v1g
z09HpqpwQF2RNTmW2QpKY_?wN-GwIoN7W2ve+lJe%e}NZcm=2tAi_1YnW8nni*75c$
zM11x3<K3AYInTyQWidO;H_Au<eT(JGOcA<u5Gzd3>aE5tOkFK^5U4u#h)>=~ea(ab
z70rxeOYaS*moz$>AUYZVI*l+o06H%qI<(48EdVI7vt%L^Z%&E-vrMpCg-g5g&sS-_
z0B>-de}L8XNM)qKaym+q&|_CIG(PU<O6;gnbpx!WWZ~zuT(-+fA^W7pnBh$H3i%<(
z>7hUQU@=ffF;+3FDjlvC%7t)Ijm+1L$3@{wbv{23e40TPn^lTRSu5fOIRC^-6j!3Q
zO5!h$t48oMV>^I8d9Uv-d#*o9)DjsQs)ZOZe-bpFA;zrYtRSLh5H$EJ5T)vJ7mf8G
zsp3^X-ro!=7H%WzHtJ*AZ(&HV4_>WnK5_?(XkkOi1ffH4D$YP%{<Rt=oJDNRf{V3q
zB4>WJhTQ-_k}|o%OmD-$(6~jNEJ0s%k)=Wsas>LsX_ynrL=I(5&~Qg@bL3Py$h>x1
zUed)*byB(wPT@`5Qs8190R6jAawMfRnQnO{v9yTpI)wv6+M@hv;8I-uAOO9yAW4au
zb1r*)j(3^U(JQiMXQuFvWXg>VgF6o|7p8RxWJVQ%qLoAw20}EsQ@G2sv?8Yg15Hgs
NvtA@%7qh=RK?H?;X1xFa

delta 1354
zcmV-Q1-1HsfB}Gj0T3~;sy+k(JN)f=1nqG3AwRJYSpfk)vuXif0RaQE$^uUU0fw_0
z1snwdhO;*c6#@Y?lT8ee0W`DT4C4a<hO@#DJ^=xSvjGxK1_7$GPZ*H}e_&NZAJw68
z&4i1>sc<?uFE4s{WZ=9mcHo)I{mWr4?o=U;l9X7qaCr&J+?I^fAd6^Krej-I5fWNB
zJ}}uXbTv&#dH{fzMz07p(dkR0YjUGD*4lHLAa3$m;`$H>W2d<roD+gA7M3jfOkzQB
z%J{`8^Se^w_Wz#U68J@AfBVD}zQe{bSv;=e3O>=rO^BCu7ThV~#wy{2I?Cr4+w}m|
zRU{x+9P2zCA+&AOXz*05miq^q;rT^Uo0Ln<1%WT&%>;#nPzTlO^^R<=;skix3T<KM
z$r5EZkmKHt0P*0D`r?x0a^=3h)%@-?1*ne+L1cCvoVelefQ%AXe*zf*HQ0@z4z9Ka
z00@f*7*&z03_?jyQwgX0oHsd7iGKmCGB6-oSS?in`a$t!^I+ncs5r(>F-LI?O<nDT
z3{$J}3)oZ@mJH_`Ac&)Iuak|IAQ94yk}0YTfM%FhLW7dZ^g)U`%K%bTX>Iecu=JKa
zl40Ho-%Uv^75^~+f3<=~E``QqX4fFOTCJ-W0!HnW0QB_<+VTnjz637H0E@T|c2m~D
z93UMVi1sdLNn4hoLWWBKM{=Q&XuG>62~f%IsNqf{_hnpn@@6ekI@2>CzT5w9W$!!d
zV=Sx?Z72wNCB1V{4RJFc&FXp5g0Q6Z-*eXhr1K?trzQX`e`;@$P-*khPCTs1u8rIS
zv9A$t7u{oT>(l(CLIePJAA%lbdc%>rMk=I1O>^u3OW<;ICw5IuhtCd&tIMI%tS&O;
zUpR_#;X+{~-3R~+^VZNc-K^vOV_5Pxk4&3eC2R!0d9qD>DELBQ?c`%1Nme;RWiThv
z*K&=bVkOo#e+lU`&2rO?Bt}Jy<vG9R_U4rOJ!s2KccYpGX$PDD%fL@Ysxu(RvQ&dx
z6%SGQ!Us=hY&%1l|JS;=dIaDxY)Vry8WpqKhwz?8@8>hn(!^0gb8t-uJ3&nIp;S{t
z09Ho>LC`w9%~ZX}2RAZ>m7Cwsm^0aRZu61;yoSB4e;pS%nC6_YamzSCV<h1O9@h5H
zD@14Y<KLN`9AnQ)Wih<VbINnn|5uC4&J<C)2P?q@>TRtp%w2RX2dH5>i2vTyNJq_B
z0L{T;xbF>gN|&QLAUdf4I?*sX_y9T}LOScpge?Fvv1B3?>u>alv(K=!g|)l%@>lF>
z0B>*$f1Fs=NKa+KDsnnXInY-|F+Stx&Pt9^bpy(!8e~rAT)VbP9Q#6w#!2B!ulW#y
z=^Q@_`7w4-F|<}OD%!4LQOX!_jm6h|jYYiSbv~p&5PTUHRGXzrxLM+Y21EZ!d=zD(
zD@rf!2&+ajzheVFdHC<@E_+HpN)j2ZQK|?Se-cBU6UM^g${=c@5Jvd35Td1W7vA-l
zAmUZ(Ki|zN;1;GMt~O)-+J<4U59GD2K5}-8kZ55;1U#XnaLz#DUA3<!QJicf%vg(X
zTOwzE+lCDQB$6Y!Om7UsjL=2Pok2ohkyk<zs&WLM#F(ZNL=N0#&~$Kbb428YI=n1)
zU0PkmPNz~08%|9Q+)`p5-T=E#P;x@0nNx0gLb2<Ju7xv0AljPz;Kouz)2RS7vmi-{
zb1r+6j(2aFdeP;wW(=l}p31BZaXSz27sYi5)MOPXu%Z)oz?8a<xX!b+BBucZL{C$*
MUnF1`v%Wh*1d8Z!$^ZZW

diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index aa4b0e4..9028f54 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -2353,11 +2353,15 @@ rotp    call    readat0               ; read 512 bytes of entries (16 entries)
 erfnf   ld      ix, cad78
 terror  jp      ferror
 saba
-      IF  version=3
+    IF  version=3
         sub     'D'
-      ELSE
+    ELSE
+      IF version<3
         sub     $30+version
+      ELSE
+        sub     $2f+version
       ENDIF
+    ENDIF
         jr      nz, erfnf
         call    testl
         jr      nz, erfnf             ; wrong length
@@ -2440,11 +2444,15 @@ otve    call    readata
 erfnf2  jp      erfnf
 sabe    pop     bc
         pop     hl
-      IF  version=3
+    IF  version=3
         sub     'D'
-      ELSE
+    ELSE
+      IF version<3
         sub     $30+version
+      ELSE
+        sub     $2f+version
       ENDIF
+    ENDIF
         jr      nz, erfnf2
         call    testl
         jr      nz, erfnf2
@@ -4664,9 +4672,6 @@ easter  di
 ; Load flash structures from $06000 to $9000  
 ; ------------------------
 loadch  
-;      IF  version=2
-;        and     a
-;      ENDIF
         wreg    flash_cs, 1
         ld      de, config
         ld      hl, $0060   ;old $0aa0