From db75902f9e3a723b8b37d85d53c92fe4e727688a Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Thu, 13 Nov 2014 21:37:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9FPLC=E8=BF=9B=E8=A1=8CTCPIP?= =?UTF-8?q?=E9=80=9A=E4=BF=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp | 6 ++-- .../Tools/UsbUtility/UsbUtil/So7_Option.cpp | 2 +- .../UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp | 34 ++++++++++++++++-- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 156160 -> 156160 bytes 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp index e2935e7..ebf25de 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp @@ -326,7 +326,7 @@ BOOL CSo7_TCPIP_Server::Response_PLC_DM5000_R(short _StartAddr,short _DataSize) m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexData+2*i]=(sData>>8) & 0x0ff; m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexData+2*i+1]=sData & 0x0ff; } - m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexDataSize]=static_cast(DRW_SDataIndexData-DRW_SDataHeadDataSize+_DataSize); + m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexDataSize]=static_cast(DRW_SDataIndexData-DRW_SDataHeadDataSize+_DataSize*2); m_TCPIPBuf[CH_SEND]._size=DRW_SDataIndexData+_DataSize*2; SendBuffer(); @@ -355,7 +355,7 @@ BOOL CSo7_TCPIP_Server::Response_PLC_DM10000_R(short _StartAddr,short _DataSize) m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexData+2*i]=(sData>>8) & 0x0ff; m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexData+2*i+1]=sData & 0x0ff; } - m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexDataSize]=static_cast(DRW_SDataIndexData-DRW_SDataHeadDataSize+_DataSize); + m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexDataSize]=static_cast(DRW_SDataIndexData-DRW_SDataHeadDataSize+_DataSize*2); m_TCPIPBuf[CH_SEND]._size=DRW_SDataIndexData+_DataSize*2; @@ -384,7 +384,7 @@ BOOL CSo7_TCPIP_Server::Response_PLC_DM8000_W(short _StartAddr,short _DataSize) m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexData+2*i]=(sData>>8) & 0x0ff; m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexData+2*i+1]=sData & 0x0ff; } - m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexDataSize]=static_cast(DRW_SDataIndexData-DRW_SDataHeadDataSize+_DataSize); + m_TCPIPBuf[CH_SEND]._buffer[DRW_SDataIndexDataSize]=static_cast(DRW_SDataIndexData-DRW_SDataHeadDataSize+_DataSize*2); m_TCPIPBuf[CH_SEND]._size=DRW_SDataIndexData+_DataSize*2; SendBuffer(); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp index ef3083f..154e5a7 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp @@ -468,7 +468,7 @@ void CSo7_Option::OnBnClickedOk() if (g_pSo7_TCPIP_Server) { delete g_pSo7_TCPIP_Server; - g_pSo7_TCPIP=NULL; + g_pSo7_TCPIP_Server=NULL; } } else if(((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->GetCheck()) 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 0c11358..2edd5d5 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 @@ -96,6 +96,7 @@ BOOL CSo7_Util_PLC_TCPIP_SERVER::OnInitDialog() GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_PORTNUMBER)->SetWindowTextW(_T("9600")); m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_CONTENT); UpdateData(FALSE); @@ -160,8 +161,8 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatestate() g_pSo7_TCPIP_Server->DM5000[0]=static_cast(g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState); for (int i=1;i<=8;i++) { - DM_Data[0]=g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2]; - DM_Data[1]=g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2+1]; + DM_Data[1]=g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2]; + DM_Data[0]=g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2+1]; g_pSo7_TCPIP_Server->DM5000[i]=(DM_Data[0]<<8)+DM_Data[1]; } } @@ -198,6 +199,35 @@ void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateListControl(int _type) m_DataList.SetItemText(i,0,str); m_DataList.SetItemText(i,1,_T("0")); } + int iRow(0); + int iCol(1); + m_DataList.SetItemText(iRow++,iCol,_T("25000")); + m_DataList.SetItemText(iRow++,iCol,_T("1000")); + m_DataList.SetItemText(iRow++,iCol,_T("1000")); + m_DataList.SetItemText(iRow++,iCol,_T("1000")); + m_DataList.SetItemText(iRow++,iCol,_T("10000")); + m_DataList.SetItemText(iRow++,iCol,_T("1000")); + m_DataList.SetItemText(iRow++,iCol,_T("20000")); + m_DataList.SetItemText(iRow++,iCol,_T("102000")); + m_DataList.SetItemText(iRow++,iCol,_T("30000")); + m_DataList.SetItemText(iRow++,iCol,_T("40000")); + m_DataList.SetItemText(iRow++,iCol,_T("204000")); + m_DataList.SetItemText(iRow++,iCol,_T("50000")); + m_DataList.SetItemText(iRow++,iCol,_T("60000")); + m_DataList.SetItemText(iRow++,iCol,_T("700000")); + m_DataList.SetItemText(iRow++,iCol,_T("800000")); + m_DataList.SetItemText(iRow++,iCol,_T("303000")); + m_DataList.SetItemText(iRow++,iCol,_T("900000")); + m_DataList.SetItemText(iRow++,iCol,_T("900000")); + m_DataList.SetItemText(iRow++,iCol,_T("500000")); + m_DataList.SetItemText(iRow++,iCol,_T("406000")); + m_DataList.SetItemText(iRow++,iCol,_T("100000")); + m_DataList.SetItemText(iRow++,iCol,_T("100000")); + m_DataList.SetItemText(iRow++,iCol,_T("150000")); + m_DataList.SetItemText(iRow++,iCol,_T("150000")); + m_DataList.SetItemText(iRow++,iCol,_T("200000")); + m_DataList.SetItemText(iRow++,iCol,_T("100000")); + m_DataList.SetEditableItemRange(0,MAX_CCD_ADDR-1,1,1); m_DataList.SetColorStyleItemRange(0,MAX_CCD_ADDR-1,0,2); break; 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 43d8cc7296a7c85775488531051f62c72d48b3be..5f445c1465e4bfd5084e39915aacff219fbbfe46 100644 GIT binary patch delta 2921 zcmb7Gdr*|u6~E{1gWYw(1(rwFRThE@@>&)}5R_#B<1?<}V4~IsATcHqV#tgdqpL9) zjYL@v;abNyL>)BLB+6&GOq-f@pvFfgy3`mGodjFcMATFprd89Co)0CDcKS!ZJHPKc z=iYN)=brPspRdd4>oOi*&L0`Z7;_Mo6Gjl?2+IiZxRFOd=!!^$7SnP1>)2Z=~+wh)qsu99S4j(ke+RRzlsm&bXpqi>7 z^kNKyS&MPWRD)9G+NHzv$L?V7cr$8C{?(vM!2O@wangiW)js-g&X^s<+IcWWj9L#i zoD{3a;=B(;bt_B=naJkQA^Zai4IjolOVU#I0=?I}3Ln>j8!E!Q<}d|K|(ima+!mvel1`LdTi zr)Z)&aW;oXDXVvEF`>_|#lIbi#P6D-l+?rLHR$~H!y!ecSm0AYZ(kH% z^yf*h6%GTQJC-8)%lH^^BbyJAOY)%^+NZ(Sy0%^WO_;2;h#7ir#=!n5P=kfLXTd~# zdRM%Lu@xA6OVws&3{y3+<0M42wcO#*h<6W8H$;#}wS<9$P-@?))4)klxEA(dYLy)W z?{>fwxaPed^ll1=MviOWe+||N?>WenF<$5ebli!O(W~GrG#niZ_my!+&w!|lf^?BK zkDF!OCb$Clt1EFbZaYcB5y9=!z7wuOQ!_+~`8&ZPNA7_@h;Xlk{WPUTIodT7kbn88 zG`7HHz_2;l#=+CqV8O{(;4}vJO~meK5BB)X`1mOoHdOiAPP<{~GPa7Pvq5XEh;O7h zdK%QoI}^}qDDPFD(6MYhJ8Ylt9GGjU!*gr}Z66rc1;-9eRH~-FI=Xx33x{%|fa3FP zFq7+a)Lw?+vp z43bKzsJ7LtmU5()t)Zn7rJ+B!a9`k4(2;-H9okx6!)HG96#4dE74~2|=SO~D zGQk$ojP5T2#_LZF^<^b};LXOuYms6^0HQ;SDf`OVi|i@N!PWTTrI7;}hrUbhpKbf= zOAEq(zGa$`_Bi|U`+(t!UBV%_s@eNz81|DFcL%o~xVCco=HB`X6_u4Iy$gl^F2pPO zf6?lj3_KRy_9Vr3t&2myQgR~(3>Rq^pA)e1X5s@%t-Cpw8n4`p(eN8%lzX@I8cp$Y z6?nEYMMhqRn;KF571*ThTQ~!4_b!7)rM7r-y-Jqqqultx%JJ>~Xxz~mCXL^zG2!b@ zcryXsR%z7dNAQ^ku1XcU_EpXrmh*&>hgp)l1E2Z z(;S1(3nWu+uws=co@|K#E{;d=DwRwIjN?xXS~6GQ6OzXfuIAj>^!e&~H;ZMSx5V*l zFaez%(IO)pVz8zo2Y)y`dr;Af10#4!do;8U0VZWUOtlTkb-9XMg)Z02o~P)Et|>JP`Y({IepfvF%7YS~Ff{478@nz! z&~eFez!v~R(>m0d8u!5@OX39+*EG?ay)udGre zdccm3GPej^huR@3)l|`~SHTuy_^ORE@F#E^#BDE+m*3CeUuoKVz^7}lTgCaeAQjzZ zZrrroE!=+vH|}{d725Fj@{QP2m4uJynsCX2W|2vUr1E=;u+QdKMZvdV71lC-ti2a} z5b7mb@jf67HXMWVw&K;YTX30f!atyQeJnQ5HzVH=E0!+czn5>!<0g#|BY0l>-=PzX zbW1YUMHt}tn9oSHKaBqWD+;9=g}nU^I84c^lT9?pP=YF-rr~cBR5@I&Cpm(?q2l=v z9_g=1GG>r=pK2`+Yhq;w=To@g0dV~XeFdXOV&EBzsMYb0t;-kO8%f=M@yNM)eu#L$ z(DslXyPoPU{LQ)vdKoa#c*dyvj)gZDccn9xATfPTv}`kRKi9zq8b{6%Zr1&H+$8|X66WxY94-vRgvDbJf%&`{ RlXS8F^Z#l$Z&}2({{|3i;XMEV delta 4989 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