From 82688278acc674cf0ad6a3a5f9017b93cc45a670 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 6 Jun 2024 22:12:02 +0800 Subject: [PATCH] update --- api/apibasic/reg_index.cpp | 7 ------- api/apibasic/reg_index.hpp | 24 +++++++++--------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/api/apibasic/reg_index.cpp b/api/apibasic/reg_index.cpp index 12bda7e..3aaf6a3 100644 --- a/api/apibasic/reg_index.cpp +++ b/api/apibasic/reg_index.cpp @@ -113,19 +113,12 @@ static reginfo_t table[] = { REG_ITERM(kreg_step_motor_one_circle_pulse), REG_ITERM(kreg_step_motor_one_circle_pulse_denominator), REG_ITERM(kreg_step_motor_default_velocity), - REG_ITERM(kreg_step_motor_default_acc), - REG_ITERM(kreg_step_motor_default_dec), - REG_ITERM(kreg_step_motor_default_break_dec), REG_ITERM(kreg_step_motor_ihold), REG_ITERM(kreg_step_motor_irun), REG_ITERM(kreg_step_motor_iholddelay), REG_ITERM(kreg_step_motor_iglobalscaler), - REG_ITERM(kreg_step_motor_run_to_zero_max_d), - REG_ITERM(kreg_step_motor_look_zero_edge_max_d), REG_ITERM(kreg_step_motor_run_to_zero_speed), - REG_ITERM(kreg_step_motor_run_to_zero_dec), REG_ITERM(kreg_step_motor_look_zero_edge_speed), - REG_ITERM(kreg_step_motor_look_zero_edge_dec), REG_ITERM(kreg_step_motor_max_d), REG_ITERM(kreg_step_motor_min_d), REG_ITERM(kreg_step_motor_in_debug_mode), diff --git a/api/apibasic/reg_index.hpp b/api/apibasic/reg_index.hpp index f46ee6f..95cf5b8 100644 --- a/api/apibasic/reg_index.hpp +++ b/api/apibasic/reg_index.hpp @@ -162,30 +162,24 @@ typedef enum { kreg_step_motor_one_circle_pulse = REG_INDEX(101, 50, 2), // x轴一圈脉冲数 kreg_step_motor_one_circle_pulse_denominator = REG_INDEX(101, 50, 3), // 设置一圈脉冲数的分母 kreg_step_motor_default_velocity = REG_INDEX(101, 50, 4), // 默认速度 - kreg_step_motor_default_acc = REG_INDEX(101, 50, 5), // 默认加速度 - kreg_step_motor_default_dec = REG_INDEX(101, 50, 6), // 默认减速度 - kreg_step_motor_default_break_dec = REG_INDEX(101, 50, 7), // 默认减速度 kreg_step_motor_ihold = REG_INDEX(101, 50, 8), // 步进电机电流配置 kreg_step_motor_irun = REG_INDEX(101, 50, 9), // 步进电机电流配置 kreg_step_motor_iholddelay = REG_INDEX(101, 50, 10), // 步进电机电流配置 kreg_step_motor_iglobalscaler = REG_INDEX(101, 50, 11), // 步进电机电流配置 - kreg_step_motor_run_to_zero_max_d = REG_INDEX(101, 50, 21), // x轴回零最大距离 - kreg_step_motor_look_zero_edge_max_d = REG_INDEX(101, 50, 22), // x轴找零边缘最大距离 kreg_step_motor_run_to_zero_speed = REG_INDEX(101, 50, 23), // 回零速度 - kreg_step_motor_run_to_zero_dec = REG_INDEX(101, 50, 24), // 回零减速度 kreg_step_motor_look_zero_edge_speed = REG_INDEX(101, 50, 25), // 找零边缘速度 - kreg_step_motor_look_zero_edge_dec = REG_INDEX(101, 50, 26), // 找零边缘减速度 kreg_step_motor_max_d = REG_INDEX(101, 50, 28), // 最大限制距离 kreg_step_motor_min_d = REG_INDEX(101, 50, 29), // 最小限制距离 kreg_step_motor_in_debug_mode = REG_INDEX(101, 50, 30), // 驱动器处于调试模式 - kreg_step_motor_vstart = REG_INDEX(101, 50, 31), // a1起作用的速度 - kreg_step_motor_a1 = REG_INDEX(101, 50, 32), // - kreg_step_motor_amax = REG_INDEX(101, 50, 32), - kreg_step_motor_v1 = REG_INDEX(101, 50, 33), - kreg_step_motor_dmax = REG_INDEX(101, 50, 34), - kreg_step_motor_d1 = REG_INDEX(101, 50, 35), - kreg_step_motor_vstop = REG_INDEX(101, 50, 36), - kreg_step_motor_tzerowait = REG_INDEX(101, 50, 37), + + kreg_step_motor_vstart = REG_INDEX(101, 50, 31), // a1起作用的速度 + kreg_step_motor_a1 = REG_INDEX(101, 50, 32), // + kreg_step_motor_amax = REG_INDEX(101, 50, 33), + kreg_step_motor_v1 = REG_INDEX(101, 50, 34), + kreg_step_motor_dmax = REG_INDEX(101, 50, 35), + kreg_step_motor_d1 = REG_INDEX(101, 50, 36), + kreg_step_motor_vstop = REG_INDEX(101, 50, 37), + kreg_step_motor_tzerowait = REG_INDEX(101, 50, 38), /*********************************************************************************************************************** * MINI_STEP_MOTOR *