update

src/main_control_service.cpp

@@ -159,6 +159,13 @@ json MainControlService::createSensorDataJson() {
   report["heatingStrip"]["io2"]        = m_deviceIoControlService->heatingStrip_getio2();
   report["heatingStrip"]["currentVal"] = m_deviceIoControlService->heatingStrip_getcurrentValue();
 
+  report["pressure"][0] = m_deviceIoControlService->getPressureSensorData(0);  // 液位
+  report["pressure"][1] = m_deviceIoControlService->getPressureSensorData(1);  // 空压机压力
+  report["pressure"][2] = m_deviceIoControlService->getPressureSensorData(2);  // 加液泵
+  report["pressure"][3] = m_deviceIoControlService->getPressureSensorData(3);  // 喷射泵
+
+  //  ds->getPressureSensorData(1);
+
   report["sprinklerPumpRPM"] = m_deviceIoControlService->sprayLiquidPump_getRPM();
   report["chargingPumpRPM"]  = m_deviceIoControlService->getChargingPump_PumpRPM();
 

src/service/device_io_control_service.cpp

@@ -278,7 +278,6 @@ int DeviceIoControlService::getDisinfectantVolume_g() {
 }
 int DeviceIoControlService::getPressureSensorData(int index) {
   lock_guard<recursive_mutex> lock(lock_);
-
   return m_pressure_sensor_data[index].value;
 }
 

src/service/device_io_control_service.hpp

@@ -68,11 +68,11 @@ class DeviceIoControlService : public enable_shared_from_this<DeviceIoControlSer
   /*******************************************************************************
    *                                 加热片控制                                  *
    *******************************************************************************/
-  virtual int heatingStrip_getio1();
-  virtual int heatingStrip_getio2();
-  virtual int heatingStrip_getstate();
-  virtual int heatingStrip_getcurrentValue();
- virtual void        heartingPlate_setPower(bool val);
+  virtual int  heatingStrip_getio1();
+  virtual int  heatingStrip_getio2();
+  virtual int  heatingStrip_getstate();
+  virtual int  heatingStrip_getcurrentValue();
+  virtual void heartingPlate_setPower(bool val);
 
   /*******************************************************************************
    *                                 鼓风机控制                                  *
@@ -124,8 +124,8 @@ class DeviceIoControlService : public enable_shared_from_this<DeviceIoControlSer
   virtual int getWaterImmersionSensor1();
   virtual int getWaterImmersionSensor2();
 
-  virtual int         getDisinfectantVolume_g();  // g
-  virtual int getPressureSensorData(int index);
+  virtual int getDisinfectantVolume_g();         // g
+  virtual int getPressureSensorData(int index);  // pa
 
   typedef struct {
     int h2o2;        // ppm