1、合并master与2021.1

2021-12-03 11:25:35 +08:00
parent dc07b8879b
commit 4bd7d1b80b
981 changed files with 384342 additions and 6470 deletions
@@ -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"
 {