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 ebf25de..c6bddf6 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp @@ -363,35 +363,6 @@ BOOL CSo7_TCPIP_Server::Response_PLC_DM10000_R(short _StartAddr,short _DataSize) return TRUE; } -//================================================================ -BOOL CSo7_TCPIP_Server::Response_PLC_DM8000_W(short _StartAddr,short _DataSize) -{ - if(m_ClientSocket[m_nActiveClient] == INVALID_SOCKET) - { - return FALSE; - } - m_ClearSendBuf(); - memcpy(m_TCPIPBuf[CH_SEND]._buffer,DRW_SData,sizeof(DRW_SData)); - short sData(0); - _StartAddr-=8000; - if ((_StartAddr+_DataSize)>=MAX_DM_PAGE_NUMBER) - { - _DataSize=MAX_DM_PAGE_NUMBER-_StartAddr; - } - for (int i=0;i<_DataSize;i++) - { - sData=DM8000[_StartAddr+i]; - 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*2); - m_TCPIPBuf[CH_SEND]._size=DRW_SDataIndexData+_DataSize*2; - - SendBuffer(); - return TRUE; - -} - //================================================================ BOOL CSo7_TCPIP_Server::_Send_Cmd_Write_State() { @@ -624,6 +595,19 @@ void CSo7_TCPIP_Server::m_ProcessSocketReadEvent(SOCKET s) iDataSize=(bData[0]<<8)+bData[1]; if (iAddr>=8000) { + int iBuffsize(0); + int iStartAddr(0); + iStartAddr=iAddr-8000; + bData[0]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RSDataIndexBufSize1]; + bData[1]=m_TCPIPBuf[CH_RECV]._buffer[DRW_RSDataIndexBufSize2]; + iBuffsize=(bData[0]<<8)+bData[1]; + iBuffsize-=DRW_RDataCCLen; + for (int i=0;iSetWindowTextW(str); GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_PORTNUMBER)->SetWindowTextW(_T("9600")); + int i(0); + m_CCDData_D10000[i++]=25000; + 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++]=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++]=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++]=10000; if (g_pSo7_TCPIP_Server) { - int index(9); - g_pSo7_TCPIP_Server->DM5000[index]=0; - index=100; - g_pSo7_TCPIP_Server->DM5000[index++]=3; - g_pSo7_TCPIP_Server->DM5000[index++]=0; - g_pSo7_TCPIP_Server->DM5000[index++]=10000; - g_pSo7_TCPIP_Server->DM5000[index++]=0; - g_pSo7_TCPIP_Server->DM5000[index++]=20000; - g_pSo7_TCPIP_Server->DM5000[index++]=0; - g_pSo7_TCPIP_Server->DM5000[index++]=30000; - g_pSo7_TCPIP_Server->DM5000[index++]=0; - index=100+14; - g_pSo7_TCPIP_Server->DM5000[index++]=2; - g_pSo7_TCPIP_Server->DM5000[index++]=0; - g_pSo7_TCPIP_Server->DM5000[index++]=-25536; - g_pSo7_TCPIP_Server->DM5000[index++]=0; - g_pSo7_TCPIP_Server->DM5000[index++]=-15536; - g_pSo7_TCPIP_Server->DM5000[index++]=0; + int iData(0); + BYTE DM_Data[4]={0,0,0,0}; + int StartAddr(60); + for (int i=0;i>24) & 0x0ff; + DM_Data[1]=(iData>>16) & 0x0ff; + DM_Data[2]=(iData>>8) & 0x0ff; + DM_Data[3]=iData & 0x0ff; + g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i]=(DM_Data[2]<<8)+DM_Data[3]; + g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i+1]=(DM_Data[0]<<8)+DM_Data[1]; + } } - m_UpdateListControl(E_LISTCTRL_TITLE); - m_UpdateListControl(E_LISTCTRL_CONTENT); + if (g_pSo7_TCPIP_Server) + { + int iDM5000DWord[140]={0}; + int index(0); + for (int i=0;i<140;i++) + { + iDM5000DWord[i]=0; + } + iDM5000DWord[index++]=1; + iDM5000DWord[index++]=10000; + index=7; + iDM5000DWord[index++]=1; + iDM5000DWord[index++]=20000; + int iData(0); + BYTE DM_Data[4]={0,0,0,0}; + index=9; + g_pSo7_TCPIP_Server->DM5000[index]=0; + int StartAddr(100); + + for (int i=0;i<140;i++) + { + iData=iDM5000DWord[i]; + DM_Data[0]=(iData>>24) & 0x0ff; + DM_Data[1]=(iData>>16) & 0x0ff; + DM_Data[2]=(iData>>8) & 0x0ff; + DM_Data[3]=iData & 0x0ff; + g_pSo7_TCPIP_Server->DM5000[StartAddr+2*i]=(DM_Data[2]<<8)+DM_Data[3]; + g_pSo7_TCPIP_Server->DM5000[StartAddr+2*i+1]=(DM_Data[0]<<8)+DM_Data[1]; + } + } + + m_DMAddrList=DM_ADDR_CCD; + ((CButton *)GetDlgItem(IDC_RADIO_PLC_TCPIP_SERVER_ADDR_CCD_DM))->SetCheck(TRUE); + ((CButton *)GetDlgItem(IDC_RADIO_PLC_TCPIP_SERVER_ADDR_DM5000))->SetCheck(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_PLC_TCPIP_SERVER_ADDR_DM8000))->SetCheck(FALSE); + m_UpdateListControl(E_LISTCTRL_CREATE); + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_DATA2CONTROL); + m_UpdateControls(FALSE); UpdateData(FALSE); return TRUE; // return TRUE unless you set the focus to a control } +//===================================================================== void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerStart() { CString str; @@ -141,6 +206,7 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerStart() } +//===================================================================== void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerStop() { if (g_pSo7_TCPIP_Server) @@ -152,154 +218,398 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerStop() } +//===================================================================== void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatestate() { - CString str; - UpdateData(TRUE); - USES_CONVERSION; - GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_CCD1)->GetWindowText(str); - const char* cTempValue=T2A(str); - g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_CCD1_CAMERA1]=static_cast(atoi(cTempValue)); - - GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_CCD2)->GetWindowText(str); - cTempValue=T2A(str); - g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_CCD1_CAMERA2]=static_cast(atoi(cTempValue)); - - GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_LASER1)->GetWindowText(str); - cTempValue=T2A(str); - g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_LASER1_HEADA]=static_cast(atoi(cTempValue)); - - GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_LASER2)->GetWindowText(str); - cTempValue=T2A(str); - g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_LASER2_HEADA]=static_cast(atoi(cTempValue)); - - GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_PLC_STATE)->GetWindowText(str); - cTempValue=T2A(str); - g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState=static_cast(atoi(cTempValue)); - - BYTE DM_Data[4]={0,0,0,0}; - g_pSo7_TCPIP_Server->DM5000[0]=static_cast(g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState); - for (int i=1;i<=8;i++) - { - 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]; - } + m_UpdateControls(TRUE); + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_DATA2CONTROL); } - +//===================================================================== void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatedata() { - m_UpdateListControl(E_LISTCTRL_CONTENT); + m_UpdateListControl(E_LISTCTRL_CONTROL2DATA); + m_UpdateControls(FALSE); +} +//===================================================================== +void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type) +{ + if (_type==FALSE) + { + CString str; + + BYTE DM_Data[4]={0,0,0,0}; + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState=static_cast(g_pSo7_TCPIP_Server->DM5000[0]); + for (int i=1;i<=8;i++) + { + DM_Data[0]=(g_pSo7_TCPIP_Server->DM5000[i]>>8) && 0x0ff; + DM_Data[1]=(g_pSo7_TCPIP_Server->DM5000[i]) && 0x0ff; + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2+1]=DM_Data[0]; + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2]=DM_Data[1]; + } + str.Format(_T("%d"),g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_CCD1_CAMERA1]); + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_CCD1)->SetWindowTextW(str); + + str.Format(_T("%d"),g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_CCD1_CAMERA2]); + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_CCD2)->SetWindowTextW(str); + + str.Format(_T("%d"),g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_LASER1_HEADA]); + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_LASER1)->SetWindowTextW(str); + + str.Format(_T("%d"),g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_LASER2_HEADA]); + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_LASER2)->SetWindowTextW(str); + + str.Format(_T("%d"),g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState); + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_PLC_STATE)->SetWindowTextW(str); + } + else + { + CString str; + UpdateData(TRUE); + USES_CONVERSION; + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_CCD1)->GetWindowText(str); + const char* cTempValue=T2A(str); + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_CCD1_CAMERA1]=static_cast(atoi(cTempValue)); + + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_CCD2)->GetWindowText(str); + cTempValue=T2A(str); + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_CCD1_CAMERA2]=static_cast(atoi(cTempValue)); + + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_LASER1)->GetWindowText(str); + cTempValue=T2A(str); + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_LASER1_HEADA]=static_cast(atoi(cTempValue)); + + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_STATE_LASER2)->GetWindowText(str); + cTempValue=T2A(str); + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[OMRON_PLC_LASER2_HEADA]=static_cast(atoi(cTempValue)); + + GetDlgItem(IDC_EDIT_PLC_TCPIP_SERVER_PLC_STATE)->GetWindowText(str); + cTempValue=T2A(str); + g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState=static_cast(atoi(cTempValue)); + + BYTE DM_Data[4]={0,0,0,0}; + g_pSo7_TCPIP_Server->DM5000[0]=static_cast(g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState); + for (int i=1;i<=8;i++) + { + 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]; + } + } +} +//===================================================================== +void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrCcdDm() +{ + m_DMAddrList=DM_ADDR_CCD; + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_DATA2CONTROL); + +} +//===================================================================== +void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm5000() +{ + m_DMAddrList=DM_ADDR_DM5000; + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_DATA2CONTROL); } +//===================================================================== +void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm8000() +{ + m_DMAddrList=DM_ADDR_DM8000; + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_DATA2CONTROL); +} //===================================================================== void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateListControl(int _type) { switch(_type) { - case E_LISTCTRL_TITLE: + case E_LISTCTRL_CREATE: { RECT m_rect; m_DataList.GetClientRect(&m_rect); //获取list的客户区 m_DataList.SetExtendedStyle(LVS_EX_GRIDLINES|LVS_EX_FULLROWSELECT); //设置list风格 - m_DataList.InsertColumn(0,_T("CCD地址"),LVCFMT_LEFT, m_rect.right*1/2); - m_DataList.InsertColumn(1,_T("数据值"),LVCFMT_LEFT, m_rect.right*1/2); - + m_DataList.InsertColumn(0,_T("CCD地址"),LVCFMT_LEFT, m_rect.right*1/4); + m_DataList.InsertColumn(1,_T("数据值"),LVCFMT_LEFT, m_rect.right*1/4); + m_DataList.InsertColumn(2,_T("备注"),LVCFMT_LEFT, m_rect.right*2/4); int iStartRow(0),iEndRow(0); CString str; iStartRow=0; - iEndRow=MAX_CCD_ADDR; + iEndRow=MAX_DM_PAGE_NUMBER; for (int i=iStartRow; iDM10000[StartAddr+2*i+1]>>8) & 0x0ff; + DM_Data[1]=(g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i+1]) & 0x0ff; + DM_Data[2]=(g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i]>>8) & 0x0ff; + DM_Data[3]=(g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i]) & 0x0ff; + m_CCDData_D10000[i]=(DM_Data[0]<<24)+(DM_Data[1]<<16)+(DM_Data[2]<<8)+(DM_Data[3]); + } + } + for (int i=iStartRow; iDM5000[i]); + m_DataList.SetItemText(i,1,str); + } + } + else if (m_DMAddrList==DM_ADDR_DM8000) + { + iStartRow=0; + iEndRow=MAX_DM_PAGE_NUMBER; + for (int i=iStartRow;iDM8000[i]); + m_DataList.SetItemText(i,1,str); + } + } + else + { + ; + } + break; + } + case E_LISTCTRL_CONTROL2DATA: { USES_CONVERSION; CString csTmp; const char* cTmp; + int iStartRow(0),iEndRow(0); int iCol=1; - for (int iRow=0;iRow>24) & 0x0ff; - DM_Data[1]=(iData>>16) & 0x0ff; - DM_Data[2]=(iData>>8) & 0x0ff; - DM_Data[3]=iData & 0x0ff; - g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i]=(DM_Data[2]<<8)+DM_Data[3]; - g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i+1]=(DM_Data[0]<<8)+DM_Data[1]; - } - } + if (m_DMAddrList==DM_ADDR_CCD) + { + for (int iRow=0;iRow>24) & 0x0ff; + DM_Data[1]=(iData>>16) & 0x0ff; + DM_Data[2]=(iData>>8) & 0x0ff; + DM_Data[3]=iData & 0x0ff; + g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i]=(DM_Data[2]<<8)+DM_Data[3]; + g_pSo7_TCPIP_Server->DM10000[StartAddr+2*i+1]=(DM_Data[0]<<8)+DM_Data[1]; + } + } + } + else if (m_DMAddrList==DM_ADDR_DM5000) + { + iStartRow=0; + iEndRow=MAX_DM_PAGE_NUMBER; + for (int iRow=iStartRow;iRowDM5000[iRow]=static_cast(atoi(cTmp)); + } + } + else if (m_DMAddrList==DM_ADDR_DM8000) + { + iStartRow=0; + iEndRow=MAX_DM_PAGE_NUMBER; + for (int iRow=iStartRow;iRowDM8000[iRow]=static_cast(atoi(cTmp)); + } + } break; } default:break; } } +//===================================================================================== void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonClearMsg() { ((CEdit *)GetDlgItem(IDC_EDIT_MSG))->SetWindowTextW(_T("")); } - - //===================================================================================== void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedCancel() { - // TODO: Add your control notification handler code here CDialog::OnCancel(); } //===================================================================================== @@ -403,6 +713,11 @@ CString CSo7_Util_PLC_TCPIP_SERVER::TCPIPMsg(int _Type) } case RESPONSE_WRITE_PLC_STATE: { + if (m_DMAddrList==DM_ADDR_DM8000) + { + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_DATA2CONTROL); + } cStr=_T("RESPONSE_WRITE_PLC_STATE"); break; } @@ -428,3 +743,6 @@ CString CSo7_Util_PLC_TCPIP_SERVER::TCPIPMsg(int _Type) } return cStr; } + + + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.h index dc865fd..dd66035 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.h @@ -1,6 +1,12 @@ #pragma once - +enum DM_ADDR_LIST +{ + DM_ADDR_CCD, + DM_ADDR_DM5000, + DM_ADDR_DM8000, + DM_ADDR_LIST +}; // CSo7_Util_PLC_TCPIP_SERVER dialog class CSo7_Util_PLC_TCPIP_SERVER : public CDialog @@ -18,6 +24,7 @@ public: CEdit m_edMSG; int m_CCDData_D10000[MAX_CCD_ADDR]; protected: + int m_DMAddrList; CEditableListCtrl m_DataList; void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); @@ -38,6 +45,10 @@ public: LRESULT OnTCPIPMsg(WPARAM w, LPARAM p); afx_msg void OnBnClickedButtonPlcTcpipServerUpdatedata(); void m_UpdateListControl(int _type); + void m_UpdateControls(int _type); CString TCPIPMsg(int _Type); + afx_msg void OnBnClickedRadioPlcTcpipServerAddrCcdDm(); + afx_msg void OnBnClickedRadioPlcTcpipServerAddrDm5000(); + afx_msg void OnBnClickedRadioPlcTcpipServerAddrDm8000(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 74c9e04..59d4a1f 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -933,8 +933,11 @@ #define IDC_RADIO_SO7_MOVE_SPEED_GEAR2 1805 #define IDC_RADIO_ART_PCI8622_MODE_NPTSEQ 1805 #define IDC_RADIO_SO7_EXTRIG_SPECLOCATION 1805 +#define IDC_RADIO_PLC_TCPIP_SERVER_ADDR_DM5000 1805 #define IDC_RADIO_MACHINE_TESASTARE 1806 #define IDC_RADIO_READ_OUTPUT_PORT2 1806 +#define IDC_RADIO_PLC_TCPIP_SERVER_ADDR_DM5001 1806 +#define IDC_RADIO_PLC_TCPIP_SERVER_ADDR_DM8000 1806 #define IDC_EDIT_MOVETO_DEG 1807 #define IDC_RADIO_READ_LIMIT_SWITCH 1807 #define IDC_BUTTON_TESA_STAR_SENDMSG 1808 @@ -1077,6 +1080,7 @@ #define IDC_EDIT_PLC_TCPIP_SERVER_PORTNUMBER 1901 #define IDC_LIST_PLC_TCPIP_SERVER_CCDDATA 1902 #define IDC_IPADDRESS_PLC_TCPIP 1903 +#define IDC_RADIO_PLC_TCPIP_SERVER_ADDR_CCD_DM 1904 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 @@ -1086,7 +1090,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 193 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1904 +#define _APS_NEXT_CONTROL_VALUE 1905 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif 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 30307c6..6e45a5d 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ