修改常用功能为中文。

This commit is contained in:
TAO Cheng
2014-03-14 14:46:07 +08:00
parent 447aa91fd9
commit 34afd5563f
19 changed files with 352 additions and 155 deletions
@@ -537,7 +537,7 @@ CSO7_Proto::CSO7_Proto()
g_machine.s_machine_config.zm_axis._speed._short_=0;
g_machine.s_machine_config.motion._EnCloseLoop=FALSE;
g_machine.s_machine_config.motion._RetryTimes=5;
g_machine.s_machine_config.motion._RetryTimes=0;
g_machine.s_machine_config.motion._ShiftPositionX=0.0;
g_machine.s_machine_config.motion._ShiftPositionY=0.0;
g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
@@ -4876,13 +4876,13 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_AXIS_XYZ()
if (g_machine.y._scale_pos._long_ > 8388608)
g_machine.y._scale_pos._long_=g_machine.y._scale_pos._long_-16777216;
// if (g_machine.z._scale_pos._long_ > 8388608)
// g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-16777216;
if (g_machine.z._scale_pos._long_ > 8388608)
g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-16777216;
// for rotary table
if (g_machine.z._scale_pos._long_ > 4194304)
g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-8388608;
//if (g_machine.z._scale_pos._long_ > 4194304)
// g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-8388608;
return SSI_STATUS_MOTION_NORMAL;
};