From 2ce93d14fa222f919481054ceab981eb55c1627b Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 23 May 2014 18:08:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BE=93=E5=87=BA=E5=8F=A3?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 36 ++++++++++++++++++ .../Tools/UsbUtility/Debug/UtilityDebug.Log | 4 ++ .../MachineInterfaceDll/MachineInterfaceDll.h | 2 +- .../MachineInterfaceDll.rc | Bin 4676 -> 4676 bytes .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 2 +- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 27 ++++++++----- .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h | 2 + .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 135680 -> 135680 bytes .../UsbUtility/Win32TestDll/Win32TestDll.cpp | 9 +++++ 9 files changed, 71 insertions(+), 11 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index eb30386..771b230 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -4363,6 +4363,42 @@ SSI_STATUS_MOTION CSO7_Proto::so7_SetDO(int Channel,BYTE bDOSts) } _send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,cSetIOStatusAddr,cSetValue); Sleep(5); + if (bDOSts&HBIT3) + { + cSetIOStatusAddr=3; + cSetValue=1; + } + else + { + cSetIOStatusAddr=3; + cSetValue=0; + } + _send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,cSetIOStatusAddr,cSetValue); + Sleep(5); + if (bDOSts&HBIT4) + { + cSetIOStatusAddr=4; + cSetValue=1; + } + else + { + cSetIOStatusAddr=4; + cSetValue=0; + } + _send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,cSetIOStatusAddr,cSetValue); + Sleep(5); + if (bDOSts&HBIT5) + { + cSetIOStatusAddr=5; + cSetValue=1; + } + else + { + cSetIOStatusAddr=5; + cSetValue=0; + } + _send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,cSetIOStatusAddr,cSetValue); + Sleep(5); break; } case OUTPORT_J3: diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index ca7d1ee..e832905 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4570,3 +4570,7 @@ Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h index e06b26f..494d3c8 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h @@ -32,7 +32,7 @@ enum EHOME_MACHINE_MODE enum EIO_PORT { INPORT_J2=0,//Effective bit:0-5 - OUTPORT_J1,//Effective bit:0-2 + OUTPORT_J1,//Effective bit:0-5 OUTPORT_J3,//Effective bit:0-5 LIMIT_SWITCH_J4//Effective bit:0-5 }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.rc index 94ae5ea4053e8d47643eff6c7b05ca41027029d6..b39c6b214f404e40c6181af5fab0ef50c96eacb9 100644 GIT binary patch delta 42 vcmX@2aztgrDh@`|$*VaG8BI6e<@nA7U0Wll7#5e2liLn3xG5HKN delta 42 vcmX@2aztgrDh@{D$*VaG8I3pJ<@nA7U0Wll7#5e2liLn3xF+U6~ diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 77b2d4a..1162a92 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -45,7 +45,7 @@ BEGIN PUSHBUTTON "Stop",IDC_BUTTON_SO7_TRIGPULSE_STOP,259,156,34,15 CONTROL "连续读取",IDC_CHECK_CONTINUOUS_READ_IO_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,380,144,47,10 PUSHBUTTON "读取IO状态",IDC_BUTTON_SO7_READ_IN_PORT_STATUS,378,156,61,14 - COMBOBOX IDC_COMBO_OUTPORT_NUMBER,314,189,29,34,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_OUTPORT_NUMBER,304,189,39,75,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "开启",IDC_CHECK_SO7_OUT_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,191,27,10 PUSHBUTTON "设置输出状态",IDC_BUTTON_SET_OUT_PORT,378,188,61,14 CONTROL "First",IDC_RADIO_SPEED_GEAR1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,170,195,30,10 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp index 83dea12..e8cad70 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp @@ -44,6 +44,7 @@ IMPLEMENT_DYNAMIC(CSO7_UtilDlg, CDialog) m_ZsignalPosZ=0; m_bEnProbe=false; m_ReadAxisIntervalTime=150; + m_IOAddr=0; } CSO7_UtilDlg::~CSO7_UtilDlg() @@ -196,15 +197,15 @@ BOOL CSO7_UtilDlg::OnInitDialog() CString csTmp=_T(""); ((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->ResetContent(); int iComboxIndex(0); - csTmp.Format(_T("WO-%d"),iComboxIndex+1); - ((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->InsertString(iComboxIndex++,csTmp); - csTmp.Format(_T("WO-%d"),iComboxIndex+1); - ((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->InsertString(iComboxIndex++,csTmp); - csTmp.Format(_T("WO-%d"),iComboxIndex+1); - ((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->InsertString(iComboxIndex++,csTmp); for (int i=iComboxIndex;iInsertString(i,csTmp); + } + iComboxIndex=6; + for (int i=iComboxIndex;iInsertString(i,csTmp); } @@ -887,7 +888,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSetOutPort() m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_LASE_OFF,0); } } - else if(iSelAddr==3) + else if(iSelAddr==6) { if (((CButton *)GetDlgItem(IDC_CHECK_SO7_OUT_PORT))->GetCheck()) { @@ -908,13 +909,16 @@ void CSO7_UtilDlg::OnBnClickedButtonSetOutPort() { case 1: case 2: + case 3: + case 4: + case 5: { m_SetIOStatusAddr=static_cast(iSelAddr); break; } default: { - m_SetIOStatusAddr=10+1+static_cast(iSelAddr-4); + m_SetIOStatusAddr=10+static_cast(iSelAddr-6); break; } } @@ -1225,24 +1229,28 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga() void CSO7_UtilDlg::OnBnClickedRadioReadLimitSwitch() { m_ReadIOStatusAddr=ESO7_CONTROLLER_LIMIT_SWITCH_ADDR; + m_IOAddr=LIMIT_SWITCH_J4; UpdateIOAddrCaption(0); } //================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadInputPort() { m_ReadIOStatusAddr=ESO7_CONTROLLER_INPUT_PORT_ADDR; + m_IOAddr=INPORT_J2; UpdateIOAddrCaption(1); } //================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadOutputPort() { m_ReadIOStatusAddr=ESO7_CONTROLLER_WOUTPUT_PORT_ADDR; + m_IOAddr=OUTPORT_J1; UpdateIOAddrCaption(1); } //================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadOutputPort2() { m_ReadIOStatusAddr=ESO7_CONTROLLER_OUTPUT_PORT_ADDR; + m_IOAddr=OUTPORT_J3; UpdateIOAddrCaption(1); } @@ -1310,6 +1318,7 @@ void CSO7_UtilDlg::UpdateIOStatus() COLORREF ColorOFF=RGB(240,240,240); m_pSO7_Proto->_send_cmd_SO7_CMD_READ_INPUT_PORT_STATUS(m_ReadIOStatusAddr); + m_IOStatus[m_IOAddr]=static_cast(m_pSO7_Proto->g_machine.InPortStatus); if (m_pSO7_Proto->g_machine.InPortStatus&HBIT0) { ((CMFCButton*)GetDlgItem(IDC_MFCBUTTON_STATUS_IN_PORT1))->SetWindowTextW(StrON); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h index b5d93cf..ea63921 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h @@ -66,6 +66,8 @@ public: char m_HomeMode; bool m_bEnProbe; INT m_ReadAxisIntervalTime; + BYTE m_IOStatus[4]; + INT m_IOAddr; void UpdateIOStatus(); void UpdateIOAddrCaption(int _type=0); void TestZSignal(); 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 efa86a641322ba3f014b6803b3f794438a12c787..d47f5395e708d40aefadc1873831c5b5b1b112a7 100644 GIT binary patch delta 2806 zcmbtWdr*^C7Qg392%(Awgoudpl!q7yAwUukLWoE$NJP6GD;?ifU3ut6hKE#W5w&Yu zzBD#{Ah$99z8)ok6qEy+Da=>ylINg4Lv@UxTGktFss~ zv>J;gU8m7!re|o33o_C*h73b`fj&!bFzBs~JNQZ`gyXbXCFq*_caonGKlAl@!dVX#QLZ*>0wuPmz8n%|zvTC-CRbh1J zi>SRjm#cz=YE;cxhsE39e%by4l*8WP!T27=5hU9ZM`##ITu_lSTu}q`r);C+77O7QbNYaY=k63bBW9 z>xvm@i+C9$_9myc3KRaxH|jGi+Dx4$Q)@`m=#7P1jnSyHYOHDctW0Bpz97r0Z`^@n zQxYfKV?^>yYRmt>pRauZlHkUFgiIP-q0tfiYhe;<3j^VQ!b#B3ZHsg9SYK%`FRpsEys&Cp#cCY;mqxJkU{8rjEL?atOt3tat+hUTRKC6@ zU)>>jW}>xIpG>g+_nGsp?@8~<+xojEXzR1sopf98fKMi4-x3{7L+i6T15d6|tEGqS zYZ@XF2-c^zlUVTfs!+VW`i^==kdIN`|2Gw5ArkA49O_}evUajxJ}rfcH(UvR7`35D zEP8Sl@bH!e;^Hl#3BB(Z_y@o~;)o)6-|_QA_4tYPM_!llPlrH<{qez~xoeLAoAEc{ zS?wP_fHU~;!$s0V746420Jf!ulW{j=#lcdTkME?;^o*K6D4jI_hj$=e_-L;n-|181 zx00wbtUFaIpX!@K*Qpla{Xncg-O96v;j$z0AY{vqo)K_sU6J?^e^GE;zX^!~wpC0Q z^LhsWRZAPi#=fr=?SooO`P_!K!El+10agr7pRAXjl9iHPewqevk49ncpLG6=O(Ja! zKO0Seudz8N51TGG;r^1@j^*FMmmro6rN}U1Sd9m6=75tJc4BYb{obo(AeujY3_-`< zjQ;z*h=%GV7`7}$SAW`n1{Ph{t_rA) zkK>0@p$v!qSc^`}Vl>m*Q{hV~nzOG>8i z`j$l3jeUSoowcYPjK}J~sPJHJ8GOM9)Np}hM+8;s4COjPBSX?AndDgZLr^5P&`5Gd58(;T?xMbpu%ED(@G;>70wz8xPCG=zVZsqY z2jM8;455?IMd&6-LZmh*(PG!54v<@koTy}vJ$?~gk0%2kI}bDQwJ{A2TzFTUdOHrV zX(Z-XF>q8VDVNfaXVb?nSSCQ6bTwWsgU*h_u|l^31U{Y!@~{Nr`#gZLSSqWjWHqmH zw;Q)Ek5qI?rCkbNPu(-=f65fnrk@lPRTHOpj!9n+JUcHaGqKh{`z-2T_iwpMi3jj2t25HveqT8_4D*CmhO z6L4mdT#64~+XqGP0w3su2Dy#IbF%~5l%Dvbk>k1p-d4gl^x|eXn)-oqFN-6ig!&A_ zUB82Un3-qt2by9``n1Ul*|_4-9NSspg6@-y!b3}Uy)kItQ-bAPVf1t%bQ(8b0W$a!!15=0xmhM{(@YAL)v-V9w^w9t+c*};BlS96)0R4 Xc$rdIgHt|>;votlSNhf>V_W_WK^~hj delta 2321 zcma)8dr(y875~oN2fGUD0as3 z4jPkEM>y7-YMiMr#>7rSyb0^%NhUZIH44eJU1H*-Nt4=`I;8H{W^1MAF1wga|7gEE zXTI8{Vk4HL_iDWvvH6Gjd9lAN>X%orM%pT{i)DzsX1#7R?il4>uZ z3Zl4!MU^TQar!3;RtbocGW|;l&?=9d)D63G-Ck zoD?_n)5BOf(Wfzuf^`8280W6XmoqK!2MR(jj%gO*l}#zj3T*ZQo6S&|XEqp&dFDcg zJ=3P| z_Hj^;uVfVTpZ+Ht#BWcRsUelb<|bYe`4{Q|hmUBfZtJn(`3iU#-#M}%#&sX9NPCz$ zDRp(Mg>7RU>~ZF0jp93Jp5bBztEeG0rP%sXg*+pn5F;=3aKBB)wwL#wIC@Tg{8bJg z+tev$y!E9rwB|M(Rib~?ifgZ>W6y|IreFa)I1qe01y%DBu^8^HK*Q|3QV+ zfEc0O5jG@`s{ve;3$Y?z6Y?_l0TBsS#J^Q&6RGGwN z5lxq1BgdE=Fe=xJ$NxO6P$$a#u(;!^7eLJU`eW$x&pUg|!J%V)KBAzwSz=wl&u_%-m0toVXnAi-=4# zG#*gsd*~?D)L?wyLwlm2B>c5Fj{0c%dcsCiaZ_g6E=6g`Q3oxVwhe{1L(pj3&EAUI;DmqTD z6Lx2TP3qrJBnv82RsAGkOh|=z6ZERFySzla+4hEPz)G6`RJH^=H><_>pPB#+st#iD zjb)+Nolq(h#wQ?Md_DNJdZ3B~0k!?l=HfkHl6d3Uw_#`#=&NP3sSRjW&R)YRX(rS% zp4AJFz6kkvT=yW2A1#Ej`=d*t-ZOAxmi!Uw3}M$0Y=BDP-63d?{nHSvAvmCFp`WCG z7ol(n_N#K=uk7YjNKw*^1VSpnC{iT6UzBu=iBKRu(0PvI(YL~aO0Qn<^UP^IRok+b^H KG}=h6r~U`(