From 796e3f224d1158f5787f2dc3535acbeffb26c311 Mon Sep 17 00:00:00 2001
From: TAO Cheng <cheng.tao@hexagon.com>
Date: Mon, 8 Dec 2014 17:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=8B=9FPLC=E6=93=8D=E4=BD=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Msi/Hsi/SevenOcean/So7_TCPIP_Server.h     |   2 +-
 .../UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp     |  73 +++++++++++++-----
 .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo   | Bin 156160 -> 156160 bytes
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.h
index 1e6b02b..bc8a84f 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.h
+++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.h
@@ -16,7 +16,7 @@
 #define PLC_MAX_SENSOR_STATE 20
 #define MAX_CCD_ADDR 120
 
-#define MAX_DM_PAGE_NUMBER 1024
+#define MAX_DM_PAGE_NUMBER 10000
 
 enum OMRON_PLC_SENSOR
 {
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
index 95a2b4f..5d599e1 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
@@ -101,32 +101,65 @@ BOOL CSo7_Util_PLC_TCPIP_SERVER::OnInitDialog()
 
     GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_PORTNUMBER)->SetWindowTextW(_T("9600"));
     int i(0);
-    m_CCDData_D10000[i++]=25000;
+    m_CCDData_D10000[i++]=65000;
     m_CCDData_D10000[i++]=1000;
     m_CCDData_D10000[i++]=1000;
-    m_CCDData_D10000[i++]=1000;
-    m_CCDData_D10000[i++]=10000;
-    m_CCDData_D10000[i++]=1000;
-    m_CCDData_D10000[i++]=20000;
-    m_CCDData_D10000[i++]=102000;
-    m_CCDData_D10000[i++]=3000;
-    m_CCDData_D10000[i++]=4000;
-    m_CCDData_D10000[i++]=204000;
-    m_CCDData_D10000[i++]=5000;
-    m_CCDData_D10000[i++]=6000;
-    m_CCDData_D10000[i++]=7000;
-    m_CCDData_D10000[i++]=8000;
+    m_CCDData_D10000[i++]=2000;
+    m_CCDData_D10000[i++]=i*1000;
+    m_CCDData_D10000[i++]=i*1000;
     m_CCDData_D10000[i++]=303000;
-    m_CCDData_D10000[i++]=9000;
-    m_CCDData_D10000[i++]=9000;
-    m_CCDData_D10000[i++]=5000;
-    m_CCDData_D10000[i++]=406000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=303000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=303000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
     m_CCDData_D10000[i++]=10000;
     m_CCDData_D10000[i++]=10000;
-    m_CCDData_D10000[i++]=30000;
-    m_CCDData_D10000[i++]=30000;
-    m_CCDData_D10000[i++]=50000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
     m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=204000;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=0;
+    m_CCDData_D10000[i++]=10000;
+    m_CCDData_D10000[i++]=10000;
+
     if (g_pSo7_TCPIP_Server)
     {
       int iData(0);        
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
index 9059132d8bdc88504f5fdd851f812d54f907152d..9f19966904e5d2aaee3925eab943810681abd697 100644
GIT binary patch
delta 1799
zcmZ8heN2;Q5br&GOIvJ9i&z0s5Fx^_wN}u{5TPwj5#&Rho1(Qqg({TVR>jSaqUg+I
zh}_1b#xIc7?T=~Yb-X$kL2=Gaov1UBeF@v5aa)$n)oe49>@BWl?ny4WyXSY8d+xd4
zc`isj7o@%#MpO{FX;(PwWQsw;2m}HpFSIWnl32e;MwE-jb<c9=pUORQ;_F3DvU7m0
zeg|}HmV_Y^6_1R6igt&VNSR$vP5;OO278$)=#DIqf{gdS5xhfx<TVjQ2h4$q5QjQO
z#`>e;gwj(x6OYYwTmuiy7Q!srmrop2dk)62KaNce4cUD4yf)0iCM0!8n6O~35G}8r
zJitEENi^bP2LuAK;0Dcp2rpuf#e(^k$9UTO6W&_(16+RME?l;ajW7QUq}x0dHzi|U
z&3Xo&LJkYC4>M3%lZ>v7)1eCo&n&@B4G}oDS%&6yB6*(0Wpx%?s|#ywb~j#Ml>(>!
zkC6m1bV?@CWAh3r-gnK#^_|Kjb75`yDy!RMb-1faO~u)Z%*MRz1q(`zPOHUj&9jtM
zTjyA9l~p*UMT?Ej;y{q>zd`u=`I)HRxKuW`x_V8G&2DkqYVCnC@M2Y!FwbU3%ST$=
z|Mm;~6V&Ll$#7HE2$EBWs?}5JK|e@w<A##a3+*;{PF;!9R%x=XwUt|qwKWc_-9?vs
zL5nM!gTW(JCX3rr=&UWbx?DDUWqxf1wlz$GMjUh%^2wD{*#uhnG}ziAcIk>0n$CU3
zu)x=|?)Mr)j`Skaev;7ZTOp377|1vpttE0+vF8DxPw_ndS|(?6d}oB{NSMwW3O1)}
zlbCNiyw9>HFXRE9s2UZhdlnu(7mJOj<*f0n2Rbj+i6!YLBI|qAJ3XxDnu(Ff`9Ww7
zjs@$#S;$D5cyo8qh3?xW3_i8|x4&RogBI)WmoZqqB^C!fD)#s8K4JTJ;WArk&TKRP
zc=O^pd02lsQKnBz(;EyrO}5^c+J2GXz|L~q^@)UC_3g{T_D2kjZG&hWa)#jdgJaQG
zrKXuWB4uO!9nb*`wpAtKH+!V)Zx3&PHv~eD^!`D-;lQ^hk|g8Le?@c-^+J~#W{*(i
zw)%R~lh1@}&%UyKDDi{iBe3n4k=)Ah&>BteF)*IKt0M}<>}>tC)Exb6jebUsQPaf$
zAD#&yqgzA}MZXcj1UjY(Cg9%gOwOW&L*R`7f_GhMTv`TP2J9;nQ$-#`&@s7SQ2h;j
zH-?X<C!mX|Jr{;#SA*WTl|8g>9?a`11|vaZl%B3BfzPGz77ys)Wq4<B?uF18gD2|d
z1u`#D2Y4Dh;k*(cz3ExTQF{@n70;6(Y*LSbP|JMCZ`}uW&hCa5ITlq^(8)Xu*Dp^Q
z#;g0ERy(EVFJ8|IB>r-E4ykWGl+mO@*zRqBP`Z0QP?}Q&3*?^eaAmUNwJg30!<{E1
z+g!N}&0(RU{Fi3vbX3&@8u%)3Gtt`&5*##d4lS5&Ug)+}o2n~^uQ8z~NR9xr0xMxU
z-d|nxFVlus1nqP}26`kO&a)3ZLag654X>_HVq8rKO?SaXT)MR!`<!vy)-A9R=(RSG
zak3`x18r;q1*g~p4}iw)1w){RBe?v7&_-JN6S#zT;cFo+It<C!eJ++BZwCpN*#<r#
z^=yL#jPH-(vV72!LRFK<B(Y-g`t4~xCpZ2bxI?heF$$v+RdnuTa;a+oJYwmUj9U|`
zKe&5lO<=a@{(DeyRHY-t`y((%ReHiuPXff#4jGBTOi>7DdH^56QPniUw6;J4y_823
zT+5$uRw^IGw_nZ6XkLbPTPAW1glq^qs!At>)(?V)(?pP)LQa)I2*}s&%HL6%?8p*?
z2n>h#Es{<b&m^2TnuuCrBI%cRA%;thC08VzDw7lw`JUU$CXc_oBa2__hO>c>8Oyzy
zMO;F9*b9sB@rO!UnM+E<z3Y~I?CY<mhoXpuPEIAs^!T@+=4K_4i9}5OW%o>7FVmXm
V$TY6y7}$XpJcJos=~U98{RhGTdLRG*

delta 1606
zcma)64NOy46n^Kv2Ys(CP%2bmC|GdHwAf-1YxrqPag(8f(QI)<@MlW=nFPyp#-En3
z&A)(nO;0q20b-ep8s>9cGYvt(O{WP6%K`~gaL(UkOw(+OS=e56VBE50C%HN2p7Y&%
z&OPrt&(kS+I;ED4Lde^O`Kv^^Tv!ZZEXQ#=Wns4wrpbX2Ezw<?pRj3bX?A{f=y{=P
zY5FPjE+=N$E(%19P>{wkv|GJI5)O=Q1LGD6G$+JD-4hl`oL2GIjK*kSLKp22EOH<w
zftPmGeGIy7UEo0n582qgfRtg%MVKT%oM=^t)?cbtqH@x-CJ_gxLIO1l+Rzl`rbeIq
z)GV4*M|~V8a@X)iCG4lw8?;zZ09Jaq<PJSu{0Mqp@{3qp4kEq0dO96g-UHtSgU9Kh
zH|$kQYMRq(oip2HbJ|i()_FFw$>GRNHKjRhR!f>WJ>6z;?6?=ipTMvi5H6EddXSQv
z>{sa)xBYL~iH~dCkU~B0hRfkCPk7X&5G@YZLzJA*I+2_?k`p08r1At|v>~$l#Qsp~
z*qJL=o;%Mso+Y%l!X<kz>{8K!(r9dnA=y}FB5G=`8jsb@ppiXad4QIbMba;Khs*Id
zhj>~z6peeE;T38Qgh4BXQ?h)vGars+2FRH!TUFwX@moI1oI3cc?CEj|;$9_n^;r5q
zZ-F3&Dcjmn7j^e75e|**0)5}oE5Zyp(61Hf<AbZ@`d><T{OlCO(%6y2#@l*oSz|!c
zeURj$ktV?Pn;{7wnTeXE2+#w59T3`Dm5j+z5Y_lpV3|?S0l4lyL|{Y)D6RU@_=OQ}
z@+>nW7--9cSd7hsM1Lr#Y2gQntRxS<2frRjb7nq}Rs+n_M2eLx??h*!Pq$*<?PWi7
z<Y;KaPvh9S$>58{$9a&($``^lKu;DJv1vENv8*iU(4cd(QuU;jGw?t;7z__VdE_%O
zwF`vfq7>V8d+b9;U}+&Z41IrLf@)Y<bCu=l{wKFyH!KQ5o=H^uT15wE#Px41d|pDS
zlJ>b++BYlqq~MVk+_e2KZjN5@Lc1P}y&{~hDVg;wS)`tSfrwUYBfDM+R-k3uchH|#
z=3sj@yrvns>@D5%0PWlaj+Wfap!KCj28+Q-B%sQ1W#XRyA<(@9x+LxoMVdx^%)J!$
z$I+S{E=-6935yRy1I3!zRJ~D0TS`^5q)m-))xmjR1+=j?H#o!aqJvChb3cJTIM|!S
zlB!@p(#|oP%|*HMf~uHytxshI4R8tk2S9Ar9|PiZ!+U67Nc7Be1Ux*gKjc)VU&D%z
zLjyriKBz}0CYt_!E1tb^63!{8Y89#mV2Y+=%R84_`n`58jzjNB$Yt9Hz(@R_f<Ozy
zqiM{PNSt#EuF%ilH!+3Qy}%+<iC!Vohmb^#{c+6R0`1eOrNYLFW|6P?)<N*7B>TRi
z{=0R$(-lD`;?aAs8VA!!9Lr88cfkJ;1gy^{aaeCA39Q&gI(hW;2g#`=aWpF=l)0Y3
z1)!6+rL$$3<SLIn3&>8k^Ec>`V5D}%ELKIx_K0TvbVATO1WIL5q?f0)L-FX$A#Jqf
zmdTezCR5#qF}OC5T=2(|5bW*&5x=<$Gnh4=To-Ysl_dKfg8^5*N$S|}OtJ^CCZ1%l
S+S9NJ{<}j}{L2j)p7|%0SRQ!*