diff --git a/components/ti/drv8701.pdf b/components/ti/drv8701.pdf new file mode 100644 index 0000000..d986895 Binary files /dev/null and b/components/ti/drv8701.pdf differ diff --git a/components/ti/drv8710.hpp b/components/ti/drv8710.hpp index 5f14fc9..366e7b4 100644 --- a/components/ti/drv8710.hpp +++ b/components/ti/drv8710.hpp @@ -1,6 +1,6 @@ #pragma once /** - * @file tmp117.hpp + * @file drv8710.hpp * @author zhaohe (h_zhaohe@163.com) * @brief * @version 0.1 @@ -9,8 +9,6 @@ * @copyright Copyright (c) 2023 * * - * 1. 参考:https://github.com/rkiyak/TMP117.git - * 2. 同级目录有芯片的datasheet。 */ #include @@ -36,7 +34,7 @@ class DRV8710 { Pin_t nsleep; Pin_t nfault; bool shaft; - } hardware_cfg_t; + } config_t; ZPWMGeneratorMutiChannel m_pwmCtrl; @@ -44,13 +42,13 @@ class DRV8710 { ZGPIO m_nsleep; ZGPIO m_nfault; - hardware_cfg_t m_cfg; + config_t m_cfg; // ZGPIO so; public: DRV8710(){}; - void initialize(hardware_cfg_t* cfg); + void initialize(config_t* cfg); void enable(bool varenable); diff --git a/components/water_cooling_temperature_control_module/peltier_contrler.hpp b/components/water_cooling_temperature_control_module/peltier_contrler.hpp deleted file mode 100644 index b578b81..0000000 --- a/components/water_cooling_temperature_control_module/peltier_contrler.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -/** - * @file tmp117.hpp - * @author zhaohe (h_zhaohe@163.com) - * @brief - * @version 0.1 - * @date 2023-04-14 - * - * @copyright Copyright (c) 2023 - * - * - */ -#include - -#include "sdk/os/zos.hpp" -#include "sdk\chip\zpwm_generator_muti_channel.hpp" -// - -namespace iflytop { -// SUPPORT REG - - - -} // namespace iflytop diff --git a/components/water_cooling_temperature_control_module/pwm_ctrl_module.hpp b/components/water_cooling_temperature_control_module/pwm_ctrl_module.hpp index 3f11aad..ee63d25 100644 --- a/components/water_cooling_temperature_control_module/pwm_ctrl_module.hpp +++ b/components/water_cooling_temperature_control_module/pwm_ctrl_module.hpp @@ -29,7 +29,7 @@ class PWMSpeedCtrlModule { int32_t fan0Channel[4]; ZGPIO::InputGpioCfg_t fanFBGpioCfg[4]; ZGPIO::OutputGpioCfg_t fanPowerGpioCfg[4]; - } fangroup_device_cfg_t; + } config_t; typedef struct { int32_t fanFBCount; @@ -49,14 +49,14 @@ class PWMSpeedCtrlModule { bool fanisworking = false; uint32_t m_lastcheckTime = 0; - fangroup_device_cfg_t cfg; + config_t cfg; bool m_enablefbcheck = false; public: PWMSpeedCtrlModule(){}; - void initialize(fangroup_device_cfg_t* fangroup, bool enablefbcheck = false); + void initialize(config_t* fangroup, bool enablefbcheck = false); int32_t startModule(int32_t duty); int32_t stopModule(); diff --git a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp index 2728c1a..e6c5b02 100644 --- a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp +++ b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp @@ -24,52 +24,6 @@ #include "sdk\components\zprotocols\zcancmder_v2\api\zi_module.hpp" namespace iflytop { -// SUPPORT REG -#if 0 - 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), // 当前输出 - kreg_pid_feedbackval = REG_INDEX(3050, 2), // 当前输出 - - kreg_module_version = REG_INDEX(0, 0), // 模块版本 - kreg_module_type = REG_INDEX(0, 1), // 模块类型 - kreg_module_status = REG_INDEX(0, 2), // 0idle,1busy,2error - kreg_module_errorcode = REG_INDEX(0, 3), // inited_flag - kreg_module_initflag = REG_INDEX(0, 4), // inited_flag - kreg_module_enableflag = REG_INDEX(0, 5), // 0idle,1busy,2error - kreg_module_errorbitflag0 = REG_INDEX(0, 6), // 模块异常标志，bit，每个模块自定义 - kreg_module_errorbitflag1 = REG_INDEX(0, 7), // - - kreg_sensor_temperature0 = REG_INDEX(2100, 0), // 温度1 - kreg_sensor_temperature1 = REG_INDEX(2100, 1), // 温度2 - kreg_sensor_temperature2 = REG_INDEX(2100, 2), // 温度3 - kreg_sensor_temperature3 = REG_INDEX(2100, 3), // 温度4 - - kreg_fan0_ctrl_speed_level = REG_INDEX(4000, 0), // 风扇转速0,1,2,3 - kreg_fan1_ctrl_speed_level = REG_INDEX(4000, 1), // 风扇转速0,1,2,3 - kreg_fan2_ctrl_speed_level = REG_INDEX(4000, 2), // 风扇转速0,1,2,3 - kreg_fan3_ctrl_speed_level = REG_INDEX(4000, 3), // 风扇转速0,1,2,3 - - kreg_fan0_speed_level = REG_INDEX(4010, 0), // 风扇实时转速0,1,2,3 - kreg_fan1_speed_level = REG_INDEX(4010, 1), // 风扇实时转速0,1,2,3 - kreg_fan2_speed_level = REG_INDEX(4010, 2), // 风扇实时转速0,1,2,3 - kreg_fan3_speed_level = REG_INDEX(4010, 3), // 风扇实时转速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:异常 -#endif - /** * @brief * 水冷温度控制模块 diff --git a/components/water_cooling_temperature_control_module/peltier_contrler.cpp b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module_factory.cpp similarity index 100% rename from components/water_cooling_temperature_control_module/peltier_contrler.cpp rename to components/water_cooling_temperature_control_module/water_cooling_temperature_control_module_factory.cpp diff --git a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module_factory.hpp b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module_factory.hpp new file mode 100644 index 0000000..9d9d666 --- /dev/null +++ b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module_factory.hpp @@ -0,0 +1,29 @@ +#pragma once +/** + * @file water_cooling_temperature_control_module_factory.hpp + * @author zhaohe (h_zhaohe@163.com) + * @brief + * @version 0.1 + * @date 2023-04-14 + * + * @copyright Copyright (c) 2023 + * + */ +#include + +#include "sdk/os/zos.hpp" +// +#include "water_cooling_temperature_control_module_factory.hpp" + +namespace iflytop { +/** + * @brief + * 水冷温度控制模块 + */ + +class WaterCoolingTemperatureControlModuleFactory { + public: + WaterCoolingTemperatureControlModuleFactory(){}; +}; + +} // namespace iflytop