From 56d4911bef6ac0fb536f38fbcded65eee4eb985f Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 9 Sep 2023 14:33:16 +0800
Subject: [PATCH] update

---
 src/service/device_io_control_service.hpp      |  4 ++--
 src/service/device_io_control_service_test.cpp | 31 +++++++++++---------------
 src/service/device_io_control_service_test.hpp | 14 ++++++------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/service/device_io_control_service.hpp b/src/service/device_io_control_service.hpp
index f092670..b75886a 100644
--- a/src/service/device_io_control_service.hpp
+++ b/src/service/device_io_control_service.hpp
@@ -72,7 +72,7 @@ class DeviceIoControlService : public enable_shared_from_this<DeviceIoControlSer
   virtual int heatingStrip_getio2();
   virtual int heatingStrip_getstate();
   virtual int heatingStrip_getcurrentValue();
-  void        heartingPlate_setPower(bool val);
+ virtual void        heartingPlate_setPower(bool val);
 
   /*******************************************************************************
    *                                 鼓风机控制                                  *
@@ -124,7 +124,7 @@ class DeviceIoControlService : public enable_shared_from_this<DeviceIoControlSer
   virtual int getWaterImmersionSensor1();
   virtual int getWaterImmersionSensor2();
 
-  int         getDisinfectantVolume_g();  // g
+  virtual int         getDisinfectantVolume_g();  // g
   virtual int getPressureSensorData(int index);
 
   typedef struct {
diff --git a/src/service/device_io_control_service_test.cpp b/src/service/device_io_control_service_test.cpp
index 87f07d5..a88bf84 100644
--- a/src/service/device_io_control_service_test.cpp
+++ b/src/service/device_io_control_service_test.cpp
@@ -3,16 +3,6 @@
 using namespace iflytop;
 using namespace std;
 
-#if 0
-模块           板子 硬件ID ID
-空压机-安全电磁阀 3 PC2 0
-空压机-通断电磁阀 3 PC3 1
-鼓风机-安全电磁阀 3 PC4 2
--通断电磁阀      3 PC5 3
-加热片-安全电磁阀 3 PC6 4
--通断电磁阀      3 PC7 5
-#endif
-
 #define IN_TEST 1
 
 void DeviceIoControlServiceTest::initialize() {}
@@ -183,24 +173,29 @@ int DeviceIoControlServiceTest::getWaterImmersionSensor2() { return 0; }
 DeviceIoControlService::h2o2sensor_data_t DeviceIoControlServiceTest::getH2O2SenSorData1() {
   DeviceIoControlService::h2o2sensor_data_t data;
 
-  static bool isPumpOpen = false;
-  static int  h2o2       = 0;
+  static bool       isPumpOpen = false;
+  static int        h2o2       = 0;
+  static int        maxh2o2    = 0;
+  static zsteady_tp opentime;
+  static zsteady_tp closetime;
   if (!isPumpOpen && sprayLiquidPump_getState() != 0) {
     isPumpOpen = true;
     h2o2       = 0;
+    opentime   = zsteady_clock().now();
   }
   if (isPumpOpen && sprayLiquidPump_getState() == 0) {
     isPumpOpen = false;
+    closetime  = zsteady_clock().now();
   }
 
   if (isPumpOpen) {
-    h2o2 += 10;
+    int hasopens = zsteady_clock().elapsedTimeS(opentime);
+    h2o2         = hasopens * 2;
+    if (h2o2 > 1500) h2o2 = 1500;
+    maxh2o2 = h2o2;
   } else {
-    if (h2o2 <= 10) {
-      h2o2 -= 1;
-    } else {
-      h2o2 -= 10;
-    }
+    int hasopens = zsteady_clock().elapsedTimeS(closetime);
+    h2o2         = maxh2o2 - hasopens * 2;
   }
 
   if (h2o2 < 0) {
diff --git a/src/service/device_io_control_service_test.hpp b/src/service/device_io_control_service_test.hpp
index 9747da7..d120a26 100644
--- a/src/service/device_io_control_service_test.hpp
+++ b/src/service/device_io_control_service_test.hpp
@@ -54,11 +54,11 @@ class DeviceIoControlServiceTest : public DeviceIoControlService {
   /*******************************************************************************
    *                                 加热片控制                                  *
    *******************************************************************************/
-  virtual int heatingStrip_getio1();
-  virtual int heatingStrip_getio2();
-  virtual int heatingStrip_getstate();
-  virtual int heatingStrip_getcurrentValue();
-  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);
 
   /*******************************************************************************
    *                                 鼓风机控制                                  *
@@ -103,7 +103,7 @@ class DeviceIoControlServiceTest : public DeviceIoControlService {
 
   virtual void sprayLiquidPump_open_for_test(int gpm);
   virtual void sprayLiquidPump_close_for_test();
-  
+
   virtual h2o2sensor_data_t getH2O2SenSorData1();
 
   /******************************************************************************
@@ -112,7 +112,7 @@ class DeviceIoControlServiceTest : public DeviceIoControlService {
   virtual int getWaterImmersionSensor1();
   virtual int getWaterImmersionSensor2();
 
-  int          getDisinfectantVolume_g();  // g
+  virtual int  getDisinfectantVolume_g();  // g
   virtual int  getPressureSensorData(int index);
   virtual bool getAllSensorData(DeviceIoControlService::all_h2o2sensor_data_t& data);
 };