From 94a9fcd573d16a5ed6532f26f36843cff4a2f63e Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 10 Aug 2024 22:14:55 +0800 Subject: [PATCH] update --- CMakeLists.txt | 2 +- app_protocols/transmit_disfection_protocol | 2 +- .../channel/transmit_disinfection_can_master.cpp | 28 +++- .../channel/transmit_disinfection_can_master.hpp | 12 +- src/app/transmit_disinfection/utils/tabbuilder.cpp | 184 +++++---------------- 5 files changed, 68 insertions(+), 160 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dbbe02..f3887b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index 8cccc4a..6bfe740 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit 8cccc4a9b3a09f928ac0f4041bbc6107d919dfcc +Subproject commit 6bfe740cbf0caae387badd4e7702337d4583f46b diff --git a/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp b/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp index a96946f..b542b5d 100644 --- a/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp +++ b/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp @@ -35,7 +35,10 @@ ask_taskinfo_t TransmitDisinfectionCanMaster::readtaskinfo(int to, int32_t tasko void TransmitDisinfectionCanMaster::clearResetFlag(int to) { m_com->callcmd0(to, kfn_clear_reset_flag, DEFUALT_OVERTIME); } void TransmitDisinfectionCanMaster::pingAllBoard() { - m_com->callcmd1(0xff, kfn_heart_ping, 0xabcd, 20); + try { + m_com->callcmd1(0xff, kfn_heart_ping, 0xabcd, 20); + } catch (const std::exception &e) { + } return; } @@ -56,10 +59,11 @@ void TransmitDisinfectionCanMaster::pumpPing(int32_t boardid) { m_com->callcmd1( ***********************************************************************************************************************/ 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); +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); @@ -70,10 +74,14 @@ int TransmitDisinfectionCanMaster::blowerReadElectricIsError(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); +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); +} + int TransmitDisinfectionCanMaster::airTightnessTestACCtrl(int boardid, int32_t val) { auto rec = m_com->callcmd1(boardid, kfn_air_tightness_test_ac_ctrl, val); return rec->getContent(0); @@ -84,14 +92,18 @@ int TransmitDisinfectionCanMaster::airTightnessTestACCtrl(int boardid, int32_t v ***********************************************************************************************************************/ 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); +int TransmitDisinfectionCanMaster::heaterReadEI(int boardid) { + auto rec = m_com->callcmd0(boardid, kfn_heater_read_ei); return rec->getContent(0); } -int TransmitDisinfectionCanMaster::heaterReadTemperatureData(int boardid) { +int TransmitDisinfectionCanMaster::heaterReadTemperature(int boardid) { auto rec = m_com->callcmd0(boardid, kfn_heater_read_temperature_data); return rec->getContent(0); } + +int TransmitDisinfectionCanMaster::heaterReadEIAdcRaw(int boardid) { return m_com->callcmd0(boardid, kfn_heater_read_ei_adc_raw)->getContent(0); } +int TransmitDisinfectionCanMaster::heaterReadTemperatureAdcRaw(int boardid) { return m_com->callcmd0(boardid, kfn_heater_read_temperature_data_adc_raw)->getContent(0); } + 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); diff --git a/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp b/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp index de16305..13e27e4 100644 --- a/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp +++ b/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp @@ -72,7 +72,8 @@ class TransmitDisinfectionCanMaster { ***********************************************************************************************************************/ void blowerCtrl(int boardid, int power); void blowerCtrlSafeValve(int boardid, int valve_state); - int blowerReadElectricCurrent(int boardid); + int blowerReadEI(int boardid); + int blowerReadEIAdcRaw(int boardid); int blowerReadElectricIsError(int boardid); /*********************************************************************************************************************** @@ -80,7 +81,8 @@ class TransmitDisinfectionCanMaster { ***********************************************************************************************************************/ void airCompressorCtrl(int boardid, int power); void airCompressorCtrlSafeValve(int boardid, int valve_state); - int airCompressorReadElectricCurrent(int boardid); + int airCompressorReadEI(int boardid); + int airCompressorReadEIAdcRaw(int boardid); int airTightnessTestACCtrl(int boardid, int32_t val); @@ -89,8 +91,10 @@ class TransmitDisinfectionCanMaster { ***********************************************************************************************************************/ void heaterCtrl(int boardid, int power); void heaterCtrlSafeValve(int boardid, int valve_state); - int heaterReadElectricCurrent(int boardid); - int heaterReadTemperatureData(int boardid); + int heaterReadEI(int boardid); + int heaterReadTemperature(int boardid); + int heaterReadEIAdcRaw(int boardid); + int heaterReadTemperatureAdcRaw(int boardid); void warningLightSetState(int boardid, int r, int g, int b, int warning); diff --git a/src/app/transmit_disinfection/utils/tabbuilder.cpp b/src/app/transmit_disinfection/utils/tabbuilder.cpp index 14f4dee..995ac72 100644 --- a/src/app/transmit_disinfection/utils/tabbuilder.cpp +++ b/src/app/transmit_disinfection/utils/tabbuilder.cpp @@ -25,9 +25,10 @@ static void readSysInfo(int deviceId) { task[i] = CAN_MASTER->readtaskinfo(deviceId, i); } ISHOW("=========================== sys info ==========================="); - ISHOW("total_heap_size :%d", ack.total_heap_size); - ISHOW("free_heap_size :%d", ack.free_heap_size); - ISHOW("sysHasRun :%d", ack.sysHasRun); + ISHOW("total_heap_size :%d", ack.total_heap_size); + ISHOW("free_heap_size :%d", ack.free_heap_size); + ISHOW("free_sys_heap_size :%d", ack.free_sys_heap_size); + ISHOW("sysHasRun :%d", ack.sysHasRun); ISHOW("="); ISHOW("=========================== task info ==========================="); @@ -38,135 +39,10 @@ static void readSysInfo(int deviceId) { ISHOW("="); } -// void TabBuilder::buildLiquidCtrlBoardTab(ProjID_t projectId) { -// ZQVTabPage *tab = new ZQVTabPage(fathertab, "液路板"); -// { -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "通用", 4); -// box->newSubButton("读取板卡信息", [this](int argn, const char **args) { readBoardInfo(kFixBoardId_LiquidCtrl); }); -// box->newSubButton("读取系统信息", [this](int argn, const char **args) { readSysInfo(kFixBoardId_LiquidCtrl); }); -// } -// { -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "警报灯", 4); -// box->newFunc("报警灯控制", {"r", "g", "b", "w"}, // -// [this](int argn, const char **args) { CAN_MASTER->warningLightSetState(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1]), atoi(args[2]), atoi(args[3])); }); -// } -// { -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "压力传感器总线", 4); -// box->newFunc("读数据", {"subid"}, // -// [this](int argn, const char **args) { -// int32_t val = CAN_MASTER->psBusReadData(kFixBoardId_LiquidCtrl, atoi(args[0])); -// ISHOW("val:%d", val); -// }); - -// box->newSubButton("扫描", [this](int argn, const char **args) { -// auto result = CAN_MASTER->psBusScan(kFixBoardId_LiquidCtrl); -// for (int i = 0; i < result.numOnlineId; i++) { -// ISHOW("%d", result.onlineId); -// } -// }); -// } - -// { -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "水浸", 4); -// box->newFunc("读取-蒸发桶水浸传感器-状态", {}, // -// [this](int argn, const char **args) { -// int state = CAN_MASTER->evaporationTankWSReadState(kFixBoardId_LiquidCtrl); -// ISHOW("state:%d", state); -// }); -// box->newFunc("读取-设备底部水浸传感器-状态", {}, // -// [this](int argn, const char **args) { -// int state = CAN_MASTER->bottomWSReadState(kFixBoardId_LiquidCtrl); -// ISHOW("state:%d", state); -// }); -// } - -// tab->addSpacer(); -// } -// void TabBuilder::buildLiquidCtrlBoardPumpCtrlTab(ProjID_t projectId) { -// ZQVTabPage *tab = new ZQVTabPage(fathertab, "液路板-泵机控制"); -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "泵机控制", 6); - -// box->newFunc("pumpRotate", {"subid", "rpm"}, [](int argn, const char **args) { // -// CAN_MASTER->pumpRotate(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1])); -// }); -// box->newFunc("pumpStop", {"subid"}, [](int argn, const char **args) { // -// CAN_MASTER->pumpStop(kFixBoardId_LiquidCtrl, 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])); -// }); -// // pumpSetTzw -// box->newFunc("pumpSetTzw", {"subid", "tzw"}, [](int argn, const char **args) { // -// CAN_MASTER->pumpSetTzw(kFixBoardId_LiquidCtrl, 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])); -// }); - -// 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])); -// }); - -// box->newFunc("pumpGetSubicReg", {"subid", "regadd"}, [](int argn, const char **args) { // -// int val = CAN_MASTER->pumpGetSubicReg(kFixBoardId_LiquidCtrl, atoi(args[0]), atoi(args[1])); -// ISHOW("val:%x", val); -// }); -// tab->addSpacer(); -// } -// - -static void buildH2O2Box(ZQVTabPage *tab, ProjID_t projectId, int32_t did) {} - -// void TabBuilder::buildPowerControlBoardTab(ProjID_t projectId) { -// { -// ZQVTabPage *tab = new ZQVTabPage(fathertab, "功率板"); -// { -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "通用", 4); -// box->newSubButton("读取板卡信息", [this](int argn, const char **args) { readBoardInfo(kFixBoardId_PowerControl); }); -// box->newSubButton("读取系统信息", [this](int argn, const char **args) { readSysInfo(kFixBoardId_PowerControl); }); -// } -// { -// ZQFunctionListBox *box = new ZQFunctionListBox(tab, "控制", 4); - -// box->newFunc("风机控制", {"power"}, [this](int argn, const char **args) { CAN_MASTER->blowerCtrl(kFixBoardId_PowerControl, atoi(args[0])); }); -// box->newFunc("风机安全阀控制", {"valve_state"}, [this](int argn, const char **args) { CAN_MASTER->blowerCtrlSafeValve(kFixBoardId_PowerControl, atoi(args[0])); }); -// box->newFunc("风机读取电流", {}, [this](int argn, const char **args) { -// int val = CAN_MASTER->blowerReadElectricCurrent(kFixBoardId_PowerControl); -// ISHOW("val:%d", val); -// }); -// box->newFunc("空压机控制", {"power"}, [this](int argn, const char **args) { CAN_MASTER->airCompressorCtrl(kFixBoardId_PowerControl, atoi(args[0])); }); -// box->newFunc("空压机安全阀控制", {"valve_state"}, [this](int argn, const char **args) { CAN_MASTER->airCompressorCtrlSafeValve(kFixBoardId_PowerControl, atoi(args[0])); }); -// box->newFunc("空压机读取电流", {}, [this](int argn, const char **args) { -// int val = CAN_MASTER->airCompressorReadElectricCurrent(kFixBoardId_PowerControl); -// ISHOW("val:%d", val); -// }); -// box->newFunc("加热器控制", {"power"}, [this](int argn, const char **args) { CAN_MASTER->heaterCtrl(kFixBoardId_PowerControl, atoi(args[0])); }); -// box->newFunc("加热器安全阀控制", {"valve_state"}, [this](int argn, const char **args) { CAN_MASTER->heaterCtrlSafeValve(kFixBoardId_PowerControl, atoi(args[0])); }); -// box->newFunc("加热器读取电流", {}, [this](int argn, const char **args) { -// int val = CAN_MASTER->heaterReadElectricCurrent(kFixBoardId_PowerControl); -// ISHOW("val:%d", val); -// }); -// box->newFunc("加热器读取温度数据", {}, [this](int argn, const char **args) { -// int val = CAN_MASTER->heaterReadTemperatureData(kFixBoardId_PowerControl); -// ISHOW("val:%d", val); -// }); -// } - -// tab->addSpacer(); -// } - -// { -// ZQVTabPage *tab = new ZQVTabPage(fathertab, "功率板-H2O2"); -// buildH2O2Box(tab, projectId, kFixBoardId_PowerControl); -// tab->addSpacer(); -// } -// } ZQVTabPage *TabBuilder::getTab(const char *tabname) { if (tabMap.find(tabname) == tabMap.end()) { - ZQVTabPage *tab = new ZQVTabPage(fathertab, "tabname"); + ZQVTabPage *tab = new ZQVTabPage(fathertab, tabname); tabMap[tabname] = tab; } return tabMap[tabname]; @@ -223,14 +99,20 @@ void TabBuilder::buildFnPumpCtrl(const char *tabname, int boardid) { void TabBuilder::buildHearterTab(const char *tabname, int boardid) { ZQVTabPage *tab = getTab(tabname); ZQFunctionListBox *box = new ZQFunctionListBox(tab, "加热器", 4); - box->newFunc("heaterCtrl", {"power"}, [this, boardid](int argn, const char **args) { CAN_MASTER->heaterCtrl(boardid, atoi(args[0])); }); - box->newFunc("heaterCtrlSafeValve", {"valve_state"}, [this, boardid](int argn, const char **args) { CAN_MASTER->heaterCtrlSafeValve(boardid, atoi(args[0])); }); - box->newFunc("heaterReadElectricCurrent", {}, [this, boardid](int argn, const char **args) { - int val = CAN_MASTER->heaterReadElectricCurrent(boardid); + + box->newSubButton("加热打开", [this, boardid](int argn, const char **args) { CAN_MASTER->heaterCtrl(boardid, 1); }); + box->newSubButton("加热关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->heaterCtrl(boardid, 0); }); + + box->newSubButtonEnd(); + box->newSubButton("加热安全阀打开", [this, boardid](int argn, const char **args) { CAN_MASTER->heaterCtrlSafeValve(boardid, 1); }); + box->newSubButton("加热安全阀关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->heaterCtrlSafeValve(boardid, 0); }); + + box->newSubButton("读取电流", [this, boardid](int argn, const char **args) { + int val = CAN_MASTER->heaterReadEI(boardid); ISHOW("val:%d", val); }); - box->newFunc("heaterReadTemperatureData", {}, [this, boardid](int argn, const char **args) { - int val = CAN_MASTER->heaterReadTemperatureData(boardid); + box->newSubButton("读取温度", [this, boardid](int argn, const char **args) { + int val = CAN_MASTER->heaterReadTemperature(boardid); ISHOW("val:%d", val); }); } @@ -279,11 +161,11 @@ void TabBuilder::buildTripleWarningLightTab(const char *tabname, int boardid) { void TabBuilder::buildWaterSensorTab(const char *tabname, int boardid) { ZQVTabPage *tab = getTab(tabname); ZQFunctionListBox *box = new ZQFunctionListBox(tab, "水浸", 4); - box->newFunc("读取-蒸发桶水浸传感器-状态", {}, [this, boardid](int argn, const char **args) { + box->newSubButton("读取-蒸发桶水浸传感器-状态", [this, boardid](int argn, const char **args) { int state = CAN_MASTER->evaporationTankWSReadState(boardid); ISHOW("state:%d", state); }); - box->newFunc("读取-设备底部水浸传感器-状态", {}, [this, boardid](int argn, const char **args) { + box->newSubButton("读取-设备底部水浸传感器-状态", [this, boardid](int argn, const char **args) { int state = CAN_MASTER->bottomWSReadState(boardid); ISHOW("state:%d", state); }); @@ -291,13 +173,17 @@ void TabBuilder::buildWaterSensorTab(const char *tabname, int boardid) { void TabBuilder::buildBlowerTab(const char *tabname, int boardid) { ZQVTabPage *tab = getTab(tabname); ZQFunctionListBox *box = new ZQFunctionListBox(tab, "风机", 4); - box->newFunc("风机控制", {"power"}, [this, boardid](int argn, const char **args) { CAN_MASTER->blowerCtrl(boardid, atoi(args[0])); }); - box->newFunc("风机安全阀控制", {"valve_state"}, [this, boardid](int argn, const char **args) { CAN_MASTER->blowerCtrlSafeValve(boardid, atoi(args[0])); }); - box->newFunc("风机读取电流", {}, [this, boardid](int argn, const char **args) { - int val = CAN_MASTER->blowerReadElectricCurrent(boardid); + box->newSubButton("风机打开", [this, boardid](int argn, const char **args) { CAN_MASTER->blowerCtrl(boardid, 1); }); + box->newSubButton("风机关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->blowerCtrl(boardid, 0); }); + box->newSubButtonEnd(); + box->newSubButton("风机安全阀打开", [this, boardid](int argn, const char **args) { CAN_MASTER->blowerCtrlSafeValve(boardid, 1); }); + box->newSubButton("风机安全阀关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->blowerCtrlSafeValve(boardid, 0); }); + box->newSubButtonEnd(); + box->newSubButton("风机读取电流", [this, boardid](int argn, const char **args) { + int val = CAN_MASTER->blowerReadEI(boardid); ISHOW("val:%d", val); }); - box->newFunc("风机是否错误", {}, [this, boardid](int argn, const char **args) { + box->newSubButton("风机是否错误", [this, boardid](int argn, const char **args) { bool val = CAN_MASTER->blowerReadElectricIsError(boardid); ISHOW("val:%d", val); }); @@ -306,10 +192,15 @@ void TabBuilder::buildBlowerTab(const char *tabname, int boardid) { void TabBuilder::buildAirCompressorTab(const char *tabname, int boardid) { ZQVTabPage *tab = getTab(tabname); ZQFunctionListBox *box = new ZQFunctionListBox(tab, "空压机", 4); - box->newFunc("空压机控制", {"power"}, [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrl(boardid, atoi(args[0])); }); - box->newFunc("空压机安全阀控制", {"valve_state"}, [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrlSafeValve(boardid, atoi(args[0])); }); + box->newSubButton("空压机打开", [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrl(boardid, 1); }); + box->newSubButton("空压机关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrl(boardid, 0); }); + box->newSubButtonEnd(); + // box->newFunc("空压机安全阀控制", {"valve_state"}, [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrlSafeValve(boardid, atoi(args[0])); }); + box->newSubButton("空压机安全阀打开", [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrlSafeValve(boardid, 1); }); + box->newSubButton("空压机安全阀关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->airCompressorCtrlSafeValve(boardid, 0); }); + box->newFunc("空压机读取电流", {}, [this, boardid](int argn, const char **args) { - int val = CAN_MASTER->airCompressorReadElectricCurrent(boardid); + int val = CAN_MASTER->airCompressorReadEI(boardid); ISHOW("val:%d", val); }); } @@ -317,7 +208,8 @@ void TabBuilder::buildAirCompressorTab(const char *tabname, int boardid) { void TabBuilder::buildAirTightnessTestACTab(const char *tabname, int boardid) { ZQVTabPage *tab = getTab(tabname); ZQFunctionListBox *box = new ZQFunctionListBox(tab, "气密性测试空压机", 4); - box->newFunc("空调控制", {"power"}, [this, boardid](int argn, const char **args) { CAN_MASTER->airTightnessTestACCtrl(boardid, atoi(args[0])); }); + box->newSubButton("打开", [this, boardid](int argn, const char **args) { CAN_MASTER->airTightnessTestACCtrl(boardid, 1); }); + box->newSubButton("关闭", [this, boardid](int argn, const char **args) { CAN_MASTER->airTightnessTestACCtrl(boardid, 0); }); } void TabBuilder::buildPSBusTab(const char *tabname, int boardid) { ZQVTabPage *tab = getTab(tabname);