From 1b37ec3bdc3dc62cae3b359c981de2ef702757f7 Mon Sep 17 00:00:00 2001 From: germano2239 Date: Tue, 14 Feb 2023 16:19:24 +0100 Subject: [PATCH 1/2] extra label fields wip --- .../TUBI RISCALDATI/ETA013_DEUTZ.btw | Bin 18807 -> 18870 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/label_designs/TUBI RISCALDATI/ETA013_DEUTZ.btw b/config/label_designs/TUBI RISCALDATI/ETA013_DEUTZ.btw index ef3ec3acb60c34936b1d2df10d74b62ba2675324..adcac4dc29af43e4f30f409f789ddbdd72aecc04 100644 GIT binary patch delta 13025 zcmZvCbyV9;w{;CE?zFf&v=l8`+}(pa1TU^BPVnOH?iM^ythhsPFU8&c=6T+GzxSVS ztz`XHW@RR4X3p%r&z{`Gy>5(uT{H3K^-28X8wn&#ETjNObHsYmw-{I;;DdEV3gI7D zlfJ6-wo^H#i+VO)x5K)H4 zjY3=Rmm@{u!405V5kM0pmAJ;;RE@Qdb!K0NMf!kSV!=xGyHabMq~Wv?3+SkL^`$i2 z=qR|6W|vH3IIr$IqT!egMk~Q6KZ{304`JnxNKxihc(fS+bJbKc!rE6CQDdHy&g00q z?#GOZdN7s@j9|@nk&-T**`b2)#Iu0WaP86(ZgwX6oP}3{amC8+RFfT|C4$U{wbp6u z_2NfeDh8i*#B%YqluMi#=KyrB)`8`^UiEJYl<8bQrj&MhLM>9&vlsPkGTrlYC&I-T z;sZFm`@WP4J(;UNQ5!kN^Waf~Drao*e3It6n7DESC`xQ8Q;ImqDbNT-?RFKLMGl%Z z&i4-%`;>AwvfcO(u>&BaM1HLqNwZnC4nel;gpC4`CLd4|HBuMsTCEQUvZOdP*HazR zi$1lepz{VQ6L)MS4dj~?!L(^la%`=W76o<-hc~ZexyzMPg#_fwOEu>~Y9R=*A|>c6 z)^dNaxwHmtN-J#$apB9MtI`Z*Ssjei7r$#|y*p}*Bl~E(5@=SBB0~n=)Tf=TdvHLo zmQd_hMV!(WL7@MP4C&&x1`7bI;^s7U=M?K3b>;A+&OcI9f2P$$`X;XaHF%kg!cD^pFja9b?Y0o8$5cyz}8pIe8^m68I9s(vzmhk&oZ2b zbBf-M14;YkbI`}MG~PICrGh&7VTZFhI>etliPIBLwIL{q13C9ZhpJW0*Y(bc?OOOL z0gBHbQQ5{jdbB8Vt}o(m@Y#_xxcM>2${piB5fHwCKcoqmL7%jBUghAzH|QGXhlBl7 zpp@ksp}=BY_U~zibaLwmPPaM<4(1r#o7JQz&M3>?MT_>F`Fhnc3IIo-Z7EEv?P7gg zD;9z0eJ;1h15g+o_6Mw4oqX;hQrAPp6ClN}Ugyde(JwJ+)v<9goBVo~U}>HQxRYHO z*w2)4s)`H&Z7iuh$Rub4YB4X>=gD%PnM7EyrN=~Ijqvz%?0?DeXH0o5vvrS?J^H^r zxX4`o3G`!wCW7D)z{Cnuu^>6QKW>!CEEA;8QzAfTvnSq4A?<9!coSd)OeCOO>;=2X z04vuGNPIB3GES*VgxV6Cs-KqIa<*+?exR(@vcIKUNNA93!hqC8bT5c_K5p{sKBf#u zLJ&K}4w@OY>O0gtFu&prQYPke z+esCUYW32iKVJ6UpJ!N*_|*OueH}nKbDOiGkZ6@m!^XTZl5ViPMCsYOj|iCqZ-R=I z$-q}cdBQ`<)Gxu48(JBvLsU($4R`r4CZFM9^K^9>zL-TcZZ@t+lvt1oQ)~clEV%u&ez-w&{D=(6y>Jo1de``+ zm^UtQqQg+?&P@r?t9k*`ZVZAqD&J3)jzguA~i^YkwkFi^9qY(eE6k?_wvbrqq`;R z*4Xjs*$7#8iDE&fJZ8O0##eo?zuFMoRWi{i4jpU;Y=i?VzTxcl*zPIz1&I*`^hSZ3*+gT<^HYvs-Gx+cCuS9=X34B} zovCxh;(G_QSeCP?<2W~`@Ozw_+789xI=3t*tzR9RYbhz9=#Q_i*XyrPcA#Z(QD zUJv1)MU8L3U?CqW2$8~icl`r@q`r8zzpt%N_lUhOBC`$WU2ZM@FXec9qR;W`$mH>d z$hiNXH|mE(_j|-&vog~zYtz0CuF=+L_MNk2uN1bJw^nx4;}=gm{O9^{bF_2Hs^0b!(CmCt z>YyxEb8RO4Al;*+cD-E(OI$!!L-8y?T#KZ;cY6$SCbj)(h6TIbH_p#_=u(EaVH8!5lBrZ~>^bJ)bKRl| z@q^^{W4-AI{wIO^!}u_1xK8MBuQ#=ONo07quvlYoQqY)%{%t!2X<`AJzL5;}>+7Dw zL_UfkN%tSuL=OBpwXZba+Rw2XMFT2)ET6yfvaUEJJ(KUsR~Vb(yQF7$QU0^KH0iQO zj3n7pE?VNWc^Z?r7>K(kl@a(a2Y<2f#ZAv54X4%_tSSY=rob*Dv48)tusWS^L9S_( zbZ;e75cJ*dbwGl%G<3gVXU zzf$vVv22i7+DXyRgsE0eDn(sC>RdPKmtPYPrn23aqLYf+)kNO`UwDDCI z0;Ghw_HXMCZQ7DfWE&c-iTF_-dV_=gfMTJ_Tgv%8gy|6}_Hh%d#pad`=PPxrfQgka zhn}Rcu?2&p0Y9J=hRxEFD*Dq5sOkfJ@ar2j8<$(Sf}LAG*&45_K3eSJxRDJlI!*%a7P~>={N|dI4S@C}d+=~k=?=YM z&t-G#R&pV_AAepuaptQawW@aWl7napL#RVZ?In_L)R;R#Qd?gy)j(|q$Xw4fqZo#H zkolt8_)zI1>+)HEspAd?Kgp8u(Km01nr<2Cg3{4|F}{v4WQ%A#H+ykbq{Jz2N=e~x z_Y^-RPQm;HJTx6WX4TiGquYQ^I{D>r0K>*52f7GmosB*$hOt+a^Xuxb>7hQ&RDIy% z(;woxg3nj*z&1dWzx}qG!1~j|Vq1WSC1{a?HeJI?o>Q~DMS&1dzJgT?&ftrwv$VCqP5}jcJUn2$ z%wzlJuszc#+QpYPRwP@9j#ST0o1W3!kq@m5MP3Q5f>%DVi?i#aZeqvF@lTxkiu{eM zb80112)hay^Il=suH_t_?gGx=Fx2XY%~}G*IV6+EIwOjRjn6FIUfdSewMMmc}UA zZo*d7b}Oq(GvTvqZNsd+fIX(qG|Iwdi{;T`uT|C$oS)b041H#m4pqU&Vsj{?N^IL{ z08I2g=BvlA-8LlPA26|G|5PHq7#k}=arnl$SP8z<`hx<%#BRkzC$#{+`h_0^=d}1e zWGv7kg$Ce)q{O>|4UzAaf9YS>t;A|gYq8!Ax$8nA{Scs1{PU{FuTSue)LG(;A`QOU zSpY?pSlO*Lh(6I&oJ^QZp3O$<+(Tu>PjYlal(!ThCkp1O)W~Hz4w2KqV%(H~vNX|2 z=d;T4qOkx-kV||n2$L5s5#=BqJYD&$pa*M#s3G7P^vLCpOd4d`^GH!V3h+RrIpzuM zmTU{+%5o;FNM@-;dmE^{rBX@2zbf%(FTgAm@*8jE$b}AIX_!A;enSd0D$b^-wT1DA z9T!QO$raO6!3*Xn?otPAKRAa#EC_o;5%kM0#5CreUw=I;yo8a&%Hm_ir)k zl|{O!N}a^H=GF711I6 zxT@dnRJQBiG&DXv%`|{<_u|wu2hEGKLqT^E!Vu!%XvO4nH#qV&1)& zx#mcIsTO$gO_-~h0N!fppBn!Q4rkob^bj(l$ee2kU#h*cyg_s}w4ycB`|Efm)o0{? zmNWNi!ttFAKj$N-xgqNbn>whqnYyf_ufun9Oz`_A=T+21)^uG9(i-wjg3;?xEa38c zc@Yf-$^*uP=CYi!G9yG!4vATpcv%fR@7M-nT&U;9jCJ=copeE87n8dQ$owedHd*1wH%5GvhHf>v2G;`%ACgBS+ zoXSFn*h;xLiV{*gzrtG4NjAznv-;{^Gy!X%ayTSo6SW-L< zvQh*mY00pVH6M6V2VOd)^9-K@>ton?AGjvylU1_{0iP-pVqhk}1JJr6Q3+@tsh(c=Fi z{Gi!hR^j$(!`533-iS z`07HfF>WOpd#jH|M}tD;f7LU16}IlnjzFZL>Sf%7IF*&3@{#v7DQ6JjE|sWh9=O;3 z7+^KCPuffOeP3WGs}?L{gkk{~W^U41RjndY{ghNxs@h((Z3Car115|}6)e?)A#D^U z?!#V_@ z4a9Lj9`s9ND<;*AfK90koHixFCY{2&=K{y; zVU)8`$3$c8p@@f(`tf7U<#Hkixu{+8=vATI>{L%^QH;1+v-$N;ey`sK z!o(aU8v3qD;+KXmKL_~#l8@iOAO(e#&N>}lacL?09jA0>SpX|QfH5?tHR$tpy`)VA zrkW`;At}rr2`+$J`J$n8lZ*D_3*W5_Ik+Yli>wbB%x;Ou(=kmb8L>z_>$@35B?EamEK2|$`_H7h9yg;?6PgBiPJ|)jW2Q_ZH!#O=fgjm4#NwN&- zYNcK{;xa2V5i7O*9|rnn5*(!2t)xVY0T1koG!rxZV2WH2IG;`B#=}-y2>2?TUXy0B zZC5^&(!Q@nwd@Q0eNcUJDrMOEcCqjV^yT%_4BJ}{E(83t$$_6uvYh)w54+A>Y6n3W zHazd1X4U~2rKtdV7wtC6|C8>TC)H}@z9=J)tg~o!ni8J1-uec0q$$7_F!ALo;HPgu z8FzFSi`*}Mp`yA%<(cU6#3ttPy1+4>10fGhkJV{SWc&A`cBkju0<%m7zh(qYp1cz# zrXxUSc@TwZP6gk<63te;l(^%`gd@f*$woHPXmD?)ckV{<-gntVQ_v~;`8kdU-_g96 zD|tIaT5Sz^yk1h^^i}Tfd^1Aq;BtjH1d%nnOECY9G$TqL{H!tbn&h$TGQoYq11`9C z^kuSZC{HcsNSnbj08KQ?FqhSQbkd6^T|;{4vZ{TW z2%mqMB4}|Pzi(w5+5fP=4HKkJhy%k6t1{=wl=&+tG zAD^t$+!-BKXwJKFv=VI>I-_wre&JmXfX7=+*0$eU;duUYLsbtCQCZ+=Vo{-*8tydS z;F&h=yrEbo;RFX+P7y4@`F8ibLBb1!9{PF?p0NLz$>^_|1C-kmlzcXE$w7}!YYeY= zIf51o+aHeGRPe5%-u&PYE72c{dESljyWI%&&0m+i>v$RCzfC=+!U86rFO2(L6R+J$ zt}!&LfSz|i&#B`+MGklZNTNroG&1+c?wt|Cz==KhSAG+AoCbHOoRYw=Jml_1EQKzf zA5LBttDgXC-Z_CE;A?@VB*K~u<=W-JLoe%KWq!js;-D|zO>!!}9t7_0wzu#g1^KHz_ZIj;~T$Y1*E9fy}|hnMG* zm*=e*;perNr?rmSUzj3TtG+iY4Aeb+C~&W9so6_Ma$I{udzzj}^` z53?D@saBt!E$^^-{=D{Y#oz1%-9rt?jUOJ2ldzMYsr}!d);la; zrg*h`{dB^89@XaRRUIkvjc^>5MkA>eK$m}>8lwB0p{lOYwIZTP$x5-qeytd8)k&RN z3o3H%JLp+A@`{APBiU{47yaPy>nFRkx2?R1El3~;z5g?@DK4e{%d4BG39a80&)E8L zv9WOD&@Lb<8}k}>i9^TaREvPPOWc{C#1G59KbUU;Pc4cfo4tf47|DqvOraU&e}>!i>}RNYTbQ(+Gq z#?93~%AXafav_n$I{NdOld1&6wsQN=VE@;QDAz*(H)hHF0N`gV+uzsq1h=zj4KDr> zo{lh-+aujkAEV<}grn;{s6xEDq&abj&GsVop6imCY3uKHF+mh3elMz(N@V4zYM{Qa zLWHL4bM|4C*cTgWQ^d+e09;juMv|l`a+w8de*xZk^#M{N@iUy*g z5WikgSg)N)A2WNEvFQ5mfR!0hx3B4g;+0%IH}dk99JlMWT-^?Yy_)@1UC%?JGd9%e znD!oe%TUa*9+hze-kl#Zq|K*!bfCXo)d=hL1h#}V3%lXP!Rco<$DJQg9EAvAKiBh+ z{j>rHl_-%Eu#&Z8%YR4_Fqf3JxfwW{mN)qUWOP(i6yy{fTjCn5=k^0_#XOc`SHi4v4I*cB&a^(Y6?1>Sat|_@2J&msdJX5oVMR0)kmV-_UR3`9RG<9|s*=EfFUm`c zUk=p8UNzi?l_c66vMIB_djgGK${Exn$}zR!wMYLNcia;Qi0U`xUhV91{7ZhU*iOWj zX<5&rpZEE2W}<9^$Eq=fsaZbNfAahAMh=+h*50&!9;?M1zrocfBLLlklpC*| z=>8iL*L={qWDR~<-luhg=_=#J;BN{)BPuEQ|42QcK0T0^D!Hv5kSf2Vla52jd}(Uq ze*X>TVr}R4W6fn{7io8rO>Np?XbK1A<<1l%NYD)+;-XGL5W`Uoq|JK10nj7AxrBsN zjqq;Ok~PuSsTXC?PBwu2Z^dlKb5In1VOEQ7&cf&KUy7nsM~sp@pT}clS>Vqal2@Et zWQYSJ-FQ84BY3OKLvZezt$pSpob(Z&-4%OE0%3vaM{E6uFY51gP-ke~h6PCBt5cSXw;=cxW{CC2EFEhGf4~JvH!Spmt#$eNd83Tn z{Z$BuUk7KqtF_N-Y@WIp(T6l~DR_8C?IzPBk?S3b@1^|0EM(Mji6Jz3xj?LVQZD9gOxu&Ji_#yMVyi1$^yI` z^|DWg&gY!B1E-FqakR2VQhl7;=|c{sY5>bJaN??h8|Z7>bUlR zxGPsQuggb=qpv#0=VIqY1UW4V$!E(lp;z7*t9MUeB<})4`@dDF!9JX{n zvg$NDA@0@1J2>TjVq)>~QL%fASIl?oQF8?vHcs}B4zA~?q+=$qNICTHjhv)r_mQ^` z8W=Wl?Vuk06T6_w?uo~qnnH3V-|_dlTi5c%_@Mw@>gCbc`fNxkY>)wF{5{D-t3N=p zFH}Emomyz)z$j1zl!z5z1fx9Dsr}rugS&pZAbsu`Xw)1xc&PV%0AGqJI+`vTM=BrW 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 delta 12986 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 R0j@N&GFgu=Q7b`2{|`|XljZ;b From 0e895efde32370faececf71fa7b30d9b3491f83b Mon Sep 17 00:00:00 2001 From: germano2239 Date: Fri, 24 Feb 2023 19:05:52 +0100 Subject: [PATCH 2/2] fix io test --- config/machine_settings/defaults.ini | 3 +++ src/{test => }/test_usb586x.py | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) rename src/{test => }/test_usb586x.py (65%) diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 05d7447..5cb931d 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -82,6 +82,9 @@ cable_resistance: 0.75 ; port: ? baudrate: 9600 +[digital_io] +id: USB-5862,BID#0 + [vision] neural_network: hs5-20000 diff --git a/src/test/test_usb586x.py b/src/test_usb586x.py similarity index 65% rename from src/test/test_usb586x.py rename to src/test_usb586x.py index 8a0001b..a6ff41c 100644 --- a/src/test/test_usb586x.py +++ b/src/test_usb586x.py @@ -1,21 +1,24 @@ +import os +import platform import sys import time +if platform.system() == "Windows": + sys.path.append(f"{os.getcwd()}\src\components") from src.components.usb_586x import USB_586x +from lib.helpers import ConfigReader -class config: - id = None - updated= None -if "--5862" in sys.argv: - config.id = "USB-5862,BID#0" +test_config = ConfigReader() + +if "USB-5862" in test_config["digital_io"]["id"]: out_size = in_size = 16 -else: - config.id = "USB-5860,BID#0" +if "USB-5860" in test_config["digital_io"]["id"]: out_size = in_size = 8 -digital_io = USB_586x(config) +digital_io = USB_586x(test_config) digital_io.start() +# READ CONFIG out_num = 0 n_in_bytes = int(in_size/8)