新增变倍时间输出,统一CMD_H文件。

This commit is contained in:
TAO Cheng
2013-11-12 14:37:21 +08:00
parent 842c95f8b1
commit 24ba06adf7
16 changed files with 912 additions and 371 deletions
@@ -207,7 +207,11 @@ struct struct_so7_machine
char FPGAData;
char InPortStatus;
int _motor_pulse_num;
char FirmwareInfo[10];
char GetInterruptMsg[20][2];
char GetInterruptMsgMethod;
BOOL IsOffline;
BOOL IsSupportReadInterrputMsg;
struct s_so7_axis x;
struct s_so7_axis y;
struct s_so7_axis z;
@@ -232,7 +236,7 @@ struct s_SO7_CMD_BUFF_02
struct
{
BYTE uSubCmdByte;
char data[9];
char data[12];
}s_SO7_CMD_MOVE_TO_XYZ;
struct
{
@@ -355,6 +359,7 @@ public:
SSI_STATUS_MOTION so7_motion_set_speed_xyz(double dPercentSpeed);
SSI_STATUS_MOTION so7_motion_get_speed_xyz(double &dPercentSpeed);
SSI_STATUS_MOTION so7_motion_get_3D_max_speed(double &dMaxSpeed);
SSI_STATUS_MOTION so7_motion_is_finished(char MotionType,BOOL& IsFinished);
SSI_STATUS_MOTION _calculate_straightline_motion(double dSpeedMM);
@@ -413,6 +418,13 @@ public:
SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z();
SSI_STATUS_MOTION _send_cmd_SO7_CMD_WRITE_DATA_TO_FPGA(char axis_type,char Addr,char Data);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(char axis_type,char Addr);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_FIRMWARE_VERSION_INFO();
SSI_STATUS_MOTION _send_cmd_SO7_CMD_GET_INTERRUPT_MSG(char cType);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_INTERRUPT_MSG(char cType,char cValue);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(char Method);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_MOVE_XY(char SpeedGearX,char SpeedGearY);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_CONSTANT_SPEED(int iSpeed,char axis_type,char xyz_gear);
static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_X();
static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_Y();
@@ -448,7 +460,8 @@ public:
static SSI_STATUS_MOTION _process_SO7_CMD_READ_ZSIGNAL_POS_Z();
static SSI_STATUS_MOTION _process_SO7_CMD_WRITE_DATA_TO_FPGA();
static SSI_STATUS_MOTION _process_SO7_CMD_READ_DATA_FROM_FPGA();
static SSI_STATUS_MOTION _process_SO7_CMD_READ_FIRMWARE_VERSION_INFO();
static SSI_STATUS_MOTION _process_SO7_CMD_GET_INTERRUPT_MSG(BYTE Type);
};
#endif