p_iflytop_upper
/
IflytopCom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Updates transmit disinfection UI board IDs marco name 

Updates the transmit disinfection UI to use symbolic constants (FIXBOARDID_*) instead of hardcoded integer board IDs, enhancing code readability and maintainability.

Additionally, comments out unused blower and air compressor related functions in the CAN master, likely due to a change in requirements or functionality.
Updates the transmit and zscan protocol submodules.
Removes unused files draw_bard_dm.cpp and pipe_dm.cpp.
master
zhaohe 3 weeks ago
parent
da349fec34
commit
a5502c4005
11 changed files with 96 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app_protocols/transmit_disfection_protocol
  2. 2
      app_protocols/zscanprotocol
  3. 18
      src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp
  4. 6
      src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp
  5. 24
      src/app/transmit_disinfection/draw_bard_dm.cpp
  6. 22
      src/app/transmit_disinfection/dt600b.cpp
  7. 22
      src/app/transmit_disinfection/large_space_disinfection_machine.cpp
  8. 26
      src/app/transmit_disinfection/little_space_disinfection_machine.cpp
  9. 28
      src/app/transmit_disinfection/pipe_dm.cpp
  10. 2
      src/app/transmit_disinfection/pipe_dm.hpp
  11. 40
      src/app/transmit_disinfection/utils/tabbuilder.cpp

2
app_protocols/transmit_disfection_protocol

@ -1 +1 @@
Subproject commit 613751c12e7df7f0e4deb9d56cfa22bc2555ca70
Subproject commit e63817fe9b7106a6da61e0f586fbdd4a305c907c

2
app_protocols/zscanprotocol

@ -1 +1 @@
Subproject commit 81529a15c57000f73cc5bd4b7276f567099b9988
Subproject commit 75bfc77f79ad77e305a68bda7f8a0fcd90e29969

18
src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp
View File

@ -64,11 +64,11 @@ int TransmitDisinfectionCanMaster::blowerReadEI(int boardid) {
auto rec = m_com->callcmd0(boardid, kfn_blower_read_ei);
return rec->getContent(0);
}
int TransmitDisinfectionCanMaster::blowerReadEIAdcRaw(int boardid) { return m_com->callcmd0(boardid, kfn_blower_read_ei_adc_raw)->getContent(0); }
int TransmitDisinfectionCanMaster::blowerReadElectricIsError(int boardid) {
auto rec = m_com->callcmd0(boardid, kfn_blower_is_error);
return rec->getContent(0);
}
// int TransmitDisinfectionCanMaster::blowerReadEIAdcRaw(int boardid) { return m_com->callcmd0(boardid, kfn_blower_read_ei_adc_raw)->getContent(0); }
// int TransmitDisinfectionCanMaster::blowerReadElectricIsError(int boardid) {
// auto rec = m_com->callcmd0(boardid, kfn_blower_is_error);
// return rec->getContent(0);
// }
/***********************************************************************************************************************
* air_compressor *
@ -79,10 +79,10 @@ int TransmitDisinfectionCanMaster::airCompressorReadEI(int boardid) {
auto rec = m_com->callcmd0(boardid, kfn_air_compressor_read_ei);
return rec->getContent(0);
}
int TransmitDisinfectionCanMaster::airCompressorReadEIAdcRaw(int boardid) { //
auto rec = m_com->callcmd0(boardid, kfn_air_compressor_read_ei_adc_raw);
return rec->getContent(0);
}
// int TransmitDisinfectionCanMaster::airCompressorReadEIAdcRaw(int boardid) { //
// auto rec = m_com->callcmd0(boardid, kfn_air_compressor_read_ei_adc_raw);
// return rec->getContent(0);
// }
int TransmitDisinfectionCanMaster::airTightnessTestACCtrl(int boardid, int32_t val) {
auto rec = m_com->callcmd1(boardid, kfn_air_leak_detect_ac_ctrl, val);

6
src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp
View File

@ -77,8 +77,8 @@ class TransmitDisinfectionCanMaster {
void blowerCtrl(int boardid, int power);
void blowerCtrlSafeValve(int boardid, int valve_state);
int blowerReadEI(int boardid);
int blowerReadEIAdcRaw(int boardid);
int blowerReadElectricIsError(int boardid);
// int blowerReadEIAdcRaw(int boardid);
// int blowerReadElectricIsError(int boardid);
int blowserIsOpen(int boardid) { return m_com->callcmd0(boardid, kfn_blower_is_open, DEFUALT_OVERTIME)->getContent(0); }
/***********************************************************************************************************************
@ -87,7 +87,7 @@ class TransmitDisinfectionCanMaster {
void airCompressorCtrl(int boardid, int power);
void airCompressorCtrlSafeValve(int boardid, int valve_state);
int airCompressorReadEI(int boardid);
int airCompressorReadEIAdcRaw(int boardid);
// int airCompressorReadEIAdcRaw(int boardid);
int airCompressorIsOpen(int boardid) { return m_com->callcmd0(boardid, kfn_air_compressor_is_open, DEFUALT_OVERTIME)->getContent(0); }
int airTightnessTestACCtrl(int boardid, int32_t val);

24
src/app/transmit_disinfection/draw_bard_dm.cpp
View File

@ -16,18 +16,18 @@ using namespace std;
DrawBardDM::DrawBardDM(QWidget *parent) : TransmitDisinfection(parent) {
TabBuilder tabBuilder(this);
tabBuilder.buildBoardBasicCtrl("功率板", kFixBoardId_PowerControl);
tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildH2O2SensorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirCompressorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirTightnessTestACTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBoardBasicCtrl("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildHearterTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildH2O2SensorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirCompressorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirTightnessTestACTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBoardBasicCtrl("液路板", kFixBoardId_LiquidCtrl); //
tabBuilder.buildBlowerTab("液路板", kFixBoardId_LiquidCtrl); // 风机
tabBuilder.buildFnPumpCtrl("液路板", kFixBoardId_LiquidCtrl); // 泵机
tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl); //
tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl); //
tabBuilder.buildAirTightnessTestTab("液路板", kFixBoardId_LiquidCtrl); //
tabBuilder.buildBoardBasicCtrl("液路板", FIXBOARDID_LC_BOARD); //
tabBuilder.buildBlowerTab("液路板", FIXBOARDID_LC_BOARD); // 风机
tabBuilder.buildFnPumpCtrl("液路板", FIXBOARDID_LC_BOARD); // 泵机
tabBuilder.buildWaterSensorTab("液路板", FIXBOARDID_LC_BOARD); //
tabBuilder.buildPSBusTab("液路板", FIXBOARDID_LC_BOARD); //
tabBuilder.buildAirTightnessTestTab("液路板", FIXBOARDID_LC_BOARD); //
tabBuilder.buildExtChSelectorTab("外置通道选择器", kFixBoardId_ExtChSelector); //
tabBuilder.buildExtChSelectorTab("外置通道选择器", FIXBOARDID_EXT_CH_SELECTOR); //
}

22
src/app/transmit_disinfection/dt600b.cpp
View File

@ -16,17 +16,17 @@ using namespace std;
DT600B::DT600B(QWidget *parent) : TransmitDisinfection(parent) {
TabBuilder tabBuilder(this);
tabBuilder.buildBoardBasicCtrl("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBoardBasicCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildBoardBasicCtrl("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBoardBasicCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildFnPumpCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildLiquidLevelStateReaderTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildFnPumpCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildTripleWarningLightTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildWaterSensorTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildValveCtrlTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildLiquidLevelStateReaderTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBlowerTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirCompressorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildH2O2SensorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildHearterTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBlowerTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirCompressorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildH2O2SensorTab("功率板", FIXBOARDID_PC_BOARD);
}

22
src/app/transmit_disinfection/large_space_disinfection_machine.cpp
View File

@ -16,18 +16,18 @@ using namespace std;
LargeSpaceDisinfectionMachine::LargeSpaceDisinfectionMachine(QWidget *parent) : TransmitDisinfection(parent) {
TabBuilder tabBuilder(this);
tabBuilder.buildBoardBasicCtrl("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBoardBasicCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildBoardBasicCtrl("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBoardBasicCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildFnPumpCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildFnPumpCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildTripleWarningLightTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildWaterSensorTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildPSBusTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildValveCtrlTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBlowerTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirCompressorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildH2O2SensorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildHearterTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBlowerTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirCompressorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildH2O2SensorTab("功率板", FIXBOARDID_PC_BOARD);
}

26
src/app/transmit_disinfection/little_space_disinfection_machine.cpp
View File

@ -16,19 +16,19 @@ using namespace std;
LittleSpaceDisinfectionMachine::LittleSpaceDisinfectionMachine(QWidget *parent) : TransmitDisinfection(parent) {
TabBuilder tabBuilder(this);
tabBuilder.buildBoardBasicCtrl("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBoardBasicCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildFnPumpCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBlowerTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirCompressorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildH2O2SensorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBoardBasicCtrl("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBoardBasicCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildFnPumpCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildTripleWarningLightTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildWaterSensorTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildPSBusTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildValveCtrlTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildHearterTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBlowerTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirCompressorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildH2O2SensorTab("功率板", FIXBOARDID_PC_BOARD);
}

28
src/app/transmit_disinfection/pipe_dm.cpp
View File

@ -16,20 +16,20 @@ using namespace std;
PipeDM::PipeDM(QWidget *parent) : TransmitDisinfection(parent) {
TabBuilder tabBuilder(this);
tabBuilder.buildBoardBasicCtrl("功率板", kFixBoardId_PowerControl);
tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildH2O2SensorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBlowerTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirCompressorTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildAirTightnessTestACTab("功率板", kFixBoardId_PowerControl);
tabBuilder.buildBoardBasicCtrl("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildHearterTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildH2O2SensorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBlowerTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirCompressorTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildAirTightnessTestACTab("功率板", FIXBOARDID_PC_BOARD);
tabBuilder.buildBoardBasicCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildFnPumpCtrl("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildProportionalTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildAirTightnessTestTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
tabBuilder.buildBoardBasicCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildFnPumpCtrl("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildTripleWarningLightTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildWaterSensorTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildPSBusTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildProportionalTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildAirTightnessTestTab("液路板", FIXBOARDID_LC_BOARD);
tabBuilder.buildValveCtrlTab("液路板", FIXBOARDID_LC_BOARD);
}

2
src/app/transmit_disinfection/pipe_dm.hpp
View File

@ -6,7 +6,7 @@
// kpipe_disinfection_machine = 3, // 管道式消毒机
// kdraw_bar_disinfection_box = 4, // 手持拉杆箱消毒机
// kh2o2_ext_sensor = 5, // 外部H2O2传感器
// EX_H2O2_SENSOR = 5, // 外部H2O2传感器
namespace iflytop {
class PipeDM : public TransmitDisinfection {

40
src/app/transmit_disinfection/utils/tabbuilder.cpp
View File

@ -86,35 +86,35 @@ void TabBuilder::buildFnPumpCtrl(const char *tabname, int boardid) {
ZQVTabPage *tab = getTab(tabname);
ZQFunctionListBox *box = new ZQFunctionListBox(tab, "泵机控制(0:加液泵, 1:喷液泵)", 6);
box->newFunc("pumpRotate", {"subid", "rpm"}, [](int argn, const char **args) { //
CAN_MASTER->pumpRotate(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]));
CAN_MASTER->pumpRotate(FIXBOARDID_LC_BOARD, atoi(args[0]), atoi(args[1]));
});
box->newFunc("pumpStop", {"subid"}, [](int argn, const char **args) { //
CAN_MASTER->pumpStop(kFixBoardId_LiquidCtrl, atoi(args[0]));
CAN_MASTER->pumpStop(FIXBOARDID_LC_BOARD, atoi(args[0]));
});
box->newFunc("pumpSetIholdIrunIdelay", {"subid", "ihold", "irun", "idelay"}, [](int argn, const char **args) { //
CAN_MASTER->pumpSetIholdIrunIdelay(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]), atoi(args[2]), atoi(args[3]));
CAN_MASTER->pumpSetIholdIrunIdelay(FIXBOARDID_LC_BOARD, atoi(args[0]), atoi(args[1]), atoi(args[2]), atoi(args[3]));
});
// pumpSetTzw
box->newFunc("pumpSetTzw", {"subid", "tzw"}, [](int argn, const char **args) { //
CAN_MASTER->pumpSetTzw(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]));
CAN_MASTER->pumpSetTzw(FIXBOARDID_LC_BOARD, atoi(args[0]), atoi(args[1]));
});
box->newFunc("pumpSetRamp", {"subid", "vs", "a1", "amx", "v1"}, [](int argn, const char **args) { //
CAN_MASTER->pumpSetRamp(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]), atoi(args[2]), atoi(args[3]), atoi(args[4]));
CAN_MASTER->pumpSetRamp(FIXBOARDID_LC_BOARD, atoi(args[0]), atoi(args[1]), atoi(args[2]), atoi(args[3]), atoi(args[4]));
});
box->newFunc("pumpSetSubicReg", {"subid", "regadd", "val"}, [](int argn, const char **args) { //
CAN_MASTER->pumpSetSubicReg(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]), atoi(args[2]));
CAN_MASTER->pumpSetSubicReg(FIXBOARDID_LC_BOARD, atoi(args[0]), atoi(args[1]), atoi(args[2]));
});
box->newFunc("pumpGetSubicReg", {"subid", "regadd"}, [](int argn, const char **args) { //
int val = CAN_MASTER->pumpGetSubicReg(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]));
int val = CAN_MASTER->pumpGetSubicReg(FIXBOARDID_LC_BOARD, atoi(args[0]), atoi(args[1]));
ISHOW("val:%x", val);
});
box->newFunc("pumpIsRun", {"subid"}, [](int argn, const char **args) { //
int val = CAN_MASTER->pumpIsRun(kFixBoardId_LiquidCtrl, atoi(args[0]));
int val = CAN_MASTER->pumpIsRun(FIXBOARDID_LC_BOARD, atoi(args[0]));
ISHOW("val:%d", val);
});
}
@ -224,15 +224,15 @@ void TabBuilder::buildBlowerTab(const char *tabname, int boardid) {
int val = CAN_MASTER->blowerReadEI(boardid);
ISHOW("val:%d", val);
});
box->newSubButton("风机读取电流ADC", [this, boardid](int argn, const char **args) {
int val = CAN_MASTER->blowerReadEIAdcRaw(boardid);
ISHOW("val:%d", val);
});
// box->newSubButton("风机读取电流ADC", [this, boardid](int argn, const char **args) {
// int val = CAN_MASTER->blowerReadEIAdcRaw(boardid);
// ISHOW("val:%d", val);
// });
box->newSubButtonEnd();
box->newSubButton("风机是否错误", [this, boardid](int argn, const char **args) {
bool val = CAN_MASTER->blowerReadElectricIsError(boardid);
ISHOW("val:%d", val);
});
// box->newSubButton("风机是否错误", [this, boardid](int argn, const char **args) {
// bool val = CAN_MASTER->blowerReadElectricIsError(boardid);
// ISHOW("val:%d", val);
// });
box->newSubButton("风机是否打开", [this, boardid](int argn, const char **args) {
bool val = CAN_MASTER->blowserIsOpen(boardid);
ISHOW("val:%d", val);
@ -253,10 +253,10 @@ void TabBuilder::buildAirCompressorTab(const char *tabname, int boardid) {
int val = CAN_MASTER->airCompressorReadEI(boardid);
ISHOW("val:%d", val);
});
box->newFunc("空压机读取电流ADC", {}, [this, boardid](int argn, const char **args) {
int val = CAN_MASTER->airCompressorReadEIAdcRaw(boardid);
ISHOW("val:%d", val);
});
// box->newFunc("空压机读取电流ADC", {}, [this, boardid](int argn, const char **args) {
// int val = CAN_MASTER->airCompressorReadEIAdcRaw(boardid);
// ISHOW("val:%d", val);
// });
box->newFunc("空压机是否打开", {}, [this, boardid](int argn, const char **args) {
bool val = CAN_MASTER->airCompressorIsOpen(boardid);
ISHOW("val:%d", val);

Write Preview
Loading…
Cancel
Save