From 9cf19ecbcb1836b58ece4a1a05439563febe2e4c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 7 Aug 2024 19:47:58 +0800 Subject: [PATCH] update --- app_protocols/transmit_disfection_protocol | 2 +- .../transmit_disinfection_can_master.cpp | 46 ++++++++++----------- .../transmit_disinfection_can_master.hpp | 48 +++++++++------------- 3 files changed, 43 insertions(+), 53 deletions(-) diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index 7ec8b89..591e174 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit 7ec8b89424ab02856d3c48a77dfb11e790db4693 +Subproject commit 591e174e21072cc71d6288d6c5cfa00f34952e9b diff --git a/src/app/transmit_disinfection/transmit_disinfection_can_master.cpp b/src/app/transmit_disinfection/transmit_disinfection_can_master.cpp index 5909944..b4b17af 100644 --- a/src/app/transmit_disinfection/transmit_disinfection_can_master.cpp +++ b/src/app/transmit_disinfection/transmit_disinfection_can_master.cpp @@ -51,24 +51,24 @@ void TransmitDisinfectionCanMaster::pingAllBoard() { return; } -void TransmitDisinfectionCanMaster::pump_rotate(int boardid, int subid, int rpm) { m_com->callcmd2(boardid, kfn_pump_rotate, subid, rpm, DEFUALT_OVERTIME); } -void TransmitDisinfectionCanMaster::pump_stop(int boardid, int subid) { m_com->callcmd1(boardid, kfn_pump_stop, subid, DEFUALT_OVERTIME); } -void TransmitDisinfectionCanMaster::pump_set_ihold_irun_idelay(int boardid, int subid, int ihold, int irun, int idelay) { m_com->callcmd4(boardid, kfn_pump_set_ihold_irun_idelay, subid, irun, ihold, idelay, DEFUALT_OVERTIME); } -void TransmitDisinfectionCanMaster::pump_set_acc(int boardid, int subid, int acc) { m_com->callcmd2(boardid, kfn_pump_set_acc, subid, acc, DEFUALT_OVERTIME); } +void TransmitDisinfectionCanMaster::pumpRotate(int boardid, int subid, int rpm) { m_com->callcmd2(boardid, kfn_pump_rotate, subid, rpm, DEFUALT_OVERTIME); } +void TransmitDisinfectionCanMaster::pumpStop(int boardid, int subid) { m_com->callcmd1(boardid, kfn_pump_stop, subid, DEFUALT_OVERTIME); } +void TransmitDisinfectionCanMaster::pumpSetIholdIrunIdelay(int boardid, int subid, int ihold, int irun, int idelay) { m_com->callcmd4(boardid, kfn_pump_set_ihold_irun_idelay, subid, irun, ihold, idelay, DEFUALT_OVERTIME); } +void TransmitDisinfectionCanMaster::pumpSetAcc(int boardid, int subid, int acc) { m_com->callcmd2(boardid, kfn_pump_set_acc, subid, acc, DEFUALT_OVERTIME); } -void TransmitDisinfectionCanMaster::pump_set_subic_reg(int boardid, int subid, int regadd, int val) { m_com->callcmd3(boardid, kfn_pump_set_subic_reg, subid, regadd, val, DEFUALT_OVERTIME); } -int TransmitDisinfectionCanMaster::pump_get_subic_reg(int boardid, int subid, int regadd) { +void TransmitDisinfectionCanMaster::pumpSetSubicReg(int boardid, int subid, int regadd, int val) { m_com->callcmd3(boardid, kfn_pump_set_subic_reg, subid, regadd, val, DEFUALT_OVERTIME); } +int TransmitDisinfectionCanMaster::pumpGetSubicReg(int boardid, int subid, int regadd) { shared_ptr receipt = m_com->callcmd2(boardid, kfn_pump_get_subic_reg, subid, regadd, DEFUALT_OVERTIME); return *(int32_t *)receipt->getPacket()->params; } -void TransmitDisinfectionCanMaster::pump_ping(int32_t boardid) { m_com->callcmd1(boardid, kfn_pump_ping, boardid, DEFUALT_OVERTIME); } +void TransmitDisinfectionCanMaster::pumpPing(int32_t boardid) { m_com->callcmd1(boardid, kfn_pump_ping, boardid, DEFUALT_OVERTIME); } /*********************************************************************************************************************** * blower * ***********************************************************************************************************************/ -void TransmitDisinfectionCanMaster::blower_ctrl(int boardid, int power) { m_com->callcmd1(boardid, kfn_blower_ctrl, power); } -void TransmitDisinfectionCanMaster::blower_ctrl_safe_valve(int boardid, int valve_state) { m_com->callcmd1(boardid, kfn_blower_ctrl_safe_valve, valve_state); } -int TransmitDisinfectionCanMaster::blower_read_electric_current(int boardid) { +void TransmitDisinfectionCanMaster::blowerCtrl(int boardid, int power) { m_com->callcmd1(boardid, kfn_blower_ctrl, power); } +void TransmitDisinfectionCanMaster::blowerCtrlSafeValve(int boardid, int valve_state) { m_com->callcmd1(boardid, kfn_blower_ctrl_safe_valve, valve_state); } +int TransmitDisinfectionCanMaster::blowerReadElectricCurrent(int boardid) { auto rec = m_com->callcmd0(boardid, kfn_blower_read_electric_current); return rec->getContent(0); } @@ -76,9 +76,9 @@ int TransmitDisinfectionCanMaster::blower_read_electric_current(int boardid) { /*********************************************************************************************************************** * air_compressor * ***********************************************************************************************************************/ -void TransmitDisinfectionCanMaster::air_compressor_ctrl(int boardid, int power) { m_com->callcmd1(boardid, kfn_air_compressor_ctrl, power); } -void TransmitDisinfectionCanMaster::air_compressor_ctrl_safe_valve(int boardid, int valve_state) { m_com->callcmd1(boardid, kfn_air_compressor_ctrl_safe_valve, valve_state); } -int TransmitDisinfectionCanMaster::air_compressor_read_electric_current(int boardid) { +void TransmitDisinfectionCanMaster::airCompressorCtrl(int boardid, int power) { m_com->callcmd1(boardid, kfn_air_compressor_ctrl, power); } +void TransmitDisinfectionCanMaster::airCompressorCtrlSafeValve(int boardid, int valve_state) { m_com->callcmd1(boardid, kfn_air_compressor_ctrl_safe_valve, valve_state); } +int TransmitDisinfectionCanMaster::airCompressorReadElectricCurrent(int boardid) { auto rec = m_com->callcmd0(boardid, kfn_air_compressor_read_electric_current); return rec->getContent(0); } @@ -86,24 +86,22 @@ int TransmitDisinfectionCanMaster::air_compressor_read_electric_current(int boa /*********************************************************************************************************************** * heater * ***********************************************************************************************************************/ -void TransmitDisinfectionCanMaster::heater_ctrl(int boardid, int power) { m_com->callcmd1(boardid, kfn_heater_ctrl, power); } -void TransmitDisinfectionCanMaster::heater_ctrl_safe_valve(int boardid, int valve_state) { m_com->callcmd1(boardid, kfn_heater_ctrl_safe_valve, valve_state); } -int TransmitDisinfectionCanMaster::heater_read_electric_current(int boardid) { +void TransmitDisinfectionCanMaster::heaterCtrl(int boardid, int power) { m_com->callcmd1(boardid, kfn_heater_ctrl, power); } +void TransmitDisinfectionCanMaster::heaterCtrlSafeValve(int boardid, int valve_state) { m_com->callcmd1(boardid, kfn_heater_ctrl_safe_valve, valve_state); } +int TransmitDisinfectionCanMaster::heaterReadElectricCurrent(int boardid) { auto rec = m_com->callcmd0(boardid, kfn_heater_read_electric_current); return rec->getContent(0); } -int TransmitDisinfectionCanMaster::heater_read_temperature_data(int boardid) { +int TransmitDisinfectionCanMaster::heaterReadTemperatureData(int boardid) { auto rec = m_com->callcmd0(boardid, kfn_heater_read_temperature_data); return rec->getContent(0); } - -void TransmitDisinfectionCanMaster::triple_warning_light_ctl(int boardid, int r, int g, int b, int warning) { m_com->callcmd4(boardid, kfn_triple_warning_light_ctl, r, g, b, warning); } -int TransmitDisinfectionCanMaster::evaporation_bin_water_sensor_read_state(int boardid) { - auto rec = m_com->callcmd0(boardid, kfn_evaporation_bin_water_sensor_read_state); +void TransmitDisinfectionCanMaster::warningLightSetState(int boardid, int r, int g, int b, int warning) { m_com->callcmd4(boardid, kfn_triple_warning_light_ctl, r, g, b, warning); } +int TransmitDisinfectionCanMaster::evaporationTankWSReadState(int boardid) { + auto rec = m_com->callcmd0(boardid, kfn_evaporation_tank_water_sensor_read_state); return rec->getContent(0); } - -int TransmitDisinfectionCanMaster::device_bottom_water_sensor_read_state(int boardid) { +int TransmitDisinfectionCanMaster::bottomWSReadState(int boardid) { auto rec = m_com->callcmd0(boardid, kfn_device_bottom_water_sensor_read_state); return rec->getContent(0); -} \ No newline at end of file +} diff --git a/src/app/transmit_disinfection/transmit_disinfection_can_master.hpp b/src/app/transmit_disinfection/transmit_disinfection_can_master.hpp index e6a59df..8eeaafe 100644 --- a/src/app/transmit_disinfection/transmit_disinfection_can_master.hpp +++ b/src/app/transmit_disinfection/transmit_disinfection_can_master.hpp @@ -43,50 +43,42 @@ class TransmitDisinfectionCanMaster { void clear_reset_flag(int to); void pingAllBoard(); - - void triple_warning_light_ctl(int boardid, int r, int g, int b, int warning) { callcmd4(boardid, kcmd_triple_warning_light_ctl, r, g, b, warning); } - int evaporation_bin_water_sensor_read_state(int boardid) { - callcmd0(boardid, kcmd_evaporation_bin_water_sensor_read_state); - return *(int32_t *)m_receipt_frame->params; - } - - int device_bottom_water_sensor_read_state(int boardid) { - callcmd0(boardid, kcmd_device_bottom_water_sensor_read_state); - return *(int32_t *)m_receipt_frame->params; - } + void warningLightSetState(int boardid, int r, int g, int b, int warning); + int evaporationTankWSReadState(int boardid); + int bottomWSReadState(int boardid); /*********************************************************************************************************************** * PUMP * ***********************************************************************************************************************/ - void pump_rotate(int boardid, int subid, int rpm); - void pump_stop(int boardid, int subid); - void pump_set_ihold_irun_idelay(int boardid, int subid, int ihold, int irun, int idelay); - void pump_set_acc(int boardid, int subid, int acc); - void pump_set_subic_reg(int boardid, int subid, int regadd, int val); - int pump_get_subic_reg(int boardid, int subid, int regadd); - void pump_ping(int32_t boardid); + void pumpRotate(int boardid, int subid, int rpm); + void pumpStop(int boardid, int subid); + void pumpSetIholdIrunIdelay(int boardid, int subid, int ihold, int irun, int idelay); + void pumpSetAcc(int boardid, int subid, int acc); + void pumpSetSubicReg(int boardid, int subid, int regadd, int val); + int pumpGetSubicReg(int boardid, int subid, int regadd); + void pumpPing(int32_t boardid); /*********************************************************************************************************************** * blower * ***********************************************************************************************************************/ - void blower_ctrl(int boardid, int power); - void blower_ctrl_safe_valve(int boardid, int valve_state); - int blower_read_electric_current(int boardid); + void blowerCtrl(int boardid, int power); + void blowerCtrlSafeValve(int boardid, int valve_state); + int blowerReadElectricCurrent(int boardid); /*********************************************************************************************************************** * air_compressor * ***********************************************************************************************************************/ - void air_compressor_ctrl(int boardid, int power); - void air_compressor_ctrl_safe_valve(int boardid, int valve_state); - int air_compressor_read_electric_current(int boardid); + void airCompressorCtrl(int boardid, int power); + void airCompressorCtrlSafeValve(int boardid, int valve_state); + int airCompressorReadElectricCurrent(int boardid); /*********************************************************************************************************************** * heater * ***********************************************************************************************************************/ - void heater_ctrl(int boardid, int power); - void heater_ctrl_safe_valve(int boardid, int valve_state); - int heater_read_electric_current(int boardid); - int heater_read_temperature_data(int boardid); + void heaterCtrl(int boardid, int power); + void heaterCtrlSafeValve(int boardid, int valve_state); + int heaterReadElectricCurrent(int boardid); + int heaterReadTemperatureData(int boardid); }; } // namespace iflytop