xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ex-trig test.

Browse Source
This commit is contained in:
TAO Cheng
2015-02-05 16:16:10 +08:00
parent f597f8c678
commit 972e5d53ab
9 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h
+1
View File
@@ -405,6 +405,7 @@ enum E_DIS_TRIG_PULSE_METHOD
{
E_DIS_TRIG_PULSE_EQDIS=0,
E_DIS_TRIG_PULSE_SPEC_LOCA,
E_DIS_TRIG_PULSE_EQDIS_II,
E_DIS_TRIG_PULSE_TOTAL=255
};
enum E_ACTIVE_AXIS
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+9
View File
@@ -4850,6 +4850,11 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_set_trig_para(char _cAxis,char _TrigMod
SetParaNumber=_ParaNumber;
_send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(_cAxis,_TrigMode,SetStartIndex,SetParaNumber,_ParaData);
}
else if (_TrigMode==E_DIS_TRIG_PULSE_EQDIS_II)
{
SetParaNumber=_ParaNumber;
_send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(_cAxis,_TrigMode,SetStartIndex,SetParaNumber,_ParaData);
}
else
{
do
@@ -6254,6 +6259,10 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_WRITE_TRIG_PULSE_PARA(char Activ
{
lSetParaNumber=1;
}
else if (TrigMode==E_DIS_TRIG_PULSE_EQDIS)
{
lSetParaNumber=2;
}
else
{
lSetParaNumber=ParaNumber;
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/So7_TCPIP_Server.cpp
+9 -6
View File
@@ -607,12 +607,7 @@ void CSo7_TCPIP_Server::m_ProcessSocketReadEvent(SOCKET s)
m_TCPIPMsg._CmdType=0;
m_TCPIPMsg._DataAddr=iAddr;
m_TCPIPMsg._DataSize=iDataSize;
if (iAddr>=200)
{
Response_PLC_DM200_R(iAddr,iDataSize);
m_TCPIPMsg._MsgType=RESPONSE_READ_PLC_STATE;
}
else if (iAddr>=20000)
if (iAddr>=20000)
{
m_TCPIPMsg._MsgType=RESPONSE_READ_ERRCODE;
}
@@ -631,6 +626,11 @@ void CSo7_TCPIP_Server::m_ProcessSocketReadEvent(SOCKET s)
Response_PLC_DM5000_R(iAddr,iDataSize);
m_TCPIPMsg._MsgType=RESPONSE_READ_PLC_STATE;
}
else if (iAddr>=200)
{
Response_PLC_DM200_R(iAddr,iDataSize);
m_TCPIPMsg._MsgType=RESPONSE_READ_PLC_STATE;
}
else
{
RESPONSE_PLC_DM_UNKNOWN();
@@ -694,9 +694,12 @@ void CSo7_TCPIP_Server::m_ProcessSocketReadEvent(SOCKET s)
}
BOOL bStatus(false);
bStatus=DM200[35]&0x0002;
TRACE1("DM235=%d\r\n",DM200[35]);
if (bStatus)
{
TRACE1("DM225=%d\r\n",DM200[25]);
DM200[25]=DM200[25]&0xFFFB;
TRACE1("DM225=%d\r\n",DM200[25]);
}
m_TCPIPMsg._UpdateData=2;
RESPONSE_PLC_DM_UNKNOWN();