正负压管道消毒机 -deviceState

api/cmds/device_state_cmd_impl.cpp

@@ -39,6 +39,21 @@ json DeviceStateCmdImpl::createSensorDataJson() {
   report["temp_3"]       = m_deviceIoControlService->H2O2Sensor_readTemperature(2);
   report["humid_3"]      = m_deviceIoControlService->H2O2Sensor_readHumid(2);
   report["saturation_3"] = m_deviceIoControlService->H2O2Sensor_readSaturation(2) + 1;  //+1是为让曲线不重合
+
+#ifdef PROJECT_TYPE_PIPE_DISINFECTION
+
+  report["AirInletProportionalValve"]["state"]  = m_deviceIoControlService->AirInletProportionalValve_getState();
+  report["AirOutletProportionalValve"]["state"] = m_deviceIoControlService->AirOutletProportionalValve_getState();
+
+  report["airCompressor"]["channelIndex"] = m_deviceIoControlService->airCompressor_getChannelIndex();
+  report["airCompressor"]["pressure"]     = m_deviceIoControlService->airCompressor_getPressure();
+
+  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);  // 喷射泵
+#endif
+
   return report;
 }
 

service/disinfection_ctl_service.cpp

@@ -414,7 +414,14 @@ void DisinfectionCtrlService::initContext(DisinfectionContext& context,
   m_context.afterDisinfectantVolume_g  = 0;
   m_context.beforeDisinfectantVolume_g = m_deviceIoControlService->getDisinfectantVolume_g();
 
+#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION)
   m_deviceIoControlService->warningLightCtrl(0, 0, 1, 0);
+#endif
+
+#ifdef PROJECT_TYPE_PIPE_DISINFECTION
+  m_deviceIoControlService->warningLightCtrl(1, 1, 0, 0);
+#endif
+
   m_deviceIoControlService->heartingPlate_setPower(true);
   m_deviceIoControlService->airBlower_setState(true);
   context.csvlogger = createCSVLogger(context.m_disinfectionID);