From 2782a05ca9aa3410b18ce3588477d739d9988b5e Mon Sep 17 00:00:00 2001 From: roy rocket Date: Fri, 30 Dec 2011 01:10:26 +0100 Subject: [PATCH] New Fahrplan binary fixes 24bit pointer bug --- firmware/l0dable/fahrplan.c | 6 ++++-- firmware/l0dable/files/fahrplan.scd | Bin 115202 -> 115487 bytes firmware/l0dable/files/fp-mini.scd | Bin 8609 -> 8692 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/firmware/l0dable/fahrplan.c b/firmware/l0dable/fahrplan.c index a3248c4..7e15dbd 100644 --- a/firmware/l0dable/fahrplan.c +++ b/firmware/l0dable/fahrplan.c @@ -61,7 +61,7 @@ void ram(void) { lcdClear(); DoString(0,0,"Fahrplan "); DoString(60,0,favers); - DoString(0,16,"SW Rel. V0.004"); + DoString(0,16,"SW Rel. V0.005"); if(filvers!=2) { DoString(0,24,"Incompatible "); DoString(0,32,"Binary. Get "); @@ -148,7 +148,9 @@ void ram(void) { f_lseek(&file,5); ob=evcur%256; res+=f_write(&file, (char *)&ob, 1, &readbytes); - ob=evcur>>8; + ob=(evcur>>8) % 256; + res+=f_write(&file, (char *)&ob, 1, &readbytes); + ob=evcur>>16; res+=f_write(&file, (char *)&ob, 1, &readbytes); return; case BTN_RIGHT: diff --git a/firmware/l0dable/files/fahrplan.scd b/firmware/l0dable/files/fahrplan.scd index 73e6c9f516daf3e3ac224f7428d3ff6042b18912..44dba4d441f491c0175e9a3a03b2826ffde978c3 100644 GIT binary patch delta 1835 zcmZ9Mc}x^n9LMLkyKfkEDJu#}UE60+5xI5&i(2YQ0nu6&Ypbo5ksV>n?hNiBf(M5R z-XJ5LD5MZI;2D*veV%xwrUp~g)`+o*N0Zi8jcEVSYEt{&VE^g+XYzi(&+mHgJFjYO zNON@vGC32|oZC>0NfwVLj<(Q`zQA(0ze$qyev!UVlS|UeqjM~5-x+hk@Ylxg;2AeM z#cbG<(sE5~zjj;|&p2VygK)NgHfOQ`ik|xUb70$qg?mGo`=+aeg{!lQ?%A$|bEAv6 zGsRqn6DOxQ9O`-3K)t_QWI;|3=MLzVzBV(W?k8nx!ZJI{GJRP-Z*>Q_>Q!7uGIlys z)JdMf`t_B5lklXB>sLXonpg{V-CZu45T$0XQ@bkdtnlN?XcSF}pVt|o$*E)F9Ldfx zIE9<4c)dZ{9Vo>Z)6PbP-5qABCF<+- z=DKz>qMqmmectxXrqKF&?z^2viTCJ4mED7MUQ>_|-N60U!orWl*!3MvRvuC6(H?dG zE@QACcKvEb6p#+6M_P@3e{7w{TOaM=5{??l(wwT}c9cHtPzahkO&F^qHsW6TGE$gs z9khlaK9-bS8e5XAW%Y&Zuy~v+1!erPSMe()imctOg@I&uUwCannSEehnAR2st1UDa z)?#fil+Ho2ZP12L8N{Xh`i7|5x$+yI{BvEP6lOx2Zd5@)*J)vRn$QGSCZBlP|8~=dhfG0 zF14~Lf=tSVVqT#5zAspkiRYrowfR6_1B!JnBC8g{P&1;wwk29~9p(# z2~?y@gOVT54!ZqIgJOW*Sv;O2$zsrjGo)pr$1V9tk_fRp>Rbc|3$=v>GzD#DMFHFg zOWP8#5z!5KX5nBVRQXr~U3pRDz6WOWR+|SNm#|j<6C(N44_Qc{TxTgmH$8}A7jk|% z9EW}x12{_8te_4(-E$O#j&P1*H!8Hsvfi4_We|rDC4?HStDM?glJ>Y9CRn`^?GxiE zid5(&qbi^sY?FNfw?E*{$4h*Yax_6fs^-(oRigVQ&-E@1ZtBmUEk7 zxCJq0zqV?3Z^g#lP>T>{gu^6hADp$IjQvoqlfMpu&mstiA^QXiKN2&PY;1=;D70LM z38#!k-pEv=GPRK0<8TeE6u#W+q>pAr_h2piBoqjgSI)64VJXH1T|WtHEQo^o1#Q9E Z-aeL}g<&R>a!zYJ5AV{kwbSPz^Iu7MZ3X}U delta 1715 zcmZ9MYfuws6o&U~_FGmVf?TDIHIXW#5#1$Nb*k116K&Cs1$9PSr+@)TNl+rFc!P+D z0&-hnrvwK@ydb3@tMlPyRA3xNowm?FVr@rlJ5w#RQu_mKJGN&N@rU~(J2~(3o^$f; zn{7Pcw{O26VWruUSWTkY^z3u9XL779U0u($Ph_)GRsV38Ub`1WeaLC|+tEEiwU zyvEJ6=)Cng^O9M#tNR!1<26oL@+eroH{M_UCuzO_X=>ajqoC2@0 zvK|H|gfKI+nBSdDf@F-fi1Le_ljzfYs0Cpln2{VzzDr%;DB*&Tn6^!WL{XY+7A4s| z8mj)X<)Dt_yO`G9a!#&6Td6X4BTo=qTA+^ZtYJy(Zl=$zR_rNcqm~vh`VuA~)+ois zVF%G78e^H|sT;HG*_({og_}u*QAFr-GgTU>hz%gh<;95t`rfM0Dye}GsXi-q@&Xb{ z6_(_YFoSxid<`og@zD_tI@*lTe-(8)g2eqgwZ5jDB`CQXWOJ=SJBSZzw-9o_j%jLA zuhyG+;%Z>doRa@I<`n~u|E$wDH8G|(Y-W_^Nplr33?c%?R$XabwN2NefTT zoMPlo+1YB)PPVLd9Fc$PunK5id_h}gjui~*>T@M5kvo~k7v%@4K@K{})trAkC}~N)w)XO%}1{R+ySJ^f@6#!%XipwR@z4k3zBMZ%y}QB32ZQ z5|f;{dAs*<;s*xe$mkCc)%%Qj!N4m}LNNAqP<|fH3$sGBj&AOP8TRT3dQ9W#S32+z z!OcNqAS76nfkR+Woa0~_?HvapL@~crA3(#2#Fkm!^(z0n2gVw?hb_0L_j3> zO{BEA&}Cs@BV;%XBopm;1G)%7t#mqd8euizBohqK8`B`3kkaYkkf`1abwod4hVc2= z!6>~WigLFtg7%4UfDdp;(6`7}wMcw1R^Wv>TF@D~X^zclv!I~!X3+jH~1fuSKgpbLbn!Hj1I^c5(T zyL^M&c7d4?bPp9PKNf<4%T8scD(-y{q6E2N23_ukc8FM*w)lNlu6=8+eWNkMm7Z?f z>|8h}ZL#841mEdURPGjmk<&`_c@d1Tk<9B?aWKcb~M0I zolxe1yc3#BOJdG3c$*_JjS$_U)HnN@cQr#L5s(>bLrmFXgh-ls7EW*^x&_iYX;3@3 zH~~d-m)54c-at>OaFUR;PB2}ft1iNyphxY?ODMm3e}&@PS+QM)Ok%nON!OHt%f4w( hE<+I)fNWj&OWc>Vy6a$MSp>U!U<$@ex!VKQ{{dz^E)@U( diff --git a/firmware/l0dable/files/fp-mini.scd b/firmware/l0dable/files/fp-mini.scd index 747e30e146b0c71a5509ff8a747ecffa8150c11a..54a8d46c5bfeae7e25431299b0aef2fd926d7105 100644 GIT binary patch delta 1377 zcmZ9LT}&KR6vxjlciFoi!+xxOB9938XP&V1b9l_rV$1QH9MU$()J@!$anzRJk2zcsF}@a&MTgI9 zDGLGjZTQfp2)oN(#fYfJCVQ6Mx4{g)WjE^1*k9(=cG$2B_hMARN=J&#*r5lHIl3Gq zzvrNgs_({edq7mW>!{^D4q#4U_|2?f!r3ShbV3NkX&QD(<$`?OnP!CD!Y`c>v8V^m zxQD2x``nQ7h(=vBk_OLFw%~?ooba4sB$wibC!d)1K+Y=~Xqwna zou;Webe|eJuReX~0N(U&W2Ihl-u4>1`PN(8bigNkkN#z)wWz88SPMnS=1-h0jHm|- zL&N!zfs1O-NWM5ah<%ZOwZ;e2UP$AHH^ZpTB)0jECel85=z~m3)%BD{=c&ZhQbc@-n53C;ffj51T0 z^&ewRepto#{rlLIA9ms&{&u$NhcSFU@B-TzfMpyHbn~$QJQozz534e=U|L!Zz-1w* zI?Wv=TM!3=Rh*c=4Xi^_a4y)%i7AAHuahabJ=Df1J&VJkEF;;33!x4+8-iYR%H7-~ z!?G+`&1LN14LR@Zl_6On+H8&8T9K59y1XfFjlH{~(MjCzTPnV*hH$Q8A17{qSkzo{ zD;Nl;7$M`B3mfAb3@2R~p8$Rpj9Qn{&}j?ds#W8QUKkI<4h64<6>-<+!wE*z1zaKT zK;ep#WIGgif;Ea!>X6dME+}vuKirJJQ(E{F1-^+uW*7a_qC#Dy)p9%njwoJ=>}8bc z#V;c5+!2KvQKD#W3f4rEyf+G^F(Eu1+WF{SM#M1AM~zlLMcX(5a|YAlm$5k(XTvdA z$CI%G7Ls!+&c-^}dW^1;No{306;|+|YM4)}N#~>rN8;2#j1H$tL-?tBh_9&du@Ldk h5(T%#8_h@Jn2*Qebah(>hepM%Ykjp)JO}@O{sC|BYBvA? delta 1333 zcmY+DU1%It6vt0Cce1lPGuh34&+g3b4Qn(e+jM3(iJ~b@x=T$Vb%_gkFlp0>(I&R3 z#Ym~(2Neo78c0vk5~)zB#gdYwgwUA!`JjSO)CWOI!T3_hQwUfrrb#{b8U^QN=AQrW z-2dVJ@BC4`SX4Z2i|b4&k9da1rdrMq3cVb^lerNks5eaF5MUlJzMmQYl zX2fmawTO)1r$`ecqzktqd-RP6d>oZ{YXR4zQ5=ePvaTrH!B6Oeqynx+_vv?{@J>u( z?f+cHO010)Vz7em#wsdFyW*r$pyt_l2V0531a`*dNe{-GRT8(PzE*AFY`n}S;xK|$ z2?_8-HzRcskI=_R0u)?I^svPQ44`UOm|~L2peZMR!yHlvOvojLmm4relAh$FY{ewM zoymSi${J244;d3l*qajb=0%huv_PtzttH_c?n}u;4yPK`FGGU5mBO`@yaa}o&7Mm^ zgC#n*Qz|&z{a;GtS+N?~trT3wH!V5WN7g|`P5N0|E;Dvfy==j_4W-tp84FL_B}KPk z$;Kb;-71xpG%4Gu<=B!9y*QZeR;av?#;a*d{6RmYceCC!*l1+rrn$^h`a&88Gt|mm z8CC*6$fTK_fh+h~X0J-pUqZ!s&B83-pLiDOda;cN>qPyN*-Z}g2-n98PP6046Db}$di2$?k@1sscj-iasn7fk;sR#I