From 79b1b2403e021251e62662025acfaec3b11e2b6b Mon Sep 17 00:00:00 2001 From: David Meyer Date: Sun, 21 Jan 2024 20:49:08 -0800 Subject: [PATCH] update firmware to v2.0 --- src/firmware/v2 | Bin 78524 -> 79004 bytes src/scope/data_requests.rs | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/firmware/v2 b/src/firmware/v2 index 96a0fe097fe125f12a2be1203fd1d8cb9bf8473c..6c2d3f2189e0ac0f3b7d3ee9f8c9df7c939da818 100755 GIT binary patch delta 12063 zcmcI~3s_Xu_W0gs&I|*NI07O9;yic^f;NC6ipt32I6M@5RF+l)YE7j%deeM#9Zc^n zON;B)FdtpLT0To~q|!q0k*^B|rCv=d(hQO6cM$NLdH>fQ2J_zkz2EQm{U7sv>+H4n zUVFXv+WV}%&wO#4-PXoh5n@!Og;?I0gXPTtmjSK;dh0RnTed;owt7hC1S0C||f=zpm{-1mQjfBA2fwf?j4hXqUkMV|Wqq|5_3GyjA8 zsOKLL{Rf)=uD>!xhjkm6h<#+3;n+Y*v2!< zCAJ%Za{1wqa!eHR7~2(T0Bc(n`VMQg)I=0TOjeoL?(&ie_qyWh#jX&x8%;SO-ic$o z4O35wH!_g+mWkEYizrR5Jt20DRA^6%cQO=(+EPVfy~w8ZF)9jAh@$kQ_)CWRd6l`i z%Tbn`E8(Yjj%43&w$zRVH58Baz`?mlRkRq?T7y)>+IZ`PL4}c%BTOl#K}A1^=5iUo z$DudJ$AKydKbmFy5+^7&O>aIW{xtQLIqj&#{M78Rxw(0KbL|~|6`K^;Bu@%zQY7_h zQYJ~vin{G{zMJz~tHiv0b~`-3n|%kKgXi3CMRn^oB2@)IuQC}m`l1Q72#JHHe~bG8;tK)Dz+_z6m`c@{gVrTQatb5&CtawIx-qMsYalr1(?B z2c{uSOj2$Wo0I`=%>kEkO{%2)CPUIluwCXraVGOFv!v9ZLE8E@oJ#HfQ&~=#l%HX@ zRAc@{u}_PXzh}SX^Nb0+kq7=Lup=GcY%)vvM*9Q~tGq&vcQnU9ndMEfauOBHg9Dt>ZWJHc^1X=kH$-LmjOe7?3^Amlsylpvq(doTIxusj zuAHml@My{s356z{b_tq`sdPQPW6)S2@bSRX$IB2A=u^Jay#%*i#Ol#9mKX|Ff%bVT8#t5!LzKRy?!lttx|B z#WDO5&+MgfOL3+&DfsFScO<+d`RN5S6ET0oy=y5-GVp&bNBm7M<}W#li(sw57&(8z z&1iR7;w+f|+}Q%psZI$u+hmB*s5zu!_>VjcU+T>Rk$tMb(swYw*VEFPP3FhMO$@6# z)`5Z|>WXF5z#GfueDiupC} zk6Ujo{Wf6qrL6(`$d54tX6A|8TX!x0ak*y2C6Pe^72eEqU#_GMJXG5C|$t$2m z?HvP8O;4|EuWZwLF;2N&j90A}6ZDvGa4l~|8yZFSf!wdeW2FC(0oK0at)(zWe2VL- z){U^+UIGZ)gjDZAnNbr~#PAnAT62A5kPcnVsAc$8H_|zps0Ru>R$ccs#U$!59XKom z9CiR4#X9f6bF0IkN#x8XN-4M*{(whi%BV$klsA>Z*KDfF(4Z)_Y_FW}b|Ecn7na60 zl-AhBq_ITGXNlz45DhEkKNd;L5LK+&DX(7iiKlfy74Lgh4r?nnqSymf4FA1@;d4Eh zFL#qzl__~G-FdQ+_8nu)#^`;GZP8i@-|B_6H5F;sK4?Sn68?slRH?$4W-mFTN}ln) zvyV!`Uvp|WHKzdVT_=4u`|5oGd)rB$=Y92H!2ax{&lA3SKfqQx>GPPRbKc53Z~TsZauij1PB_7IloW z#L?3stx!SOc)cW86F>PQr}Vv{g{MV!hl)Gh#`eE$+G*NZs)bGbRlg+4qfs7$byUtP1rse-(lbE^E*;92E-yGk|U#K3sRw3 z$k6gWlnP`x{a12RlN#|4r;O_v{I2l_amL>O4rAWpCCS=Y>k#KN+6!&SR>B$XwWeKY zW1qbs%1sx<2mpm%%D20EhSE(?xvzv%LJU0aSGfcnQ|&iMQ9+e10mqE+M?_==3!0XI z8DVQ1+rsl2+amI0`~trnNCV+8O+&uY4v1agWc>=3fDaX3HK*4^L;Rh0lp0G5B_;{K z&Ozj{@yr${(Z>#FHamzZHbyh&ch#mV_vtw0MtI-(J*WfKhPug)*l=dQgM1dNVP*V} zBKbZxHRPJ3*Bv@;@FdJH_7F{6s@3jSI}A950jK94;&j6GhR@lj|B6&q+rha8Y&iEW zlyX!uht`v^!9`1LrBO+g`$C9}PjfJSqf9EKhIq#n#+VJ!`&1ji31Y9oZy7Nk<56>O zh8FeM{H^_sLaj-~N%-w{@^f4~bHG7@<730$^s5(Bp-ND3(fgt+W&BM$F~+OH7r++S zGfA`~hS09FcCs=)*~;?MMEszW<-`13rW=u(@ZFT9XvSgTL>EbmemJfVjjLrzT(FjUK zDdK=4pj5h;|bMH;Qkrl{;eLeBvBJF%-I_XKZqICuwlVe2k<=Xwuu=Gv6H)r8m1GXZRiN= zj0aAo6BtIqLECTrs~%}gu_$hcFPOpVJkEP#imWV3HdREXb5r^aZd8(0Z8tO5Tcj7ktnJjGL-MJ2Q7oXJqhMoPmX!w^_O z>zx6-%@dO!V;oX|_%OEyHnZQ_h|+B|~_2Ngu-M*{wV2dRsBuU^LQb|C&`w^#VZj`+#mPDq-m zB6P>48w1@SXkgJzfd&%|FdAHRv!FpmV}=G04JH~`Mi@s8qQ+5UX~03Cl3PiG;T3yC zBy93{K!`}VKc^XRTN(Ek52leo;oKzv*5rRT)KnT2%if3DO%Q;=PdtSH*K7=r32n z4^u_CLJQWfc99qK89I;WAK;XL0z`T{o^mlXH(aIM0S*Vaa~LMzFu9-~I{intB!(t( zyYnSP587OVv}$a#p4*x476!UxTne`XY&`=yUU4&9CEevups@2|6GQ!R$e98oSnx+B z&>V5~g;d2YoOBaoN;dPYldMb8rPn(C2%JtjSLCmPG}A5AI+?BI-~rS}(jgBR)ba#J zJ@lj-ZACf*zo(qmD&6F6O1!etnGcn9jwu`qWwx8BQe)#6JDvc3%i#qN-gHmPmvRQc zVqtY5-F(m+sog@To4k-ZBE;y(2GU8+34YN=C#gyeSN!BcTg{(SIa)XQI#s9C_~Z=q z%V~6xptO}T>LTS1@^)HyI4fu5uyXQHeM1gAkdgZ!o*YYiEm&DaslcHpsZ&Y8i1<1G zu1%n2f}nqB$C9ffqOFy7Wp$X5HtWo2W3RYaC(?B`Z--1~yVw^Q?n+ds zzbV5ld|`JBGeqgGZ`zO+;uGR}pGe1|I{J#(@*e$N%c26dyf^5irA9ePS=4`WqKQ>& zOnP`rEpexrgC|FsQ_Wju>&$XBo5|02CqXsJtTKN)TcMWnp$-*v)ZVceSl$hcRcDYY z8Xy7yE)G?2ELuvBMPX;i$0NsD-*!gk!)8<@H(^bbG16pEGkl9jp;p0p|5>}rJg`7w z4lzg00a<*sTWbz0h=TgJvz4{MMg5FOV^Bw082+qBWv0T9!U!r{3Bq^L^xiL+DnW%S zp;Q1+g=qGuP(vdNV5!MAW>1Ef{{;Hlz&e&2(Ub*AQkIjvnLa!?!ATDtSvuhw=G9Je zCS7lkJ2jKEg*sET=|pRy5ngXo7=F5kfdFi1j-M23WV8mg7E~+o=zOYW+kFn>hr7Rk z^G%zBq>oZD!#!liC|znSRS&=gj;HETwOIfJK>gOMK2@2jt~^5yk4m1g(Gij#S{Ul{ zU8vu8Kf8N;H&0ZV`#t14jZ14*Jn&u51pG7e-+e>UGZtBUs2!5OTI6*=0wC&6hz&_6#M1!hk}_&l=ACBB8brWNA{&l0AOPr^050h+w(f)w z1*IfZIRrP5KaB*{09r;?x5^6CAiDoz224WglWj6&1*`glO(C0F=^feFp#Wn53Xp10 z0n#$vsD$Y@Oo0KjfIKaf4$W?8JC@eab}Fp_ZcWyS^0ayoQV&AvK}fmif)b^}g=hK+ z@oL5iu?gT(#wwAAvI{`W0An-3Sb%fZOv^<7i+^fxIlMs=0$Ypqgv?EN~-YoH516*#C*|z4jeT}x@&2TLg8RTRfsRdZg zw3i2mv^*L8^jD zky8JRW0g2cR9f%|HIEs2hgW|DZj$N`OFF!1OnWH<7gmO^56kONY z9O3;Do+;jETMG>6$NKbL}6hPImfEscT*|eFwG&W{np*yxvW8RXDn})#shCv&+ zHxMj6Om>aUPkmi1*Mw;M8s(c{t_+R@z=}cDzRy`%M z?U>&{qOu0#JTf|~5j#kLAq}^XOv5mIo;+_D7q#CLs$oC{xpufwu@S+6LJs_bw3y#c zP8cQ(dDTPPXbVi+%S>F5c7RbqD2+T1^Ye*%!Z7?8DV~rvq{$KLH#r=l1E{CMB+tfs z@dhQBo~7^1|EFzRs!rSJ&#PSP|Xwtw0&a3$P6P&Xo#l>dQ9vy-fq5Mb1)7}E5= z0N&)s-vXS@Gj0D9;B>AjZUwx`k1qq9#s%f}0pRi)76NshxAu7JvP_iM$oN1VlAIAJ4WOGc_V#R!&fa30LIH`5!tZD+~&yznutBC5pNa!m^NVTTdO zz4i|~#<1XMp#M zep>EOaKSPk?FF)R;-JWF;O}29z|pJ$%D*GkL4bJx$$uvoCyuw)*|mjzs@=j?`_5&M zfbex*>V)>@7$eJ{60>waUmIMobD2R)g|G1b(25c$)j=QC)n>N+_3(i9iAdHxX9?S0 zj>7Z?m>rh)fMMsG#^y@6(xs^|`7HkwY-RNiOuZg(3`~VfU-Fi*ua&CUe=wHs_NxjR zt%Zi10pf}&+`J5Bz&QoNn$lTn`b~cGFy`RBhgklMSiKDN1&yA86T6PH)Uy7bQqcYW zwQA5@);%3gW-K4!rTvu0ur@I#x>ym*I?>BvBR1#`OCfw%KHV(*cm&RCq`7DaeCsWL z!6kUy#8otzF?&eSqzGoF$M)=`l@hGC-7e|J3_0OUGqYTzxhWv@(iU@b01MBdhHQB0 zZ!vj=!?w_AaX9G9$yireLeqon)SX@8`x_{qNq;Nc{yECmlBlgb9-Kr**12e;bxmCeVD-btd%^vpmfnOqi* z`;gK(necYmKIgyiVzPd2THs8_Do)zs5gxalpF1Dp9c0vVDFa`(2XJtXYSEe3JRioZ zSZmjuLmuH(VtsBLeu~sS_Xn&cDdyV1)3E61;Ch>2?vL>(Ti^@NV0_E={EOWfE66kR zN8&i!ruhjN9A5j<{J;<0GN5-0e8EA;W{e#O8HAfc$PTVRHE`RlNl3CkT{)Z%!TbK)6lFUy?uUvKu&yb@Fwf!c! zN{eM2)r4~ANc+MeY3Y7hsjl)UM)&pA%i?DJ=79T`Mz*GzbAVGCaEf&WaB1eN(yZ>A zAG?LYWZa^}K)HV$OBO78H1HbSc~ehZwlyxY;=Ti%J?2s|{m2t9uf}hY?_Mq(um?VK zQ#YiUX?}PhdtZ}V*iObRJ~UVk?~2~IN9iwN6x)S*V_i=Imm~$M;i8+00P#yE^}TPW zoO)V#Tji3+rFf|Azg8T;%x@y$SH#-t|2R*<6pLi|o9~88#N|<%+z@Bby%e*&JrHd; zEC_Zl`Swi>D+oV(H@r0u%8$Lo^411GW_yWj-TTpk5aPvK^yWV84Bp!=WqKIUp)xP2 zUssXxGAzmY1z2u@aw&kMP+1+Z6!9M%r_UqDEigX}9E-jFz0E>ati( zMhJcnD@N<|w~({R{*sQzoPr^h0C*FYj|6rUuKU}1>;JCozlki_@HQStq+|k)B@@Zz z0ll{O2rl9=5utpZxajcqwfLCY8_m zvF(*n%+dyOta3PGX(V?mw-ssZl7ez|Ln}J2;>21@BV08CNDAR#*hYcTM3!16(sqa+ zz#w6x{Ty5Hgc+GbImszFCc@`GN<+ThJPQstME~A4#wwDF?}Z0Z;@jJ>d`+Y6xA#&p z)6!_uY<-`RwLtrgM%$U~7ntzx0e`2?>+NZS*@NKS9dG+^hei^71Nvy4_Cec~T^bxj zahgk>ZnQBUe2ekR_e+T!;Nr9D&juEBQOmA$WEEZQdTKhEgBanRed zvNgL3jgV&1)b74;z}Gfo&3A2Kn5M$_1^9|I;-hVBxA14L?b1h=aLi|*#1{bP0Ok%i zbpBlaJ8_=fcIHqJ!@%dyud5wFB9JH&7`Y4dJ?vn@T>d&8z;J!IZo%xa{ZzAw0nL_w z7Kwu>&l^4>^8V5B%svdca>1$(Fi| zkZ0lVBab$J*QUg8z@Tm+-ERA-?lcZ*cmFf@LioUYVtg=F79qU>p_Z(3@kDkq9bPNr zP9BP^hmO+#Okrp>19#}s&mdypS9{4OJGBlo-+Rc$({rAdda)Ld-`OE9>_?`8z)s<~ z+vvM*>k>w~dazF66L&f2xR&b_+@3stZ@h~tWZ?3l^+V`i3pO;s@ntoKw6wKLc-=!D z`!a@k1wLzhc_qZ|(^Sk-=^#&lIf+gnPoMcS^NNf7d?uFd5=J{o@Y(3p=`PADcxz5I z0d;y9ZGh`t1F!#635fc|oy`>j^Kj=npSqh}WY*dAF)A0hOxr0ealr)Oe9)^)*yav^ z0iXLE*Q4iiF8wGOw4de+bO*M z5R){QegrTmoXX7v3Tk$QPruGJRI@4hNYyE*U9`7L=tCx*OPe~yuk#8=mQQE5b7x1% zAE=`J$+$wQ8g)GH1l86Sa@i0d{a|dDYZauk27W&*1|@_m?m#&`L3G|lzCM?s1fRjj z%Rbz9Z9%w8IOHOc=QY+Yp}^TCT!gWK72qwu9^nqj`!v)hz;$+~K%9XcdI{K&Dc_2d z5I<|RY$Hx!H$`(pTj=zNFg*zISqMe@0t^0G2W6On+SD^65g=omOG@4AmvGyTM}dSS zFvbAQWpEtQOZH?_A&5_0eGm-q627t1rP1TGkudS+7X{6A^~|T>w3S_mXBaWw_GUwn zMAhv{?@tL4zi^eY82;eEGeP$PWS9Q|SHYda&mMB*t5>6jiN8-mirsYdcLf zfh1Ai$hbFP|C_)CLG*SAY7hDC{tH35Fo15qut}a8Rt#^sn$uVw$3Qkn0qR}w=mlEW!50DsN;8xaDEC4M7fI+2 zlr%#xfmt*F7y+ac;h*FjmOl#RLMS)o_xz)r@=*e)-@)=K$nKO#5eZdaFvBR*9p;wVF-nXFx(;;yarYxg>`<|2qlGW6e{ylaC>@xCzk)QwMXn6 R2rdHv`fs7~*;M@4{{rWQZ2SNK delta 11464 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 UwEhlwQ4N6c{|Oto9DL9J0W;t1CIA2c diff --git a/src/scope/data_requests.rs b/src/scope/data_requests.rs index 1082324..fa8f4ae 100644 --- a/src/scope/data_requests.rs +++ b/src/scope/data_requests.rs @@ -160,7 +160,7 @@ impl ScopeCommand for DataRequest { } fn fill_tx_buffer(&self, usb_buf: &mut [u8; 64]) -> Result<(), Box> { - let samples_between_records: u32 = (400_000.0 / self.sample_rate_hz) as u32; + let samples_between_records: u32 = (2_000_000.0 / self.sample_rate_hz) as u32; let total_samples = *self.remaining_samples.read().unwrap(); trace!("Requesting {} samples with {} samples between records", total_samples, samples_between_records); @@ -273,7 +273,6 @@ impl DataRequest { if channel.is_on { let data = input_buffer.pop_front().unwrap(); sample.data[ch] = Some(channel.voltage_from_measurement(data)); - trace!("Ch{}: ADCData: {} Vi: {}", ch+1, data, channel.voltage_from_measurement(data)); } } self.sender.send(sample).unwrap();