Browse Source

update

master
zhaohe 2 years ago
parent
commit
883ebf8b84
  1. 4
      components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp
  2. 2
      components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp

4
components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp

@ -49,11 +49,13 @@ int32_t PWMSpeedCtrlModule::startModule(int32_t duty) {
startFanPWM(duty);
powerON();
m_lastcheckTime = zos_get_tick();
return 0;
}
int32_t PWMSpeedCtrlModule::stopModule() {
fanisworking = false;
stopFanPWM();
powerOff();
return 0;
}
int32_t PWMSpeedCtrlModule::getSubModuleErrorState(int32_t fanindex, int32_t* error_state) {
@ -126,4 +128,4 @@ void PWMSpeedCtrlModule::stopFanPWM() {
m_fanCtrlPwm.stopPWM(cfg.fan0Channel[i]);
}
}
}
}

2
components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp

@ -668,6 +668,7 @@ int32_t XYRobotCtrlModule::module_set_reg(int32_t param_id, int32_t val) {
default:
return err::kmodule_not_find_config_index;
}
return 0;
}
int32_t XYRobotCtrlModule::module_get_reg(int32_t param_id, int32_t* val) {
switch (param_id) {
@ -713,6 +714,7 @@ int32_t XYRobotCtrlModule::module_get_reg(int32_t param_id, int32_t* val) {
default:
return err::kmodule_not_find_config_index;
}
return 0;
}
#if 0
int32_t XYRobotCtrlModule::module_set_state(int32_t state_id, int32_t state_value) { return err::kmodule_not_find_state_index; }

Loading…
Cancel
Save