|
@ -4,7 +4,26 @@ using namespace iflytop; |
|
|
json DeviceStateCmdImpl::createSensorDataJson() { |
|
|
json DeviceStateCmdImpl::createSensorDataJson() { |
|
|
json report; |
|
|
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); |
|
|
|
|
|
|
|
|
|
|
|
report["h2o2_1"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(0); |
|
|
|
|
|
report["temp_1"] = m_deviceIoControlService->H2O2Sensor_readTemperature(0); |
|
|
|
|
|
report["humid_1"] = m_deviceIoControlService->H2O2Sensor_readHumid(0); |
|
|
|
|
|
report["saturation_1"] = m_deviceIoControlService->H2O2Sensor_readSaturation(0); //+1是为让曲线不重合
|
|
|
|
|
|
report["h2o2_2"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(1); |
|
|
|
|
|
report["temp_2"] = m_deviceIoControlService->H2O2Sensor_readTemperature(1); |
|
|
|
|
|
report["humid_2"] = m_deviceIoControlService->H2O2Sensor_readHumid(1); |
|
|
|
|
|
report["saturation_2"] = m_deviceIoControlService->H2O2Sensor_readSaturation(1); //+1是为让曲线不重合
|
|
|
|
|
|
report["h2o2_3"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(2); |
|
|
|
|
|
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是为让曲线不重合
|
|
|
|
|
|
|
|
|
#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION)
|
|
|
#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION)
|
|
|
|
|
|
|
|
|
report["airCompressor"]["io1"] = m_deviceIoControlService->airCompressor_getio1(); |
|
|
report["airCompressor"]["io1"] = m_deviceIoControlService->airCompressor_getio1(); |
|
|
report["airCompressor"]["io2"] = m_deviceIoControlService->airCompressor_getio2(); |
|
|
report["airCompressor"]["io2"] = m_deviceIoControlService->airCompressor_getio2(); |
|
|
report["airCompressor"]["currentVal"] = m_deviceIoControlService->airCompressor_getcurrentValue(); |
|
|
report["airCompressor"]["currentVal"] = m_deviceIoControlService->airCompressor_getcurrentValue(); |
|
@ -30,24 +49,6 @@ json DeviceStateCmdImpl::createSensorDataJson() { |
|
|
report["EvaporationBinWaterDetection"] = m_deviceIoControlService->getEvaporationBinWaterDetection(); |
|
|
report["EvaporationBinWaterDetection"] = m_deviceIoControlService->getEvaporationBinWaterDetection(); |
|
|
// Water immersion sensor
|
|
|
// Water immersion sensor
|
|
|
report["disinfectant_volume"] = m_deviceIoControlService->getDisinfectantVolume_g(); |
|
|
report["disinfectant_volume"] = m_deviceIoControlService->getDisinfectantVolume_g(); |
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
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); |
|
|
|
|
|
|
|
|
|
|
|
report["h2o2_1"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(0); |
|
|
|
|
|
report["temp_1"] = m_deviceIoControlService->H2O2Sensor_readTemperature(0); |
|
|
|
|
|
report["humid_1"] = m_deviceIoControlService->H2O2Sensor_readHumid(0); |
|
|
|
|
|
report["saturation_1"] = m_deviceIoControlService->H2O2Sensor_readSaturation(0); //+1是为让曲线不重合
|
|
|
|
|
|
report["h2o2_2"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(1); |
|
|
|
|
|
report["temp_2"] = m_deviceIoControlService->H2O2Sensor_readTemperature(1); |
|
|
|
|
|
report["humid_2"] = m_deviceIoControlService->H2O2Sensor_readHumid(1); |
|
|
|
|
|
report["saturation_2"] = m_deviceIoControlService->H2O2Sensor_readSaturation(1); //+1是为让曲线不重合
|
|
|
|
|
|
report["h2o2_3"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(2); |
|
|
|
|
|
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是为让曲线不重合
|
|
|
|
|
|
|
|
|
|
|
|
#if (defined PROJECT_TYPE_PIPE_DISINFECTION)
|
|
|
#if (defined PROJECT_TYPE_PIPE_DISINFECTION)
|
|
|
|
|
|
|
|
@ -57,19 +58,17 @@ json DeviceStateCmdImpl::createSensorDataJson() { |
|
|
report["airCompressor"]["channelIndex"] = m_deviceIoControlService->airCompressor_getChannelIndex(); |
|
|
report["airCompressor"]["channelIndex"] = m_deviceIoControlService->airCompressor_getChannelIndex(); |
|
|
report["airCompressor"]["pressure"] = m_deviceIoControlService->airCompressor_getPressure(); |
|
|
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); // 喷射泵
|
|
|
|
|
|
#elif (defined PROJECT_TYPE_DRAW_BAR_BOX)
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
|
|
|
#if (defined PROJECT_TYPE_DRAW_BAR_BOX)
|
|
|
#if (defined PROJECT_TYPE_DRAW_BAR_BOX)
|
|
|
report["draw_bar_box_disinfection"]["pressure"][0] = m_deviceIoControlService->DBDB__readPressureSensor(1); |
|
|
|
|
|
report["draw_bar_box_disinfection"]["pressure"][1] = m_deviceIoControlService->DBDB__readPressureSensor(2); |
|
|
|
|
|
report["draw_bar_box_disinfection"]["pressure"][2] = m_deviceIoControlService->DBDB__readPressureSensor(3); |
|
|
|
|
|
|
|
|
report["pressure"][0] = m_deviceIoControlService->getPressureSensorData(1); |
|
|
|
|
|
report["pressure"][1] = m_deviceIoControlService->getPressureSensorData(2); |
|
|
|
|
|
report["pressure"][2] = m_deviceIoControlService->getPressureSensorData(3); |
|
|
|
|
|
report["draw_bar_box_disinfection"]["pressure"][0] = m_deviceIoControlService->getPressureSensorData(1); |
|
|
|
|
|
report["draw_bar_box_disinfection"]["pressure"][1] = m_deviceIoControlService->getPressureSensorData(2); |
|
|
|
|
|
report["draw_bar_box_disinfection"]["pressure"][2] = m_deviceIoControlService->getPressureSensorData(3); |
|
|
report["draw_bar_box_disinfection"]["heatingStrip"]["current"] = m_deviceIoControlService->DBDB__heaterReadElectricCurrent(); // 电流
|
|
|
report["draw_bar_box_disinfection"]["heatingStrip"]["current"] = m_deviceIoControlService->DBDB__heaterReadElectricCurrent(); // 电流
|
|
|
report["draw_bar_box_disinfection"]["heatingStrip"]["temperature"] = m_deviceIoControlService->DBDB__heaterReadTemperatureData(); // 温度
|
|
|
report["draw_bar_box_disinfection"]["heatingStrip"]["temperature"] = m_deviceIoControlService->DBDB__heaterReadTemperatureData(); // 温度
|
|
|
#endif
|
|
|
#endif
|
|
|