From 59fdf6a80d2504ee170ea8921642c35027ca6e11 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 28 Oct 2023 21:37:27 +0800 Subject: [PATCH] update --- api/errorcode.cpp | 1 - api/reg_index.hpp | 46 ++++++++++++++++++++++++++++++++-------------- api/zi_module.hpp | 2 ++ 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/api/errorcode.cpp b/api/errorcode.cpp index a2a5c8b..e496dfc 100644 --- a/api/errorcode.cpp +++ b/api/errorcode.cpp @@ -120,7 +120,6 @@ const char* error2str(int32_t code) { ERR2STR(kcheckcode_is_error); ERR2STR(kcatch_exception); ERR2STR(khwardware_error_fan_error); - ERR2STR(ksys_error); ERR2STR(ksys_create_file_error); ERR2STR(ksys_create_dir_error); diff --git a/api/reg_index.hpp b/api/reg_index.hpp index f1f335e..be46f87 100644 --- a/api/reg_index.hpp +++ b/api/reg_index.hpp @@ -143,15 +143,15 @@ typedef enum { /******************************************************************************* * PID控制器(3000->4000) * *******************************************************************************/ - kreg_pid_kp = REG_INDEX(3000, 0), // kp - kreg_pid_ki = REG_INDEX(3000, 1), // ki - kreg_pid_kd = REG_INDEX(3000, 2), // kd - kreg_pid_max_max_output = REG_INDEX(3000, 3), // 最大输出 - kreg_pid_max_min_output = REG_INDEX(3000, 4), // 最小输出 - kreg_pid_max_max_integral = REG_INDEX(3000, 5), // 最大积分 - kreg_pid_max_min_integral = REG_INDEX(3000, 6), // 最小积分 - kreg_error_limit = REG_INDEX(3000, 7), // 误差限制 - kreg_compute_interval = REG_INDEX(3000, 8), // 计算间隔 + kreg_pid_kp = REG_INDEX(3000, 0), // kp + kreg_pid_ki = REG_INDEX(3000, 1), // ki + kreg_pid_kd = REG_INDEX(3000, 2), // kd + kreg_pid_max_output = REG_INDEX(3000, 3), // 最大输出 + kreg_pid_min_output = REG_INDEX(3000, 4), // 最小输出 + kreg_pid_max_integral = REG_INDEX(3000, 5), // 最大积分 + kreg_pid_min_integral = REG_INDEX(3000, 6), // 最小积分 + kreg_error_limit = REG_INDEX(3000, 7), // 误差限制 + kreg_compute_interval = REG_INDEX(3000, 8), // 计算间隔 kreg_pid_target = REG_INDEX(3050, 0), // 目标数值 kreg_pid_nowoutput = REG_INDEX(3050, 1), // 当前输出 @@ -172,11 +172,29 @@ typedef enum { kreg_fan3_speed_level = REG_INDEX(4010, 3), // 风扇实时转速0,1,2,3 kreg_fan4_speed_level = REG_INDEX(4010, 4), // 风扇实时转速0,1,2,3 - kreg_fan0_e_state = REG_INDEX(4010, 0), // 风扇是否工作正常 0:正常 1:异常 - kreg_fan1_e_state = REG_INDEX(4010, 1), // 风扇是否工作正常 0:正常 1:异常 - kreg_fan2_e_state = REG_INDEX(4010, 2), // 风扇是否工作正常 0:正常 1:异常 - kreg_fan3_e_state = REG_INDEX(4010, 3), // 风扇是否工作正常 0:正常 1:异常 - kreg_fan4_e_state = REG_INDEX(4010, 4), // 风扇是否工作正常 0:正常 1:异常 + kreg_fan0_e_state = REG_INDEX(4020, 0), // 风扇是否工作正常 0:正常 1:异常 + kreg_fan1_e_state = REG_INDEX(4020, 1), // 风扇是否工作正常 0:正常 1:异常 + kreg_fan2_e_state = REG_INDEX(4020, 2), // 风扇是否工作正常 0:正常 1:异常 + kreg_fan3_e_state = REG_INDEX(4020, 3), // 风扇是否工作正常 0:正常 1:异常 + kreg_fan4_e_state = REG_INDEX(4020, 4), // 风扇是否工作正常 0:正常 1:异常 + + kreg_pwm_pump0_ctrl_speed_level = REG_INDEX(4030, 0), // PWM水泵0,1,2,3 + kreg_pwm_pump1_ctrl_speed_level = REG_INDEX(4030, 1), // PWM水泵0,1,2,3 + kreg_pwm_pump2_ctrl_speed_level = REG_INDEX(4030, 2), // PWM水泵0,1,2,3 + kreg_pwm_pump3_ctrl_speed_level = REG_INDEX(4030, 3), // PWM水泵0,1,2,3 + kreg_pwm_pump4_ctrl_speed_level = REG_INDEX(4030, 4), // PWM水泵0,1,2,3 + + kreg_pwm_pump0_speed_level = REG_INDEX(4040, 0), // PWM水泵0,1,2,3 + kreg_pwm_pump1_speed_level = REG_INDEX(4040, 1), // PWM水泵0,1,2,3 + kreg_pwm_pump2_speed_level = REG_INDEX(4040, 2), // PWM水泵0,1,2,3 + kreg_pwm_pump3_speed_level = REG_INDEX(4040, 3), // PWM水泵0,1,2,3 + kreg_pwm_pump4_speed_level = REG_INDEX(4040, 4), // PWM水泵0,1,2,3 + + kreg_pwm_pump0_e_state = REG_INDEX(4050, 0), // PWM水泵0 0:正常 1:异常 + kreg_pwm_pump1_e_state = REG_INDEX(4050, 1), // PWM水泵0 0:正常 1:异常 + kreg_pwm_pump2_e_state = REG_INDEX(4050, 2), // PWM水泵0 0:正常 1:异常 + kreg_pwm_pump3_e_state = REG_INDEX(4050, 3), // PWM水泵0 0:正常 1:异常 + kreg_pwm_pump4_e_state = REG_INDEX(4050, 4), // PWM水泵0 0:正常 1:异常 } reg_index_t; diff --git a/api/zi_module.hpp b/api/zi_module.hpp index 26a3b5f..1e62ff4 100644 --- a/api/zi_module.hpp +++ b/api/zi_module.hpp @@ -44,6 +44,8 @@ class ZIModule { *flag = m_inited_flag; return 0; } + + virtual int32_t module_get_inited_flag() { return m_inited_flag; } // kmodule_factory_reset = CMDID(1, 14), // para:{}, ack:{} // kmodule_flush_cfg = CMDID(1, 15), // para:{}, ack:{} // kmodule_active_cfg = CMDID(1, 16), // para:{}, ack:{}