From 220ae44f2c2c2cf4fb0e996f0cf75907cb5a1a4b Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 25 Mar 2025 15:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=86=B7=E6=A8=A1=E5=9D=97=E8=BE=93?= =?UTF-8?q?=E5=87=BAPID=E8=AE=A1=E7=AE=97=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step_motor_ctrl_module/step_motor_ctrl_module.cpp | 2 +- .../water_cooling_temperature_control_module.cpp | 6 +++--- .../water_cooling_temperature_control_module.hpp | 18 +++++++++--------- usrc/project_configs.h | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp b/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp index e42363c..4bb7596 100644 --- a/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp +++ b/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp @@ -696,7 +696,7 @@ void StepMotorCtrlModule::checkdpos(int32_t expect_dpos) { ZLOGE(TAG, "check pos devi tolerance fail.... dpos%d,expectation_dpos:%d", dpos, expect_dpos); setErrorFlag(err::kstep_motor_lost_step); } else { - ZLOGE(TAG, "dpos%d,expect_dpos:%d", dpos, expect_dpos); + ZLOGI(TAG, "dpos%d,expect_dpos:%d", dpos, expect_dpos); } } diff --git a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp index 52caea1..581c4ff 100644 --- a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp +++ b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp @@ -71,8 +71,8 @@ int32_t WaterCoolingTemperatureControlModule::pri_module_xxx_reg(int32_t param_i PROCESS_REG(kreg_water_cooling_tmp_controler_pid_compute_interval, REG_GET(m_cfg.pidcompute_periodms), REG_SET(m_cfg.pidcompute_periodms)); PROCESS_REG(kreg_water_cooling_tmp_controler_pid_target, REG_GET_FLOAT(m_target_temperature, 0.1), REG_SET_FLOAT(m_target_temperature, 0.1)); - PROCESS_REG(kreg_water_cooling_tmp_controler_pid_nowoutput, REG_GET(m_pidmodule.get_output()), ACTION_NONE); - PROCESS_REG(kreg_water_cooling_tmp_controler_pid_feedbackval, REG_GET(read_pid_temperature_from_upper()* 10 + 0.5), ACTION_NONE); + PROCESS_REG(kreg_water_cooling_tmp_controler_pid_nowoutput, REG_GET(m_output), ACTION_NONE); + PROCESS_REG(kreg_water_cooling_tmp_controler_pid_feedbackval, REG_GET(read_pid_temperature_from_upper() * 10 + 0.5), ACTION_NONE); PROCESS_REG(kreg_water_cooling_tmp_controler_temp0, REG_GET(getTemperatureSensorVal(0) * 10 + 0.5), ACTION_NONE); PROCESS_REG(kreg_water_cooling_tmp_controler_temp1, REG_GET(getTemperatureSensorVal(1) * 10 + 0.5), ACTION_NONE); @@ -176,7 +176,7 @@ void WaterCoolingTemperatureControlModule::workloop() { // if (m_enable_log) { ZLOGI(TAG, "temperature: %.2f %.2f integral_err:%.2f out:%d", m_target_temperature, val, m_pidmodule.get_integral_err(), (int32_t)out); // } - + m_output = out; peltier_set_power_level(out); i++; if (i % 10 == 0) { diff --git a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp index 635fb94..6a92a5e 100644 --- a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp +++ b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp @@ -22,11 +22,10 @@ #include "sdk\components\api\zi_pwm_fan_ctrl_module.hpp" #include "sdk\components\api\zi_pwm_pump_ctrl_module.hpp" // -#include "sdk\components\api\zi_module.hpp" #include "pid_module.hpp" +#include "sdk\components\api\zi_module.hpp" #include "sdk\components\api\zi_temperature_sensor.hpp" #include "sdk\components\ti\drv8710.hpp" -#include "sdk\components\api\zi_module.hpp" namespace iflytop { /** @@ -34,7 +33,7 @@ namespace iflytop { * 水冷温度控制模块 */ -class WaterCoolingTemperatureControlModule : public ZIModule{ +class WaterCoolingTemperatureControlModule : public ZIModule { ENABLE_MODULE(WaterCoolingTemperatureControlModule, ktemperature_ctrl_module, PC_VERSION); public: @@ -72,6 +71,7 @@ class WaterCoolingTemperatureControlModule : public ZIModule{ int32_t m_enable_log = 0; float m_target_temperature = 0; float m_feedbak_temperature = 0; + int32_t m_output = 0; zmutex m_temperature_sensor_mutex; @@ -87,13 +87,13 @@ class WaterCoolingTemperatureControlModule : public ZIModule{ virtual int32_t module_active_cfg() override; virtual int32_t module_stop() override; - virtual int32_t temp_controler_start_hearting(int32_t targetTemperature) ; - virtual int32_t temp_controler_stop_hearting() ; + virtual int32_t temp_controler_start_hearting(int32_t targetTemperature); + virtual int32_t temp_controler_stop_hearting(); - virtual int32_t temp_controler_set_peltier_power_level(int32_t level) ; - virtual int32_t temp_controler_set_pump_level(int32_t level) ; - virtual int32_t temp_controler_set_fan_level(int32_t level) ; - virtual int32_t temp_controler_enable_log(int32_t enablelog) ; + virtual int32_t temp_controler_set_peltier_power_level(int32_t level); + virtual int32_t temp_controler_set_pump_level(int32_t level); + virtual int32_t temp_controler_set_fan_level(int32_t level); + virtual int32_t temp_controler_enable_log(int32_t enablelog); private: void workloop(); diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 1724e62..89ebc8a 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -1,5 +1,5 @@ #pragma once -#define PC_VERSION 1001 +#define PC_VERSION 1002 #define PC_MANUFACTURER "http://www.iflytop.com/" #define PC_PROJECT_NAME "a8000_subboard" #define PC_IFLYTOP_ENABLE_OS 1