1、合并master与2021.1

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp

@@ -36,12 +36,13 @@ extern "C" EXP_IMP SSI_STATUS_MOTION Machine_Startup(bool bOfflineOnly,EHOME_MAC
       m_pSO7_Proto->_start_machine();
       if (rStatus==SSI_STATUS_MOTION_NORMAL)
       {
-        rStatus=m_pSO7_Proto->Load_So7_Config(1);
+        rStatus=m_pSO7_Proto->Load_So7_Config_Inifile(1);
         rStatus=LoadMotionParameter();
         if (rStatus==SSI_STATUS_MOTION_NORMAL)
         {
-          m_pSO7_Proto->so7_motion_set_all_speed_para();
           m_pSO7_Proto->so7_motion_init_firmware_para();
+          m_pSO7_Proto->so7_motion_set_all_speed_para();
+          m_pSO7_Proto->so7_motion_set_all_so7_config();
 
           switch (cHomeMachineMode)
           {

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h

@@ -6,48 +6,7 @@
 #define EXP_IMP __declspec(dllimport)
 #endif
 
-enum EMACHINE_AXIS
-{
-  MACHINE_AXIS_NONE =  0,
-  MACHINE_AXIS_X,
-  MACHINE_AXIS_Y,
-  MACHINE_AXIS_Z,
-  MACHINE_AXIS_ZOOM,
-  MACHINE_AXIS_R,
-  MACHINE_AXIS_ALL  =  5
-};
-enum EHOME_MACHINE_MODE
-{
-  HOME_NONE,
-  HOME_XYZ=1,
-  HOME_X=10,
-  HOME_Y,
-  HOME_Z,
-  HOME_XY=20,
-  HOME_XZ,
-  HOME_YZ,
-  HOME_R=30,
-  HOME_TOATAL=255
-};
-enum EIO_PORT
-{
-  INPORT_J2=0,//Effective bit:0-5
-  OUTPORT_J1,//Effective bit:0-5
-  OUTPORT_J3,//Effective bit:0-5
-  LIMIT_SWITCH_J4//Effective bit:0-5
-};
-enum SSI_STATUS_MOTION 
-{
-  SSI_STATUS_MOTION_NORMAL = 0,
-  SSI_STATUS_MOTION_DATALINK_ERROR,
-  SSI_STATUS_MOTION_LIMIT_REACHED,
-  SSI_STATUS_MOTION_INVALID_PARAMETERS,
-  SSI_STATUS_MOTION_TIMEOUT,
-  SSI_STATUS_SO7_CONFIG_FILE_NOT_FOUND,
-  SSI_STATUS_MOTOR_DAT_FILE_NOT_FOUND,
-  SSI_STATUS_MACHINE_UNINITIALIZED,
-  SSI_STATUS_UNKNOWN_ERROR
-};
+#include "..\..\..\SevenOcean\SO7_Proto_Def.h"
 
 extern "C"
 {

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.vcxproj

@@ -21,7 +21,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -29,7 +29,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">