update

src/service/device_io_control_service.cpp

@@ -118,7 +118,7 @@ int DeviceIoControlService::airCompressor_getio2() { return m_zcanHost->read_wri
 int DeviceIoControlService::airCompressor_getcurrentValue() { return m_adc_0 * 0.00167 - 1.25; }
 int DeviceIoControlService::airCompressor_channelCtrl(int32_t val) {
   m_airCompressor_channelState = val;
-  m_zcanHost->call(kcmd_air_compressor_ch_ctrl, val);
+  m_zcanHost->call(kcmd_air_compressor_ch_ctrl, m_airCompressor_channelState > 0 ? 0 : 1);
   return 0;
 }
 bool DeviceIoControlService::airCompressor_getChannelState() { return m_airCompressor_channelState; }

src/service/device_io_control_service_test.cpp

@@ -9,7 +9,7 @@ void DeviceIoControlServiceTest::initialize() {}
 
 void DeviceIoControlServiceTest::startScan() {}
 
-void DeviceIoControlServiceTest::airCompressor_setState(bool val) {
+void DeviceIoControlServiceTest::airCompressor_setState(int32_t val) {
   logger->info("airCompressor_setState:{}", val);
   if (val) {
     m_airCompressor_State = true;
@@ -42,7 +42,7 @@ int DeviceIoControlServiceTest::airCompressor_getstate() {
   return 0;
 }
 
-int DeviceIoControlServiceTest::airCompressor_channelCtrl(bool chOpen) {
+int DeviceIoControlServiceTest::airCompressor_channelCtrl(int32_t chOpen) {
   m_airCompressor_channelState = chOpen;
   return 0;
 }

src/service/device_io_control_service_test.hpp

@@ -48,7 +48,7 @@ class DeviceIoControlServiceTest : public DeviceIoControlService {
 
   int32_t m_AirInletProportionalValve_state  = 0;
   int32_t m_AirOutletProportionalValve_state = 0;
-  bool    m_airCompressor_channelState       = false;
+  int32_t    m_airCompressor_channelState       = 0;
 
  public:
   virtual void initialize();
@@ -58,78 +58,78 @@ class DeviceIoControlServiceTest : public DeviceIoControlService {
   /*******************************************************************************
    *                                 加热片控制                                  *
    *******************************************************************************/
-  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() override;
+  virtual int  heatingStrip_getio2() override;
+  virtual int  heatingStrip_getstate() override;
+  virtual int  heatingStrip_getcurrentValue() override;
+  virtual void heartingPlate_setPower(bool val) override;
 
   /*******************************************************************************
    *                                 鼓风机控制                                  *
    *******************************************************************************/
-  virtual int airBlower_getio1();
-  virtual int airBlower_getio2();
-  virtual int airBlower_getstate();
-  virtual int airBlower_getcurrentValue();
-  virtual int airBlower_setState(bool state);
+  virtual int airBlower_getio1() override;
+  virtual int airBlower_getio2() override;
+  virtual int airBlower_getstate() override;
+  virtual int airBlower_getcurrentValue() override;
+  virtual int airBlower_setState(bool state) override;
 
   /*******************************************************************************
    *                                 空压机控制                                  *
    *******************************************************************************/
-  virtual void airCompressor_setState(bool val);
-  virtual int  airCompressor_getio1();
-  virtual int  airCompressor_getio2();
-  virtual int  airCompressor_getstate();
-  virtual int  airCompressor_getcurrentValue();
-  virtual int  airCompressor_channelCtrl(bool chOpen);
-  virtual bool airCompressor_getChannelState();
+  virtual void airCompressor_setState(int32_t val) override;
+  virtual int  airCompressor_getio1() override;
+  virtual int  airCompressor_getio2() override;
+  virtual int  airCompressor_getstate() override;
+  virtual int  airCompressor_getcurrentValue() override;
+  virtual int  airCompressor_channelCtrl(int32_t chOpen) override;
+  virtual bool airCompressor_getChannelState() override;
 
   /*******************************************************************************
    *                                 比例阀控制                                    *
    *******************************************************************************/
 
-  virtual void AirInletProportionalValve_setState(int32_t val);
-  virtual void AirOutletProportionalValve_setState(int32_t val);
+  virtual void AirInletProportionalValve_setState(int32_t val) override;
+  virtual void AirOutletProportionalValve_setState(int32_t val) override;
 
-  virtual int32_t AirInletProportionalValve_getState();
-  virtual int32_t AirOutletProportionalValve_getState();
+  virtual int32_t AirInletProportionalValve_getState() override;
+  virtual int32_t AirOutletProportionalValve_getState() override;
 
   // heatingStrip
 
   /*******************************************************************************
    *                                 泵控制                                       *
    *******************************************************************************/
-  virtual int getChargingPump_PumpRPM();
+  virtual int getChargingPump_PumpRPM() override;
   // 排液泵
-  virtual void drainingPump_open();
-  virtual void drainingPump_close();
+  virtual void drainingPump_open() override;
+  virtual void drainingPump_close() override;
   // 充液泵
-  virtual void replenishingFluidsPump_open();
-  virtual void replenishingFluidsPump_close();
+  virtual void replenishingFluidsPump_open() override;
+  virtual void replenishingFluidsPump_close() override;
 
-  virtual void replenishingFluidsPump_open_for_test(int speed);
-  virtual void replenishingFluidsPump_close_for_test();
+  virtual void replenishingFluidsPump_open_for_test(int speed) override;
+  virtual void replenishingFluidsPump_close_for_test() override;
 
   // 喷液泵
-  virtual void sprayLiquidPump_open(int gpm);
-  virtual void sprayLiquidPump_close();
-  virtual int  sprayLiquidPump_getState();
-  virtual int  sprayLiquidPump_getRPM();
-  virtual int  sprayLiquidPump_getGPM();
+  virtual void sprayLiquidPump_open(int gpm) override;
+  virtual void sprayLiquidPump_close() override;
+  virtual int  sprayLiquidPump_getState() override;
+  virtual int  sprayLiquidPump_getRPM() override;
+  virtual int  sprayLiquidPump_getGPM() override;
 
-  virtual void sprayLiquidPump_open_for_test(int gpm);
-  virtual void sprayLiquidPump_close_for_test();
+  virtual void sprayLiquidPump_open_for_test(int gpm) override;
+  virtual void sprayLiquidPump_close_for_test() override;
 
-  virtual h2o2sensor_data_t getH2O2SenSorData1();
+  virtual h2o2sensor_data_t getH2O2SenSorData1() override;
 
   /******************************************************************************
    *                                 水浸传感器                                  *
    ******************************************************************************/
-  virtual int getWaterImmersionSensor1();
-  virtual int getWaterImmersionSensor2();
+  virtual int getWaterImmersionSensor1() override;
+  virtual int getWaterImmersionSensor2() override;
 
-  virtual int  getDisinfectantVolume_g();  // g
-  virtual int  getPressureSensorData(int index);
-  virtual bool getAllSensorData(DeviceIoControlService::all_h2o2sensor_data_t& data);
+  virtual int  getDisinfectantVolume_g();  //  overrideg
+  virtual int  getPressureSensorData(int index) override;
+  virtual bool getAllSensorData(DeviceIoControlService::all_h2o2sensor_data_t& data) override;
 };
 }  // namespace iflytop