From b442a60e6d477f768d6d1f7739d5f5cdd3d2fd34 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 2 Jun 2024 17:28:36 +0800 Subject: [PATCH] recode --- api/reg_index.hpp | 144 +++++++++++++++++++++--------------------------- api/reg_index_table.cpp | 142 +---------------------------------------------- api/zi_module.hpp | 3 - 3 files changed, 63 insertions(+), 226 deletions(-) diff --git a/api/reg_index.hpp b/api/reg_index.hpp index fa6a8d2..aea8fc8 100644 --- a/api/reg_index.hpp +++ b/api/reg_index.hpp @@ -9,15 +9,15 @@ typedef enum { /******************************************************************************* * 模块通用配置和状态 * *******************************************************************************/ - kreg_module_version = REG_INDEX(0, 0, 0), // 模块版本 - kreg_module_type = REG_INDEX(0, 0, 1), // 模块类型 - kreg_module_status = REG_INDEX(0, 0, 2), // 0idle,1busy,2error - kreg_module_errorcode = REG_INDEX(0, 0, 3), // inited_flag - kreg_module_initflag = REG_INDEX(0, 0, 4), // inited_flag - kreg_module_enableflag = REG_INDEX(0, 0, 5), // 0idle,1busy,2error - kreg_module_errorbitflag0 = REG_INDEX(0, 0, 6), // 模块异常标志,bit,每个模块自定义 - kreg_module_input_state = REG_INDEX(0, 0, 8), // - kreg_module_output_state = REG_INDEX(0, 0, 9), // + kreg_module_version = REG_INDEX(0, 0, 0), // 模块版本 + kreg_module_type = REG_INDEX(0, 0, 1), // 模块类型 + kreg_module_status = REG_INDEX(0, 0, 2), // 0idle,1busy,2error + kreg_module_errorcode = REG_INDEX(0, 0, 3), // inited_flag + // kreg_module_initflag = REG_INDEX(0, 0, 4), // inited_flag + // kreg_module_enableflag = REG_INDEX(0, 0, 5), // 0idle,1busy,2error + // kreg_module_errorbitflag0 = REG_INDEX(0, 0, 6), // 模块异常标志,bit,每个模块自定义 + // kreg_module_input_state = REG_INDEX(0, 0, 8), // + // kreg_module_output_state = REG_INDEX(0, 0, 9), // kreg_module_raw_sector_size = REG_INDEX(0, 0, 10), // sector_size kreg_module_raw_sector_num = REG_INDEX(0, 0, 11), // @@ -30,90 +30,40 @@ typedef enum { kreg_sensor_temperature3 = REG_INDEX(2, 0, 3), // 温度4 /******************************************************************************* - * 简单控制 * - *******************************************************************************/ - kreg_pwm0_ctrl = REG_INDEX(3, 0, 0), // - kreg_pwm0_duty = REG_INDEX(3, 0, 1), // - kreg_pwm0_freq = REG_INDEX(3, 0, 2), // - - kreg_pwm1_ctrl = REG_INDEX(3, 10, 0), // - kreg_pwm1_duty = REG_INDEX(3, 10, 1), // - kreg_pwm1_freq = REG_INDEX(3, 10, 2), // - - kreg_pwm2_ctrl = REG_INDEX(3, 20, 0), // - kreg_pwm2_duty = REG_INDEX(3, 20, 1), // - kreg_pwm2_freq = REG_INDEX(3, 20, 2), // - - kreg_pwm3_ctrl = REG_INDEX(3, 30, 0), // - kreg_pwm3_duty = REG_INDEX(3, 30, 1), // - kreg_pwm3_freq = REG_INDEX(3, 30, 2), // - - kreg_pwm4_ctrl = REG_INDEX(3, 40, 0), // - kreg_pwm4_duty = REG_INDEX(3, 40, 1), // - kreg_pwm4_freq = REG_INDEX(3, 40, 2), // - - kreg_pwm5_ctrl = REG_INDEX(3, 50, 0), // - kreg_pwm5_duty = REG_INDEX(3, 50, 1), // - kreg_pwm5_freq = REG_INDEX(3, 50, 2), // - - kreg_pwm6_ctrl = REG_INDEX(3, 60, 0), // - kreg_pwm6_duty = REG_INDEX(3, 60, 1), // - kreg_pwm6_freq = REG_INDEX(3, 60, 2), // - - kreg_pwm7_ctrl = REG_INDEX(3, 70, 0), // - kreg_pwm7_duty = REG_INDEX(3, 70, 1), // - kreg_pwm7_freq = REG_INDEX(3, 70, 2), // - - /******************************************************************************* * 机械人通用配置 * *******************************************************************************/ /******************************************************************************* * MOTOR_DEFAULT * *******************************************************************************/ - kreg_robot_pos = REG_INDEX(10, 0, 1), // 机器人x坐标 - - kreg_motor_shift = REG_INDEX(10, 50, 0), // x偏移 - kreg_motor_shaft = REG_INDEX(10, 50, 1), // x轴是否反转 - kreg_motor_one_circle_pulse = REG_INDEX(10, 50, 2), // x轴一圈脉冲数 - kreg_motor_one_circle_pulse_denominator = REG_INDEX(10, 50, 3), // 设置一圈脉冲数的分母 - kreg_motor_default_velocity = REG_INDEX(10, 50, 4), // 默认速度 - 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_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), // 回零速度 - kreg_motor_run_to_zero_dec = REG_INDEX(10, 50, 24), // 回零减速度 - kreg_motor_look_zero_edge_speed = REG_INDEX(10, 50, 25), // 找零边缘速度 - kreg_motor_look_zero_edge_dec = REG_INDEX(10, 50, 26), // 找零边缘减速度 - kreg_motor_default_torque = REG_INDEX(10, 50, 27), // 默认扭矩 - - kreg_motor_max_d = REG_INDEX(10, 50, 28), // 最大限制距离 - kreg_motor_min_d = REG_INDEX(10, 50, 29), // 最小限制距离 + kreg_step_motor_pos = REG_INDEX(10, 0, 1), // 机器人x坐标 + kreg_step_motor_io_state = REG_INDEX(10, 0, 2), // IO状态 + kreg_step_motor_shift = REG_INDEX(10, 50, 0), // x偏移 + kreg_step_motor_shaft = REG_INDEX(10, 50, 1), // x轴是否反转 + kreg_step_motor_one_circle_pulse = REG_INDEX(10, 50, 2), // x轴一圈脉冲数 + kreg_step_motor_one_circle_pulse_denominator = REG_INDEX(10, 50, 3), // 设置一圈脉冲数的分母 + kreg_step_motor_default_velocity = REG_INDEX(10, 50, 4), // 默认速度 + kreg_step_motor_default_acc = REG_INDEX(10, 50, 5), // 默认加速度 + kreg_step_motor_default_dec = REG_INDEX(10, 50, 6), // 默认减速度 + kreg_step_motor_default_break_dec = REG_INDEX(10, 50, 7), // 默认减速度 + kreg_step_motor_ihold = REG_INDEX(10, 50, 8), // 步进电机电流配置 + kreg_step_motor_irun = REG_INDEX(10, 50, 9), // 步进电机电流配置 + kreg_step_motor_iholddelay = REG_INDEX(10, 50, 10), // 步进电机电流配置 + kreg_step_motor_iglobalscaler = REG_INDEX(10, 50, 11), // 步进电机电流配置 + kreg_step_motor_run_to_zero_max_d = REG_INDEX(10, 50, 21), // x轴回零最大距离 + kreg_step_motor_look_zero_edge_max_d = REG_INDEX(10, 50, 22), // x轴找零边缘最大距离 + kreg_step_motor_run_to_zero_speed = REG_INDEX(10, 50, 23), // 回零速度 + kreg_step_motor_run_to_zero_dec = REG_INDEX(10, 50, 24), // 回零减速度 + kreg_step_motor_look_zero_edge_speed = REG_INDEX(10, 50, 25), // 找零边缘速度 + kreg_step_motor_look_zero_edge_dec = REG_INDEX(10, 50, 26), // 找零边缘减速度 + kreg_step_motor_default_torque = REG_INDEX(10, 50, 27), // 默认扭矩 + kreg_step_motor_max_d = REG_INDEX(10, 50, 28), // 最大限制距离 + kreg_step_motor_min_d = REG_INDEX(10, 50, 29), // 最小限制距离 /******************************************************************************* * MOTOR_X * *******************************************************************************/ - kreg_xyrobot_x_pos = REG_INDEX(11, 0, 1), // 机器人x坐标 - kreg_xyrobot_y_pos = REG_INDEX(12, 0, 1), // 机器人x坐标 - kreg_xyrobot_x_shift = REG_INDEX(11, 50, 0), // x偏移 - kreg_xyrobot_y_shift = REG_INDEX(12, 50, 0), // y偏移 - kreg_xyrobot_x_shaft = REG_INDEX(11, 50, 1), // x轴是否反转 - kreg_xyrobot_y_shaft = REG_INDEX(12, 50, 1), // y轴是否反转 - kreg_xyrobot_x_one_circle_pulse = REG_INDEX(11, 50, 2), // x轴一圈脉冲数 - kreg_xyrobot_y_one_circle_pulse = REG_INDEX(12, 50, 2), // y轴一圈脉冲数 - kreg_xyrobot_run_to_zero_max_x_d = REG_INDEX(11, 50, 20), // x轴回零最大距离 - kreg_xyrobot_run_to_zero_max_y_d = REG_INDEX(12, 50, 20), // y轴回零最大距离 - kreg_xyrobot_look_zero_edge_max_x_d = REG_INDEX(11, 50, 21), // x轴找零边缘最大距离 - kreg_xyrobot_look_zero_edge_max_y_d = REG_INDEX(12, 50, 21), // y轴找零边缘最大距离 - kreg_xyrobot_robot_type = REG_INDEX(20, 50, 0), // 机器人类型 0:hbot 1:corexy - /******************************************************************************* * PID控制器(3000->4000) * *******************************************************************************/ @@ -204,6 +154,36 @@ typedef enum { kreg_laster_scaner_adc_result_overflow = REG_INDEX(43, 0, 13), kreg_laster_scaner_laster_intensity = REG_INDEX(43, 0, 14), + /*********************************************************************************************************************** + * NEW_API * + ***********************************************************************************************************************/ + + kreg_xyrobot_default_velocity = REG_INDEX(100, 0, 0), + kreg_xyrobot_default_acc = REG_INDEX(100, 0, 1), + kreg_xyrobot_default_dec = REG_INDEX(100, 0, 2), + kreg_xyrobot_default_break_dec = REG_INDEX(100, 0, 3), + kreg_xyrobot_run_to_zero_speed = REG_INDEX(100, 0, 4), + kreg_xyrobot_run_to_zero_dec = REG_INDEX(100, 0, 5), + kreg_xyrobot_look_zero_edge_speed = REG_INDEX(100, 0, 6), + kreg_xyrobot_look_zero_edge_dec = REG_INDEX(100, 0, 7), + kreg_xyrobot_ihold = REG_INDEX(100, 0, 8), + kreg_xyrobot_irun = REG_INDEX(100, 0, 9), + kreg_xyrobot_iholddelay = REG_INDEX(100, 0, 10), + + kreg_xyrobot_robot_type = REG_INDEX(100, 50, 0), // 机器人类型 0:hbot 1:corexy + kreg_xyrobot_x_shift = REG_INDEX(100, 50, 1), // x偏移 + kreg_xyrobot_y_shift = REG_INDEX(100, 50, 2), // y偏移 + kreg_xyrobot_x_shaft = REG_INDEX(100, 50, 3), // x轴是否反转 + kreg_xyrobot_y_shaft = REG_INDEX(100, 50, 4), // y轴是否反转 + kreg_xyrobot_x_one_circle_pulse = REG_INDEX(100, 50, 5), // x轴一圈脉冲数 + kreg_xyrobot_y_one_circle_pulse = REG_INDEX(100, 50, 6), // y轴一圈脉冲数 + kreg_xyrobot_run_to_zero_max_x_d = REG_INDEX(100, 50, 7), // x轴回零最大距离 + kreg_xyrobot_run_to_zero_max_y_d = REG_INDEX(100, 50, 8), // y轴回零最大距离 + kreg_xyrobot_look_zero_edge_max_x_d = REG_INDEX(100, 50, 9), // x轴找零边缘最大距离 + kreg_xyrobot_look_zero_edge_max_y_d = REG_INDEX(100, 50, 10), // y轴找零边缘最大距离 + kreg_xyrobot_io_state0 = REG_INDEX(100, 50, 11), // IO状态 + kreg_xyrobot_io_state1 = REG_INDEX(100, 50, 12), // IO状态 + } reg_index_t; } // namespace iflytop diff --git a/api/reg_index_table.cpp b/api/reg_index_table.cpp index cdb045f..587c154 100644 --- a/api/reg_index_table.cpp +++ b/api/reg_index_table.cpp @@ -6,147 +6,7 @@ #include "reg_index.hpp" using namespace iflytop; -static reg_index_table_iterm_t iterms[] = { - {"kreg_module_version", kreg_module_version}, - {"kreg_module_type", kreg_module_type}, - {"kreg_module_status", kreg_module_status}, - {"kreg_module_errorcode", kreg_module_errorcode}, - {"kreg_module_initflag", kreg_module_initflag}, - {"kreg_module_enableflag", kreg_module_enableflag}, - {"kreg_module_errorbitflag0", kreg_module_errorbitflag0}, - {"kreg_module_input_state", kreg_module_input_state}, - {"kreg_module_output_state", kreg_module_output_state}, - {"kreg_module_raw_sector_size", kreg_module_raw_sector_size}, - {"kreg_module_raw_sector_num", kreg_module_raw_sector_num}, - {"kreg_sensor_temperature0", kreg_sensor_temperature0}, - {"kreg_sensor_temperature1", kreg_sensor_temperature1}, - {"kreg_sensor_temperature2", kreg_sensor_temperature2}, - {"kreg_sensor_temperature3", kreg_sensor_temperature3}, - {"kreg_pwm0_ctrl", kreg_pwm0_ctrl}, - {"kreg_pwm0_duty", kreg_pwm0_duty}, - {"kreg_pwm0_freq", kreg_pwm0_freq}, - {"kreg_pwm1_ctrl", kreg_pwm1_ctrl}, - {"kreg_pwm1_duty", kreg_pwm1_duty}, - {"kreg_pwm1_freq", kreg_pwm1_freq}, - {"kreg_pwm2_ctrl", kreg_pwm2_ctrl}, - {"kreg_pwm2_duty", kreg_pwm2_duty}, - {"kreg_pwm2_freq", kreg_pwm2_freq}, - {"kreg_pwm3_ctrl", kreg_pwm3_ctrl}, - {"kreg_pwm3_duty", kreg_pwm3_duty}, - {"kreg_pwm3_freq", kreg_pwm3_freq}, - {"kreg_pwm4_ctrl", kreg_pwm4_ctrl}, - {"kreg_pwm4_duty", kreg_pwm4_duty}, - {"kreg_pwm4_freq", kreg_pwm4_freq}, - {"kreg_pwm5_ctrl", kreg_pwm5_ctrl}, - {"kreg_pwm5_duty", kreg_pwm5_duty}, - {"kreg_pwm5_freq", kreg_pwm5_freq}, - {"kreg_pwm6_ctrl", kreg_pwm6_ctrl}, - {"kreg_pwm6_duty", kreg_pwm6_duty}, - {"kreg_pwm6_freq", kreg_pwm6_freq}, - {"kreg_pwm7_ctrl", kreg_pwm7_ctrl}, - {"kreg_pwm7_duty", kreg_pwm7_duty}, - {"kreg_pwm7_freq", kreg_pwm7_freq}, - {"kreg_robot_pos", kreg_robot_pos}, - {"kreg_motor_shift", kreg_motor_shift}, - {"kreg_motor_shaft", kreg_motor_shaft}, - {"kreg_motor_one_circle_pulse", kreg_motor_one_circle_pulse}, - {"kreg_motor_one_circle_pulse_denominator", kreg_motor_one_circle_pulse_denominator}, - {"kreg_motor_default_velocity", kreg_motor_default_velocity}, - {"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_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}, - {"kreg_motor_run_to_zero_dec", kreg_motor_run_to_zero_dec}, - {"kreg_motor_look_zero_edge_speed", kreg_motor_look_zero_edge_speed}, - {"kreg_motor_look_zero_edge_dec", kreg_motor_look_zero_edge_dec}, - {"kreg_motor_default_torque", kreg_motor_default_torque}, - {"kreg_motor_max_d", kreg_motor_max_d}, - {"kreg_motor_min_d", kreg_motor_min_d}, - {"kreg_xyrobot_x_pos", kreg_xyrobot_x_pos}, - {"kreg_xyrobot_y_pos", kreg_xyrobot_y_pos}, - {"kreg_xyrobot_x_shift", kreg_xyrobot_x_shift}, - {"kreg_xyrobot_y_shift", kreg_xyrobot_y_shift}, - {"kreg_xyrobot_x_shaft", kreg_xyrobot_x_shaft}, - {"kreg_xyrobot_y_shaft", kreg_xyrobot_y_shaft}, - {"kreg_xyrobot_x_one_circle_pulse", kreg_xyrobot_x_one_circle_pulse}, - {"kreg_xyrobot_y_one_circle_pulse", kreg_xyrobot_y_one_circle_pulse}, - {"kreg_xyrobot_run_to_zero_max_x_d", kreg_xyrobot_run_to_zero_max_x_d}, - {"kreg_xyrobot_run_to_zero_max_y_d", kreg_xyrobot_run_to_zero_max_y_d}, - {"kreg_xyrobot_look_zero_edge_max_x_d", kreg_xyrobot_look_zero_edge_max_x_d}, - {"kreg_xyrobot_look_zero_edge_max_y_d", kreg_xyrobot_look_zero_edge_max_y_d}, - {"kreg_xyrobot_robot_type", kreg_xyrobot_robot_type}, - {"kreg_pid_target", kreg_pid_target}, - {"kreg_pid_nowoutput", kreg_pid_nowoutput}, - {"kreg_pid_feedbackval", kreg_pid_feedbackval}, - {"kreg_pid_kp", kreg_pid_kp}, - {"kreg_pid_ki", kreg_pid_ki}, - {"kreg_pid_kd", kreg_pid_kd}, - {"kreg_pid_max_output", kreg_pid_max_output}, - {"kreg_pid_min_output", kreg_pid_min_output}, - {"kreg_pid_max_integral", kreg_pid_max_integral}, - {"kreg_pid_min_integral", kreg_pid_min_integral}, - {"kreg_error_limit", kreg_error_limit}, - {"kreg_compute_interval", kreg_compute_interval}, - {"kreg_fan0_ctrl_speed_level", kreg_fan0_ctrl_speed_level}, - {"kreg_fan1_ctrl_speed_level", kreg_fan1_ctrl_speed_level}, - {"kreg_fan2_ctrl_speed_level", kreg_fan2_ctrl_speed_level}, - {"kreg_fan3_ctrl_speed_level", kreg_fan3_ctrl_speed_level}, - {"kreg_fan4_ctrl_speed_level", kreg_fan4_ctrl_speed_level}, - {"kreg_fan0_speed_level", kreg_fan0_speed_level}, - {"kreg_fan1_speed_level", kreg_fan1_speed_level}, - {"kreg_fan2_speed_level", kreg_fan2_speed_level}, - {"kreg_fan3_speed_level", kreg_fan3_speed_level}, - {"kreg_fan4_speed_level", kreg_fan4_speed_level}, - {"kreg_pwm_pump0_ctrl_speed_level", kreg_pwm_pump0_ctrl_speed_level}, - {"kreg_pwm_pump1_ctrl_speed_level", kreg_pwm_pump1_ctrl_speed_level}, - {"kreg_pwm_pump2_ctrl_speed_level", kreg_pwm_pump2_ctrl_speed_level}, - {"kreg_pwm_pump3_ctrl_speed_level", kreg_pwm_pump3_ctrl_speed_level}, - {"kreg_pwm_pump4_ctrl_speed_level", kreg_pwm_pump4_ctrl_speed_level}, - {"kreg_pwm_pump0_speed_level", kreg_pwm_pump0_speed_level}, - {"kreg_pwm_pump1_speed_level", kreg_pwm_pump1_speed_level}, - {"kreg_pwm_pump2_speed_level", kreg_pwm_pump2_speed_level}, - {"kreg_pwm_pump3_speed_level", kreg_pwm_pump3_speed_level}, - {"kreg_pwm_pump4_speed_level", kreg_pwm_pump4_speed_level}, - {"kreg_pipette_pos_ul", kreg_pipette_pos_ul}, - {"kreg_pipette_capactitance_val", kreg_pipette_capactitance_val}, - {"kreg_pipette_tip_state", kreg_pipette_tip_state}, - {"kreg_pipette_limit_ul", kreg_pipette_limit_ul}, - {"kreg_self_reflecting_laser_sensor_transmitting_power", kreg_self_reflecting_laser_sensor_transmitting_power}, - {"kreg_self_reflecting_laser_sensor_receiving_tube_gain", kreg_self_reflecting_laser_sensor_receiving_tube_gain}, - {"kreg_self_reflecting_laser_sensor_sample_interval_ms", kreg_self_reflecting_laser_sensor_sample_interval_ms}, - {"kreg_self_reflecting_laser_sensor_num_samples", kreg_self_reflecting_laser_sensor_num_samples}, - {"kreg_boditech_optical_scan_type", kreg_boditech_optical_scan_type}, - {"kreg_boditech_optical_scan_start_pos", kreg_boditech_optical_scan_start_pos}, - {"kreg_boditech_optical_scan_direction", kreg_boditech_optical_scan_direction}, - {"kreg_boditech_optical_scan_step_interval", kreg_boditech_optical_scan_step_interval}, - {"kreg_boditech_optical_scan_pointnum", kreg_boditech_optical_scan_pointnum}, - {"kreg_boditech_optical_channel_select_num", kreg_boditech_optical_channel_select_num}, - {"kreg_boditech_optical_laster_gain", kreg_boditech_optical_laster_gain}, - {"kreg_boditech_optical_scan_gain", kreg_boditech_optical_scan_gain}, - {"kreg_boditech_optical_trf_uvled_on_duration_us", kreg_boditech_optical_trf_uvled_on_duration_us}, - {"kreg_boditech_optical_trf_uvled_off_duration_us", kreg_boditech_optical_trf_uvled_off_duration_us}, - {"kreg_boditech_optical_trf_scan_delay_us", kreg_boditech_optical_trf_scan_delay_us}, - {"kreg_boditech_optical_trf_scan_duration_us", kreg_boditech_optical_trf_scan_duration_us}, - {"kreg_boditech_optical_scan_gain_adjust_suggestion", kreg_boditech_optical_scan_gain_adjust_suggestion}, - {"kreg_boditech_optical_adc_result_overflow", kreg_boditech_optical_adc_result_overflow}, - {"kreg_boditech_optical_laster_intensity", kreg_boditech_optical_laster_intensity}, - {"kreg_laster_scaner_scan_type", kreg_laster_scaner_scan_type}, - {"kreg_laster_scaner_scan_start_pos", kreg_laster_scaner_scan_start_pos}, - {"kreg_laster_scaner_scan_direction", kreg_laster_scaner_scan_direction}, - {"kreg_laster_scaner_scan_step_interval", kreg_laster_scaner_scan_step_interval}, - {"kreg_laster_scaner_scan_pointnum", kreg_laster_scaner_scan_pointnum}, - {"kreg_laster_scaner_laster_gain", kreg_laster_scaner_laster_gain}, - {"kreg_laster_scaner_scan_gain", kreg_laster_scaner_scan_gain}, - {"kreg_laster_scaner_scan_gain_adjust_suggestion", kreg_laster_scaner_scan_gain_adjust_suggestion}, - {"kreg_laster_scaner_adc_result_overflow", kreg_laster_scaner_adc_result_overflow}, - {"kreg_laster_scaner_laster_intensity", kreg_laster_scaner_laster_intensity}, -}; +static reg_index_table_iterm_t iterms[] = {}; namespace iflytop { void reg_index_table_get(reg_index_table_iterm_t** table, int32_t* size) { *size = sizeof(iterms) / sizeof(iterms[0]); diff --git a/api/zi_module.hpp b/api/zi_module.hpp index 530fc00..c8a7519 100644 --- a/api/zi_module.hpp +++ b/api/zi_module.hpp @@ -35,9 +35,6 @@ using namespace std; PROCESS_REG(kreg_module_type, /* */ REG_GET(module_type), ACTION_NONE); \ PROCESS_REG(kreg_module_status, /* */ module_get_status(&val), ACTION_NONE); \ PROCESS_REG(kreg_module_errorcode, /* */ REG_GET(m_com_reg.module_errorcode), ACTION_NONE); \ - PROCESS_REG(kreg_module_initflag, /* */ module_get_inited_flag(&val), module_set_inited_flag(val)); \ - PROCESS_REG(kreg_module_errorbitflag0, /* */ REG_GET(m_com_reg.module_errorbitflag0), ACTION_NONE); \ - PROCESS_REG(kreg_module_enableflag, /* */ REG_GET(m_com_reg.module_enable), ACTION_NONE); typedef struct { int32_t module_errorcode;