diff --git a/api/reg_index.hpp b/api/reg_index.hpp index 3283501..fa6a8d2 100644 --- a/api/reg_index.hpp +++ b/api/reg_index.hpp @@ -71,10 +71,7 @@ typedef enum { /******************************************************************************* * MOTOR_DEFAULT * *******************************************************************************/ - kreg_robot_move = REG_INDEX(10, 0, 0), // 机器人X是否在移动 kreg_robot_pos = REG_INDEX(10, 0, 1), // 机器人x坐标 - kreg_robot_velocity = REG_INDEX(10, 0, 2), // 机器人x速度 - kreg_robot_torque = REG_INDEX(10, 0, 3), // 机器人x电流 kreg_motor_shift = REG_INDEX(10, 50, 0), // x偏移 kreg_motor_shaft = REG_INDEX(10, 50, 1), // x轴是否反转 @@ -84,10 +81,10 @@ typedef enum { kreg_motor_default_acc = REG_INDEX(10, 50, 5), // 默认加速度 kreg_motor_default_dec = REG_INDEX(10, 50, 6), // 默认减速度 kreg_motor_default_break_dec = REG_INDEX(10, 50, 7), // 默认减速度 - kreg_stepmotor_ihold = REG_INDEX(10, 50, 8), // 步进电机电流配置 - kreg_stepmotor_irun = REG_INDEX(10, 50, 9), // 步进电机电流配置 - kreg_stepmotor_iholddelay = REG_INDEX(10, 50, 10), // 步进电机电流配置 - kreg_stepmotor_iglobalscaler = REG_INDEX(10, 50, 11), // 步进电机电流配置 + kreg_motor_ihold = REG_INDEX(10, 50, 8), // 步进电机电流配置 + kreg_motor_irun = REG_INDEX(10, 50, 9), // 步进电机电流配置 + kreg_motor_iholddelay = REG_INDEX(10, 50, 10), // 步进电机电流配置 + kreg_motor_iglobalscaler = REG_INDEX(10, 50, 11), // 步进电机电流配置 kreg_motor_run_to_zero_max_d = REG_INDEX(10, 50, 21), // x轴回零最大距离 kreg_motor_look_zero_edge_max_d = REG_INDEX(10, 50, 22), // x轴找零边缘最大距离 kreg_motor_run_to_zero_speed = REG_INDEX(10, 50, 23), // 回零速度 diff --git a/api/reg_index_table.cpp b/api/reg_index_table.cpp index 7c9e87c..cdb045f 100644 --- a/api/reg_index_table.cpp +++ b/api/reg_index_table.cpp @@ -46,10 +46,7 @@ static reg_index_table_iterm_t iterms[] = { {"kreg_pwm7_ctrl", kreg_pwm7_ctrl}, {"kreg_pwm7_duty", kreg_pwm7_duty}, {"kreg_pwm7_freq", kreg_pwm7_freq}, - {"kreg_robot_move", kreg_robot_move}, {"kreg_robot_pos", kreg_robot_pos}, - {"kreg_robot_velocity", kreg_robot_velocity}, - {"kreg_robot_torque", kreg_robot_torque}, {"kreg_motor_shift", kreg_motor_shift}, {"kreg_motor_shaft", kreg_motor_shaft}, {"kreg_motor_one_circle_pulse", kreg_motor_one_circle_pulse}, @@ -58,10 +55,10 @@ static reg_index_table_iterm_t iterms[] = { {"kreg_motor_default_acc", kreg_motor_default_acc}, {"kreg_motor_default_dec", kreg_motor_default_dec}, {"kreg_motor_default_break_dec", kreg_motor_default_break_dec}, - {"kreg_stepmotor_ihold", kreg_stepmotor_ihold}, - {"kreg_stepmotor_irun", kreg_stepmotor_irun}, - {"kreg_stepmotor_iholddelay", kreg_stepmotor_iholddelay}, - {"kreg_stepmotor_iglobalscaler", kreg_stepmotor_iglobalscaler}, + {"kreg_motor_ihold", kreg_motor_ihold}, + {"kreg_motor_irun", kreg_motor_irun}, + {"kreg_motor_iholddelay", kreg_motor_iholddelay}, + {"kreg_motor_iglobalscaler", kreg_motor_iglobalscaler}, {"kreg_motor_run_to_zero_max_d", kreg_motor_run_to_zero_max_d}, {"kreg_motor_look_zero_edge_max_d", kreg_motor_look_zero_edge_max_d}, {"kreg_motor_run_to_zero_speed", kreg_motor_run_to_zero_speed},