新增导出XYZ工作台接口,新增导出灯光调节接口,完善debug信息输出。

This commit is contained in:
TAO Cheng
2014-04-25 17:23:08 +08:00
parent f1188c017c
commit d1cf313511
19 changed files with 1252 additions and 432 deletions
@@ -60,16 +60,6 @@
const long MAX_INTENSITY = 0x3FF;
#define MAXLIGHTVALUE 255
#define MINLIGHTVALUE 1
enum MACHINE_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 EMACHINETYPE
{
MACHINE_SO7_CONTROLLER,
@@ -82,6 +72,19 @@ enum EFirmwareVer
FirmwareVer_6_X,
FirmwareVer_Total
};
enum ESO7_AXIS_TYPE
{
E_AXIS_Y=1,
E_AXIS_X=2,
E_AXIS_Z=3
};
enum ESO7_WRITE_FPGA_DATA_ADDR
{
E_WRITE_MOTOR_FLAG=9,
E_WRITE_EQUIDISTANCE=10,
E_WRITE_ACCURA_ERR=11,
E_WRITE_TOTAL=16
};
enum ESO7_CONTROLLER_IO_ADDR
{
ESO7_CONTROLLER_INPUT_PORT_ADDR=5,
@@ -123,6 +126,7 @@ typedef struct s_so7_axis // axis parameters
long _scale_probe;
double _dSet_Zero_Pos;
long _lSet_Zero_Pos;
double _ReCorded_Pos;
} SO7AXIS;
struct s_so7_axis_config // axis configuration
{
@@ -265,6 +269,8 @@ struct struct_so7_machine
double dRotaryCirclDis;
char SEQ_NUMBER;
char MotionType;
int MotionFinishedCnts;
BOOL MotionFinished;
struct s_so7_axis x;
struct s_so7_axis y;
struct s_so7_axis z;
@@ -394,8 +400,11 @@ public:
SSI_STATUS_MOTION ExtractAppPath(CString &Path);
SSI_STATUS_MOTION so7_motion_startup(double x_scale_resolution, double y_scale_resolution, double z_scale_resolution);
SSI_STATUS_MOTION so7_motion_init_firmware_para();
bool so7_motion_is_homed();
SSI_STATUS_MOTION so7_motion_Dcc_Home();
SSI_STATUS_MOTION so7_motion_Dcc_HomeXYZ(char cHomeMachineMode=1);
SSI_STATUS_MOTION so7_motion_Dcc_Home_R();
SSI_STATUS_MOTION so7_Motion_R_IsHomed(bool &bHomed);
SSI_STATUS_MOTION so7_Motion_R_IsMotionFInished(bool &bFinished);
@@ -414,7 +423,10 @@ public:
SSI_STATUS_MOTION _get_xyz_index(long & lX, long & lY, long & lZ);
SSI_STATUS_MOTION so7_motion_get_position_xyz(double & dX, double & dY, double & dZ);
SSI_STATUS_MOTION so7_motion_set_position_xyz(double dX, double dY, double dZ, bool bWait);
SSI_STATUS_MOTION so7_motion_set_speed_xyz(double dPercentSpeed);
SSI_STATUS_MOTION so7_Motion_XYZ_IsMotionFinished(bool &bFinished);
BOOL IsMotionFinishedManual(BOOL _BResetCnts=FALSE);
SSI_STATUS_MOTION so7_motion_set_speed_xyz(EMACHINE_AXIS cAxis,char cSpeedGear,char Acce,char cHoldSpeed,char cStartSpeed,char cRefreshCycle,double dBufferDis);
SSI_STATUS_MOTION so7_motion_get_speed_xyz(double &dPercentSpeed);
SSI_STATUS_MOTION so7_motion_set_position_R(double dR,bool bWait);
SSI_STATUS_MOTION so7_motion_get_position_R(double & dR);
@@ -423,6 +435,10 @@ public:
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 so7_motion_set_all_speed_para();
SSI_STATUS_MOTION so7_motion_get_all_speed_para();
SSI_STATUS_MOTION _calculate_straightline_motion(double dSpeedMM);
SSI_STATUS_MOTION so7_optics_set_scale_position(long lScale);
@@ -434,7 +450,7 @@ public:
SSI_STATUS_MOTION so7_light_set_light_off();
SSI_STATUS_MOTION so7_light_set_light();
SSI_STATUS_MOTION so7_light_set_lamp_state(double dBottomPercent, double dTopPercent);
SSI_STATUS_MOTION so7_light_set_lamp_state(double dTopLightPercent,double dBottomLightPercent,double dCoaxialLightPercent,double dReservedLightPercent,double dRingLightPercent,char cOuterRingLightSwitch,char cInnerRingLightSwitch);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_MOVE_X(char SpeedGear);
SSI_STATUS_MOTION _send_cmd_SO7_CMD_MOVE_Y(char SpeedGear);