Browse Source

v1.0.2

master
zhaohe 12 months ago
parent
commit
9058e4709f
  1. 2
      app_protocols/transmit_disfection_protocol
  2. 8
      src/app/transmit_disinfection/transmitdisinfection.cpp
  3. 2
      src/app_version.hpp
  4. 1
      src/protocol/zscanprotocol_com/zscanprotocol_com.cpp

2
app_protocols/transmit_disfection_protocol

@ -1 +1 @@
Subproject commit aee8641e56d8b337ba7f151e7fc8b216fdc94862
Subproject commit 6fb781e6b5fe8f4f44c7046b30cbee47512f5bd9

8
src/app/transmit_disinfection/transmitdisinfection.cpp

@ -54,7 +54,7 @@ TransmitDisinfection::TransmitDisinfection(QWidget *parent) : QTabWidget(parent)
} else if (type == kreport) {
BSHOW("[REPORT ] [%d->%d],%s %s(%d)", from, to, zhex2str(hex, sizeof(*frame)).c_str(), //
zhex2str(frame->params, paramLen).c_str(), paramLen); //
}
}
processReportPacket(type, from, to, hex, hexlen);
});
}
@ -89,7 +89,7 @@ void TransmitDisinfection::processReportPacket(packet_type_t type, uint8_t from,
report_h2o2_data_t *ack = (report_h2o2_data_t *)frame->params;
QString info;
info.append(fmt("[H2O2 ][FROM:%03d] err:%d h2o2:%d ppm (adc:%d) (x10ppm),hum:%d (x10),temp:%d (x10),sat:%d (x10)", //
from, ack->sensor_error, ack->h2o2,ack->h2o2adc, ack->rh, ack->temp, ack->rs));
from, ack->sensor_error, ack->h2o2, ack->h2o2adc, ack->rh, ack->temp, ack->rs));
RSHOW(info.toStdString().c_str());
}
//
@ -102,6 +102,10 @@ void TransmitDisinfection::processReportPacket(packet_type_t type, uint8_t from,
report_water_sensor_state_t *ack = (report_water_sensor_state_t *)frame->params;
RSHOW("[设备底部水浸][FROM:%03d] (%d)", from, ack->state);
}
//
else {
RSHOW("[UNKNOWN ][FROM:%03d] %s", from, zhex2str(hex, hexlen).c_str());
}
}
TransmitDisinfection::~TransmitDisinfection() {}

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, 1)
#define APP_VERSION VERSION(1, 0, 2)
#define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION)
#define APP_VERSION_SUB VERSION_SUB(APP_VERSION)

1
src/protocol/zscanprotocol_com/zscanprotocol_com.cpp

@ -6,6 +6,7 @@
using namespace iflytop;
using namespace zscanprotocol;
using namespace err;
#define TAG "ZScanProtocolCom"

Loading…
Cancel
Save