From f738c8bff7b943d8508e87c81ebd9b02a4535988 Mon Sep 17 00:00:00 2001 From: Zane Kaminski Date: Mon, 7 Jun 2021 19:50:33 -0400 Subject: [PATCH] Better delay in key sample loop --- bin/driver7M5.bin | Bin 1881 -> 1917 bytes bin/rom8M.bin | Bin 8388608 -> 8388608 bytes rdisk.c | 9 ++++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin index 147a7f539952d681bd68da0d4471b86baf031cff..84af299cc0976fb263396c405aaa75c8c3580876 100755 GIT binary patch delta 452 zcmcb~_m^)%pz%7N`^*e}r5?{24kR)#ZUFHTlps8oA0Qr21_L95R2m;l4V&A>7HdYv zX_F5yCh#yTs0GMqGsvYeFut3t!=zLn*}t+>B|M_v^%aAS6SEVGmJI{HlY@W-V<{8E z|Ar0*AghFlfq}7&!HXrG#fv#j1EfPiJfeR?R}xEbYuXhrmNXFoeFilS1_p+728MTH z`V8t!%nXbYK(Uuc${o2}7&u-Yac6X5^;*rK5Prb(fJ=kt;bRTy4qg^KlUFiL@n}h7 zVCWLlX3)KQz;CBRt6Y;88_=L0Cv661FIJ#jTfu&x`!PQv`u$3!7?@ZYn1EI>rZX_^ zf>~9?Si@MySTVVk*-5e`z2)j3hYkh?uu%cx4h*^p4F8L~SSLSVRxnYs0ZDl^q%)~8 zDC95*TX1;c0>J7`}nzF11WHVNqmeQE;9d!D0`lXR)Lj yvM4z(&;uE)z_B1y!9fAY2U{ot6pJf(lECoKq2L^lv?{m)Bu$){Hyf~OG64WkYJbrH delta 411 zcmXwyze@sf7{;IXdtXCBL?X%>;yR*VRuVZ#1)YaO9U(Dw`gdHf|^`{usAb;~8NgtJPZk=vA5KaT1^dA09vY7(mtXPN+EqXSJ-8!qqc~E9IGTI6GsSS>ukK zOcyku*yh9Vvl+RP^IiL@!}>o|d=OM_d4>4xY-O#sdK5`|iE%KifppOIe?y9PX^+yz zsi1Te^xSh@J^&g~bL}#Qqxeav+~8ac^iSHBn$cN5#27p;2htEct}IeO48#XV(BsPg z5k772F>kE$ZowgjjWnNX%p1Nr>X5>v5j$9PmX<_Ww75~&YVFqJZ&7^9@dr!C<4=|b K6kIMk2G}o$VROF# diff --git a/bin/rom8M.bin b/bin/rom8M.bin index 344c2827c24a519ecc39eeb9460ac9958983ac61..a0c8cbdfdbe7afbdb2978294d678f805b26cb444 100755 GIT binary patch delta 981 zcmXxdJ51A26vy#%{}04kp(=tPkAEu^6agQoh$y9?!e2yuAmFpUS|6zOQAI?k<}VUr z!eZ>=z~Ev`41)>LMU2EaIT&bDq&&&mDWbMHCvc-)95Im*!--7%h; zFY{JEY5t^3ORVvWj2{s-noJ?zzhwMOCih8Ek`qq*|0ZS2*!MhhgHrbsD+5PzzOL`1%2R!Fg?i(16p)Wp>~SA(QZO>9*`(|#;g z`*_oML%iwL>v$w!SGg0}mU*wy35yJ6mP*iPd&J*rprsqVxN%M4~a5$FA{z@W&?tk$f6l!fHaMcYiYdQGd+ zUz6A^9DMzNJ=2C#jV|eQd;MF4c7Hp-OlcAI`bs zDl(CRSxCifxG)E9%tac~;lVu2#{y(vAu^GLMaV{S?qcL35BVs71uuM9fGVii`S5^Jy)>rjRDsKy4=U?Vo676H^DhrG0Y(4- delta 965 zcmXxdOKePW6vy%NzjH66Mh&V@ZSP!dwMM6CF{*Sris`6P?^m_sHRDk_szbeMD$~)3 z#PUXB(XH56NE$X~5(}}g5E8MmkqEIAu@Lp0ipA&T|NEblb5g04p2|zBw3c?H^`}Oz zviWZJCx=9mp)Zm>ChAE(MXi5Hf0s|L)1st2R``ErmNoUG(%7KXkiD|nh`O}jbv@-? zsfvkuZ9l9wto@~amDKdTB*wM?r@;zvkj9sD~emc_7!7>m2LKX2)#5X*>vJVj_2oz0&wT8+jHOueu#J zSa2`s6-QX7mr1YViDmz&PXeP+NU&m1k{uP^aADt`irH`La|J8DZ% zre0b`gH{p}J(9ErMK=e<`RGD>KwM^j&rbXG#+pjoSJ6N3PC>1KS(ptc=AZy`;X;0< z5cA>20xZNL6k#!nQG!yGp&S)hf=X1O8YVojuoN|@MIDx*9t~IyFIJ!tJ~Uw^R$(=o z(SkKti*@j0JzB8=ZP;hy6H! zgE)l4ID%drMIZVR#W5Vm37o_!#1O}6oWWU~!vN0X0tS)5MGWB*hLOZ&T)_yg;u@~w P25w?>s-X7P&yRlrC++)e diff --git a/rdisk.c b/rdisk.c index 7c0cca8..16145f4 100644 --- a/rdisk.c +++ b/rdisk.c @@ -17,9 +17,12 @@ static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, P // Sample R and A keys repeatedly char r = 0, a = 0; - for (long i = 0; i < 100000; i++) { - r = r | RDiskIsRPressed(); - a = a | RDiskIsAPressed(); + long tmax = TickCount() + 60; + for (long i = 0; i < 1000000; i++) { + r |= RDiskIsRPressed(); + a |= RDiskIsAPressed(); + if (r && a) { break; } + if (TickCount() > tmax) { break; } } // Decode settings: unmount (don't boot), mount (after boot), RAM disk