Browse Source

V106

master
zhaohe 1 month ago
parent
commit
ee1687e280
  1. 2
      app_protocols/transmit_disfection_protocol
  2. 5
      src/app/transmit_disinfection/utils/tabbuilder.cpp
  3. 2
      src/app_version.hpp

2
app_protocols/transmit_disfection_protocol

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

5
src/app/transmit_disinfection/utils/tabbuilder.cpp

@ -361,12 +361,11 @@ void TabBuilder::buildValveCtrlTab(const char *tabname, int boardid) {
// });
// }
void TabBuilder::buildLiquidLevelStateReaderTab(const char *tabname, int boardid) {
ZQVTabPage *tab = getTab(tabname);
ZQFunctionListBox *box = new ZQFunctionListBox(tab, "液位(IO版)状态读取", 4);
box->newFunc("读取状态(如果是IO0:低液位,IO1:中液位,IO2:高液位)", {}, [this, boardid](int argn, const char **args) { //
shared_ptr<Receipt> receipt = CAN_MASTER->getCanProtocolCom()->callcmd0(boardid, kfn_liquid_level_read_io_state, DEFUALT_OVERTIME);
box->newFunc("读取状态(0:无液体, 1:低液位, 2:中液位, 3:高液位)", {}, [this, boardid](int argn, const char **args) { //
shared_ptr<Receipt> receipt = CAN_MASTER->getCanProtocolCom()->callcmd0(boardid, kfn_disinfectant_bucket_level_sensor_read_level, DEFUALT_OVERTIME);
ISHOW("IO0:%d", receipt->getContent(0) & 0x01);
ISHOW("IO1:%d", (receipt->getContent(0) >> 1) & 0x01);
ISHOW("IO2:%d", (receipt->getContent(0) >> 2) & 0x01);

2
src/app_version.hpp

@ -1,7 +1,7 @@
#pragma once
#define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0)
#define APP_VERSION VERSION(1, 0, 5)
#define APP_VERSION VERSION(1, 0, 6)
#define APP_VERSION_STR "1.0.4"
#define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION)

Loading…
Cancel
Save