diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index 829e5a2..1986c12 100644 --- a/src/main_control_service.cpp +++ b/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(); diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index 7a3dfc4..682aa01 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -278,7 +278,6 @@ int DeviceIoControlService::getDisinfectantVolume_g() { } int DeviceIoControlService::getPressureSensorData(int index) { lock_guard lock(lock_); - return m_pressure_sensor_data[index].value; } diff --git a/src/service/device_io_control_service.hpp b/src/service/device_io_control_service.hpp index b75886a..e658ebb 100644 --- a/src/service/device_io_control_service.hpp +++ b/src/service/device_io_control_service.hpp @@ -68,11 +68,11 @@ class DeviceIoControlService : public enable_shared_from_this