From 486cb5d5421bde4c3a5c24bdddfbba0f8983ae0e Mon Sep 17 00:00:00 2001 From: Gavin Date: Fri, 15 Dec 2017 13:07:00 +0800 Subject: [PATCH] fix panasonic driver --- .../PanasonicDriver/PanasonicSerialReader.cs | 3 +-- SCADA/dll/PanasonicDriver.dll | Bin 15872 -> 15872 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/SCADA/Program/PanasonicDriver/PanasonicSerialReader.cs b/SCADA/Program/PanasonicDriver/PanasonicSerialReader.cs index 8ec1488..082eb3f 100644 --- a/SCADA/Program/PanasonicDriver/PanasonicSerialReader.cs +++ b/SCADA/Program/PanasonicDriver/PanasonicSerialReader.cs @@ -94,7 +94,7 @@ namespace PanasonicPLCriver public IGroup AddGroup(string name, short id, int updateRate, float deadBand = 0, bool active = false) { - NetShortGroup grp = new NetShortGroup(id, name, updateRate, active, this); + ShortGroup grp = new ShortGroup(id, name, updateRate, active, this); _grps.Add(grp); return grp; } @@ -211,7 +211,6 @@ namespace PanasonicPLCriver break; } } - dv.ByteOrder = ByteOrder.Network; return dv; } #region 实现了四个命令 其余没有做 diff --git a/SCADA/dll/PanasonicDriver.dll b/SCADA/dll/PanasonicDriver.dll index 2510552d539e2fc19da19bf8edeefcde1a45090c..9b7797cca2543d010de94d0c1a23c2a05b1a67b8 100644 GIT binary patch delta 2906 zcmZXW3rv;g8OQ(6``yn0JaD)lPZ3c$+!O>63sz7NwAwfkFZD8=^Fp)(6*HZb19fR> zWLEmt&Dt_$jas8+tVbJ7o$1-y#57&B$<}nyt~IgFr7@eDF1oaF&-WfYlkA-2_dWmr z^Sqbu_MFq*+1+`dS9__kynkPi#`m9GMpq;`ZO^G z3?xhi`o;ky*G-!qStL5N;3on|0Fu#F1b94JsF)84cClq9R=pd!Zv0Nj!*)AWO0U!4 zpUye2WreEvxZMl1hi1t2PJ8x~?ikaulk^g6dn@}z#`fpjbfvuQjHMaU;|Zi!a*Mi6EMc&wc5^Q_ah`ruZ4KsO! z-u4vJ)0M*Xb~%9VH`4uPvXNqjX0gXtWDl`xrknd)+iD+k+Ui)e&6Yb7s%VZpov@^! zo{h{EZ6$n2u&lP2%v3rtwz_*_PN+c^B(`|wa+%+o>+~sc_tDl$lf7 z)+8tUbBbM+?J7QcieMH3{!$HTe4}*tZj7POJWge)0R#Sk<0>^kK2iadi~7sc=5x+m zH%=1hS&x;m+-r%pdg-K2nYoK^QeGEugO7cD4f2{hwzvLd(+*w+?Yvm2$zDq{js^f9 zdwGp5^Z4vA%=((#nVQd=A4tuh`SNUPL-H!iL|AuOq!n6Y&?&uXW#O5ugPP0p+GmD| zquRf955CuSa=gtxZX{vQyhcel%`}lITxXAR?h4ocA;%tEwHs^`*%-&p7?u4{)eFsC z@2V(d&f--~ep=m{hn73G$h_v^NpBeku?e^2M`?LZhtpttFx_sDchUkmm$=NtbR6f+ z?6ac0^j61pZtGJWK6hD`9!Q>TzG60jFCHB7A)Q{4tJ5>eZ`v~j;ks4FykgE{K2Hmo zckN29^f_aQP)!qFA!&YO7Jdu8+`tQ~L-Kq^e&c<6h%e4-xjY%qraQzB?$HtThUgStd_JO1 zuu6b$ysD&h^97NJnh~{2=4S@OeIf;Yd2YT3M~r^q#|KK?r0=X>ic}n$6wCF{fJnpU z{FwR!9T!=s55?3$8WvCBl2R{Xkj{x*^cJ|en{>#EiV4W%N7-HBAwCw9@HTf9SAA|S z4pRtKvCUGi{i!I3s{#EBQ5aXN?0<-&xT?puqByQXAgv^>CWu6Ba$Nb0pf)A0j_ZY5 zSzP6qm0EZz`nZ9(J3V06Xyx%_iCwQvi>u#Q3$*ERwb5?TX5f>NaVxP}tB&WUVuLm_ zuFAx7+N`(=7(dnO;%ZnAYjeV|%iQJr@s#tD)_~Fx)x>HpmMhhR*`!e;I!Dw3R!ulM zqL#9nhiGhE<^!`&n~y6>Nz644u;SK^iMGp6`RNwuB0$4N?(sTgZMI3tvN5|k94q+? z7YbbFexspR2rkL8+@Uf5bC z0&13D1~S6;OyXXA&oq(6^q_$0Lz&_X#X7}#ia$_Xp}3BjhE^4CQ{1iCqj;TZ;tn$# zb+p&1K2=@jY#a^_>#Vf8`eGZ7d&_^{fa9u zaFdIoL-?3k+$wVETRMi_T;s!eB#V<=`L+3bq~eeEWenmyVRBsHEM>oj=Z|8TojO|V z{1wF83f^O}$GOieHNIEWsD~~Jn}{yU>oVDVbIQ531yRM!WhNnnFZkD?7&n-u_=Z`5yUZ#)VAk-RPeLs$ zZkYU%a$JuDegPWz8X0I(TmV1Ei;%`#f(+(zWHDDEz+8(U^T!D1@L@A@nOl*^Y{x`q z2lAP_P{8a&5wja5%%5WlvlnGzGQ5az^YY^YGk~kiJltRw;Q_N;u^JCKo}>Jyk)%&X zv+`FeuE&&8wzgmea|br+bFc>&^}X1OVV&=v;y#?!KTz>kF6H$na$EALiI&kS+D4sp zjxN&2B>05@|B$WbSHg|Hu?}j$1^d^`SMe6JgHA99?NiKk;;lI0QDuBh!_03Dxj6d1+^^t``O>3Ti z`$w(yk$+X#lybk>t&e?D+&{wO`g7AskK|U~CfPnM6iKT3k0vHmM3QU%N&ThPe*xb8 B3labT delta 3025 zcmZXWd2CeI6~@1F-##A0cwfc_8-qPy<9)+6HO343W@9$f7LrhKOtCShDqT{uwjb8~n9_hO)*>#_` zd(0{hmSwnGJQLhpXHr5n%NWZF%-~~h4A2v(aXXwIs&#+wq%M)gvEz*1Hcp707N7@; z0JC?iDwI8aE471DPCzzH(Bt?!rspzG1=YBno(46p$27-e&wKKHb*iDs?TUGzz)bg! zXPQ|fM+(omB_=#)uWgTMyEEpr^&KwLyX)QQ-n1#RIOcPnws2~yvwIHvyr;GdpaMymen1WsY=I&N0NWX3ADJ`vF)BYT$T_M7ZaEp>W|%I zP^Eh-zTBymeM~Iwp6BK!OjIgesl^HD&V0_LDYZ4huT(g9Px)2uY(iPm0synS1&A@H<>LW|xu&Mh0a$t5zF1QeU>wYT9-Kj338XHNUP zCO%$d{WtfAiFs+f3ZV0E68|dr$Ft&91uSr1O>B`#^) zv?9=bzyzQd9JZN1(x5o?X=Cf0Ec|5N-x0(^4$>qE2og4wKMhkQt;7u+Su zDP^DAvjyQ3tA%;ZT+G}}t<1Z2CD&#;Q{76JSF9t*mK8UE3ti15aD~%hJZ2nZlqAsF-;-;l$28TpEp2(5; z0US1-6$!YY)D3d%=S3op*q;S}jiO1JF6C~Q)&RSNuxQ~8&L~c&BeI3x=KR>m(QO2vzOV?#yEep{_jkQ z_DrgVMxpYSnrIh9Rc(sAtI8XwLgPMqS(&&=~k#C!H-9K{>L zMR1nDHkQv+Sql0%ypQ=dB9Gz+t8&q zVkh3wAHgGdT_+0jah%gHsQ4pAd1J`iK8u%nA>7dk@$Ch)h}P12`VpVj^Yji~CZUSX zi0|_KBg^kt&uPFV`$gu{c$wKpuQ1Qp!_4*KHRg+uafgbNoME?d;)W?BeDBG3k$ayH zDOPqj)(ib%;$l-mC(|Xh5Qr%_Wbinn{I)$>4z#v4wbf;8t$XM~ zt<8