diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp index 2262ec4..2f905f0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp @@ -20,7 +20,7 @@ EMACHINE_AXIS ActiveAxis=MACHINE_AXIS_NONE; SSI_STATUS_MOTION LoadMotionParameter(); //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Machine_Startup(bool bOfflineOnly,EHOME_MACHINE_MODE cHomeMachineMode) +extern "C" EXP_IMP SSI_STATUS_MOTION Machine_Startup(bool bOfflineOnly,EHOME_MACHINE_MODE cHomeMachineMode) { SSI_STATUS_MOTION rStatus=SSI_STATUS_MOTION_NORMAL; g_bOfflineOnly=bOfflineOnly; @@ -73,7 +73,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Machine_Startup(bool bOfflineOnly,EH return rStatus; } //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Machine_Shutdown() +extern "C" EXP_IMP SSI_STATUS_MOTION Machine_Shutdown() { if (m_pEF8000_Interface) { @@ -98,7 +98,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Machine_Shutdown() } /**************************Motion**********************************/ -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHomeXYZ(EHOME_MACHINE_MODE cHomeMachineMode) +EXP_IMP SSI_STATUS_MOTION Motion_DCCHomeXYZ(EHOME_MACHINE_MODE cHomeMachineMode) { if (!g_bOfflineOnly) { @@ -116,7 +116,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHomeXYZ(EHOME_MACHINE_MODE cHomeMachi return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomedXYZ(bool &bHomed) +EXP_IMP SSI_STATUS_MOTION Motion_IsHomedXYZ(bool &bHomed) { if (!g_bOfflineOnly) { @@ -135,7 +135,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomedXYZ(bool &bHomed) return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionXYZ(double &PositionX, double &PositionY, double &PositionZ) +EXP_IMP SSI_STATUS_MOTION Motion_GetPositionXYZ(double &PositionX, double &PositionY, double &PositionZ) { if (!g_bOfflineOnly) { @@ -153,7 +153,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionXYZ(double &PositionX, double return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionXYZ(double PositionX, double PositionY, double PositionZ,bool bWait) +EXP_IMP SSI_STATUS_MOTION Motion_SetPositionXYZ(double PositionX, double PositionY, double PositionZ,bool bWait) { if (!g_bOfflineOnly) { @@ -171,7 +171,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionXYZ(double PositionX, double return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinishedXYZ(bool &bFinished) +EXP_IMP SSI_STATUS_MOTION Motion_IsFinishedXYZ(bool &bFinished) { if (!g_bOfflineOnly) { @@ -189,7 +189,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinishedXYZ(bool &bFinished) return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetSpeedXYZ(EMACHINE_AXIS cAxis,char cSpeedGear,char Acce,char cHoldSpeed,char cStartSpeed,char cRefreshCycle,double dBufferDis) +EXP_IMP SSI_STATUS_MOTION Motion_SetSpeedXYZ(EMACHINE_AXIS cAxis,char cSpeedGear,char Acce,char cHoldSpeed,char cStartSpeed,char cRefreshCycle,double dBufferDis) { if (!g_bOfflineOnly) { @@ -209,7 +209,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetSpeedXYZ(EMACHINE_AXIS cAxis,char cSp } //SpeedGear:1,2,3,4(Faster) -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_Jog(EMACHINE_AXIS cAxis,char cSpeedGear) +EXP_IMP SSI_STATUS_MOTION Motion_Jog(EMACHINE_AXIS cAxis,char cSpeedGear) { if (!g_bOfflineOnly) { @@ -319,7 +319,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_Jog(EMACHINE_AXIS cAxis,char cSpeedGear) return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI Motion_Stop() +EXP_IMP SSI_STATUS_MOTION Motion_Stop() { if (!g_bOfflineOnly) { @@ -347,7 +347,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Motion_Stop() /**************************Rotary Table****************************/ //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionR(double& dPos) +extern "C" EXP_IMP SSI_STATUS_MOTION Motion_GetPositionR(double& dPos) { if (!g_bOfflineOnly) { @@ -366,7 +366,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionR(double& dPos) } } //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionR(double dAbsolutePos,bool bWait) +extern "C" EXP_IMP SSI_STATUS_MOTION Motion_SetPositionR(double dAbsolutePos,bool bWait) { if (!g_bOfflineOnly) { @@ -385,7 +385,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionR(double dAbsolute } } //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHomeR() +extern "C" EXP_IMP SSI_STATUS_MOTION Motion_DCCHomeR() { if (!g_bOfflineOnly) { @@ -405,7 +405,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHomeR() } //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomedR(bool &bHomed) +extern "C" EXP_IMP SSI_STATUS_MOTION Motion_IsHomedR(bool &bHomed) { if (!g_bOfflineOnly) { @@ -424,7 +424,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomedR(bool &bHomed) } } //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinishedR(bool &bFinished) +extern "C" EXP_IMP SSI_STATUS_MOTION Motion_IsFinishedR(bool &bFinished) { if (!g_bOfflineOnly) { @@ -443,7 +443,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinishedR(bool &bFinished) } } /*******************************************************************/ -EXP_IMP SSI_STATUS_MOTION WINAPI Illumination_SetLampState(double dTopLightPercent,double dBottomLightPercent,double dCoaxialLightPercent,double dReservedLightPercent,double dRingLightPercent,char cOuterRingLightSwitch,char cInnerRingLightSwitch) +EXP_IMP SSI_STATUS_MOTION Illumination_SetLampState(double dTopLightPercent,double dBottomLightPercent,double dCoaxialLightPercent,double dReservedLightPercent,double dRingLightPercent,char cOuterRingLightSwitch,char cInnerRingLightSwitch) { if (!g_bOfflineOnly) { @@ -461,7 +461,7 @@ EXP_IMP SSI_STATUS_MOTION WINAPI Illumination_SetLampState(double dTopLightPerce return SSI_STATUS_MOTION_NORMAL; } } -EXP_IMP SSI_STATUS_MOTION WINAPI SEND_SYS_COMMAND(char Cmd,char SubCmd,char Type,char Data) +EXP_IMP SSI_STATUS_MOTION SEND_SYS_COMMAND(char Cmd,char SubCmd,char Type,char Data) { if (!g_bOfflineOnly) { 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 a2e0325..34aeac2 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h @@ -45,33 +45,33 @@ enum SSI_STATUS_MOTION extern "C" { /////////////////////////////////////////////////////////////////////////////////// - EXP_IMP SSI_STATUS_MOTION WINAPI Machine_Startup(bool bOfflineOnly,EHOME_MACHINE_MODE cHomeMachineMode); - EXP_IMP SSI_STATUS_MOTION WINAPI Machine_Shutdown(); + EXP_IMP SSI_STATUS_MOTION Machine_Startup(bool bOfflineOnly,EHOME_MACHINE_MODE cHomeMachineMode); + EXP_IMP SSI_STATUS_MOTION Machine_Shutdown(); //================================================================================= //===============================Motion============================================ - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHomeXYZ(EHOME_MACHINE_MODE cHomeMachineMode); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomedXYZ(bool &bHomed); + EXP_IMP SSI_STATUS_MOTION Motion_DCCHomeXYZ(EHOME_MACHINE_MODE cHomeMachineMode); + EXP_IMP SSI_STATUS_MOTION Motion_IsHomedXYZ(bool &bHomed); //Units:mm - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionXYZ(double &PositionX, double &PositionY, double &PositionZ); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionXYZ(double PositionX, double PositionY, double PositionZ,bool bWait); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinishedXYZ(bool &bFinished); + EXP_IMP SSI_STATUS_MOTION Motion_GetPositionXYZ(double &PositionX, double &PositionY, double &PositionZ); + EXP_IMP SSI_STATUS_MOTION Motion_SetPositionXYZ(double PositionX, double PositionY, double PositionZ,bool bWait); + EXP_IMP SSI_STATUS_MOTION Motion_IsFinishedXYZ(bool &bFinished); //SpeedGear:1,2,3,4(Faster) - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetSpeedXYZ(EMACHINE_AXIS cAxis,char cSpeedGear,char Acce,char cHoldSpeed,char cStartSpeed,char cRefreshCycle,double dBufferDis); + EXP_IMP SSI_STATUS_MOTION Motion_SetSpeedXYZ(EMACHINE_AXIS cAxis,char cSpeedGear,char Acce,char cHoldSpeed,char cStartSpeed,char cRefreshCycle,double dBufferDis); //SpeedGear:1,2,3,4(Faster) - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_Jog(EMACHINE_AXIS cAxis,char cSpeedGear); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_Stop(); + EXP_IMP SSI_STATUS_MOTION Motion_Jog(EMACHINE_AXIS cAxis,char cSpeedGear); + EXP_IMP SSI_STATUS_MOTION Motion_Stop(); //===================================Rotary Table================================== - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHomeR(); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomedR(bool &bHomed); + EXP_IMP SSI_STATUS_MOTION Motion_DCCHomeR(); + EXP_IMP SSI_STATUS_MOTION Motion_IsHomedR(bool &bHomed); //Units:Rad - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionR(double& dPos); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionR(double dAbsolutePos,bool bWait); - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinishedR(bool &bFinished); + EXP_IMP SSI_STATUS_MOTION Motion_GetPositionR(double& dPos); + EXP_IMP SSI_STATUS_MOTION Motion_SetPositionR(double dAbsolutePos,bool bWait); + EXP_IMP SSI_STATUS_MOTION Motion_IsFinishedR(bool &bFinished); //==============================Illumination======================================= //Range value:0.0-100.0 - EXP_IMP SSI_STATUS_MOTION WINAPI Illumination_SetLampState(double dTopLightPercent,double dBottomLightPercent,double dCoaxialLightPercent,double dReservedLightPercent,double dRingLightPercent,char cOuterRingLightSwitch,char cInnerRingLightSwitch); + EXP_IMP SSI_STATUS_MOTION Illumination_SetLampState(double dTopLightPercent,double dBottomLightPercent,double dCoaxialLightPercent,double dReservedLightPercent,double dRingLightPercent,char cOuterRingLightSwitch,char cInnerRingLightSwitch); //==============================CMD================================================ - EXP_IMP SSI_STATUS_MOTION WINAPI SEND_SYS_COMMAND(char Cmd,char SubCmd,char Type,char Data); + EXP_IMP SSI_STATUS_MOTION SEND_SYS_COMMAND(char Cmd,char SubCmd,char Type,char Data); } \ No newline at end of file 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 0143fa6..e12db99 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.rc and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.rc differ 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 6ff4169..d14645c 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