Browse Source

update

master
zhaohe 1 year ago
parent
commit
0db546b603
  1. 2
      iflytoplinuxsdk
  2. 14
      src/api/cmds/device_state_cmd_impl.cpp
  3. 13
      默认配置.md

2
iflytoplinuxsdk

@ -1 +1 @@
Subproject commit aee79871ce50d2f4f636dc28971e51351cfab1d7
Subproject commit efa46c4c7dc2c30b0951ddff97de9473e2db00e5

14
src/api/cmds/device_state_cmd_impl.cpp

@ -4,7 +4,6 @@ using namespace iflytop;
json DeviceStateCmdImpl::createSensorDataJson() {
json report;
report["h2o2_sensor_state_1"] = m_deviceIoControlService->H2O2Sensor_readSensorState(0);
report["h2o2_sensor_state_2"] = m_deviceIoControlService->H2O2Sensor_readSensorState(1);
report["h2o2_sensor_state_3"] = m_deviceIoControlService->H2O2Sensor_readSensorState(2);
@ -50,7 +49,7 @@ json DeviceStateCmdImpl::createSensorDataJson() {
// Water immersion sensor
report["disinfectant_volume"] = m_deviceIoControlService->getDisinfectantVolume_g();
report["pressure"][0] = m_deviceIoControlService->getPressureSensorData(1); // 液位
report["pressure"][0] = m_deviceIoControlService->getPressureSensorData(1); // 液位
report["pressure"][1] = m_deviceIoControlService->getPressureSensorData(2); // 空压机压力
report["pressure"][2] = m_deviceIoControlService->getPressureSensorData(3); // 加液泵
report["pressure"][3] = m_deviceIoControlService->getPressureSensorData(4); // 喷射泵
@ -65,9 +64,6 @@ json DeviceStateCmdImpl::createSensorDataJson() {
#endif
#endif
#if (defined PROJECT_TYPE_DRAW_BAR_BOX)
@ -81,6 +77,10 @@ json DeviceStateCmdImpl::createSensorDataJson() {
report["draw_bar_box_disinfection"]["heatingStrip"]["temperature"] = m_deviceIoControlService->DBDB__heaterReadTemperatureData(); // 温度
#endif
#if (defined PROJECT_TYPE_DRAW_BAR_BOX)
report["subboardstate"]["extChannelCtrlBoard"]["online"] = m_deviceIoControlService->DBDB__extValBoardIsOnline();
#endif
return report;
}
@ -134,10 +134,6 @@ void DeviceStateCmdImpl::getState(json& cmd, json& receipt) {
receipt["disinfectionConfig"]["stoped_humi"] = m_disinfectionCtrlService->getDisinfectionService()->getStopedHumi();
receipt["disinfectionConfig"]["continued_humi"] = m_disinfectionCtrlService->getDisinfectionService()->getContinuedHumi();
#if (defined PROJECT_TYPE_DRAW_BAR_BOX)
receipt["subboardstate"]["extChannelCtrlBoard"]["online"] = m_deviceIoControlService->DBDB__extValBoardIsOnline();
#endif
return;
}
#if (defined PROJECT_TYPE_DRAW_BAR_BOX)

13
默认配置.md

@ -0,0 +1,13 @@
消毒机拉杆箱
```
```
```
```
Loading…
Cancel
Save