update

src/api/cmds/pipeline_disinfection_cmd_append.cpp

@@ -1,24 +1,25 @@
 #include "pipeline_disinfection_cmd_append.hpp"
 using namespace iflytop;
 #ifdef PROJECT_TYPE_PIPE_DISINFECTION
+// )
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_setState(json& cmd, json& receipt) {
-  m_deviceIoControlService->airCompressor_setState(cmd["params"][0]);
+  m_deviceIoControlService->airCompressor_setState(jsonGet<int>(cmd["params"][0]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_channelSelect(json& cmd, json& receipt) {
-  m_deviceIoControlService->airCompressor_channelSelect(cmd["params"][0]);
+  m_deviceIoControlService->airCompressor_channelSelect(jsonGet<int>(cmd["params"][0]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_setValve1(json& cmd, json& receipt) {
-  m_deviceIoControlService->airCompressor_setValve1(cmd["params"][0]);
+  m_deviceIoControlService->airCompressor_setValve1(jsonGet<int>(cmd["params"][0]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_setValve2(json& cmd, json& receipt) {
-  m_deviceIoControlService->airCompressor_setValve2(cmd["params"][0]);
+  m_deviceIoControlService->airCompressor_setValve2(jsonGet<int>(cmd["params"][0]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_getPressureDirect(json& cmd, json& receipt) {
-  receipt["ack"][0] = m_deviceIoControlService->airCompressor_getPressureDirect();
+  receipt["ack"][0] = m_deviceIoControlService->airCompressor_getPressureDirectKpa();
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_getPressure(json& cmd, json& receipt) {
@@ -34,7 +35,7 @@ void PipelineDisinfectionCmdAppend::DeviceIOControlService__airCompressor_getVal
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__AirInletProportionalValve_setState(json& cmd, json& receipt) {
-  m_deviceIoControlService->AirInletProportionalValve_setState(cmd["params"][0]);
+  m_deviceIoControlService->AirInletProportionalValve_setState(jsonGet<int>(cmd["params"][0]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__AirInletProportionalValve_getState(json& cmd, json& receipt) {
@@ -46,11 +47,11 @@ void PipelineDisinfectionCmdAppend::DeviceIOControlService__AirOutletProportiona
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__AirOutletProportionalValve_setState(json& cmd, json& receipt) {
-  m_deviceIoControlService->AirOutletProportionalValve_setState(cmd["params"][0]);
+  m_deviceIoControlService->AirOutletProportionalValve_setState(jsonGet<int>(cmd["params"][0]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__AirProportionalValve_setState(json& cmd, json& receipt) {
-  m_deviceIoControlService->AirProportionalValve_setState(cmd["params"][0], cmd["params"][1]);
+  m_deviceIoControlService->AirProportionalValve_setState(jsonGet<int>(cmd["params"][0]), jsonGet<int>(cmd["params"][1]));
   return;
 }
 void PipelineDisinfectionCmdAppend::DeviceIOControlService__AirProportionalValve_getState(json& cmd, json& receipt) {

src/api/front_msg_processer.cpp

@@ -11,7 +11,6 @@ void FrontMsgProcesser::processMsg(json& cmd, json& receipt) {
   } else {
     logger->error("unknown command: {}", cmdstr);
     receipt["ackcode"]   = err::kfail;
-    receipt["reason"] = "unknown command";
   }
 }
 void FrontMsgProcesser::registerMsgProcesser(const string& cmdName, MsgProcesserFn_t fn) {

src/configs/project_setting.hpp

@@ -12,8 +12,8 @@
 #if (!defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) && (!defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) && (!defined PROJECT_TYPE_PIPE_DISINFECTION) && (!defined PROJECT_TYPE_DRAW_BAR_BOX)
 
 // #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1  // 大空间
-#define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1  // 小空间
-// #define PROJECT_TYPE_PIPE_DISINFECTION 1  // 管道消毒机
+// #define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1  // 小空间
+#define PROJECT_TYPE_PIPE_DISINFECTION 1  // 管道消毒机
 // #define PROJECT_TYPE_DRAW_BAR_BOX 1  // 拉感箱
 #endif
 // #if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION)

src/main_control_service.cpp

@@ -98,6 +98,12 @@ void MainControlService::initialize() {
     if (cmdstr == "DBDBTestPage__heaterReadElectricCurrent") disabledump = true;
     if (cmdstr == "DBDBTestPage__readPressureSensor") disabledump = true;
 
+    if (cmdstr == "DeviceIOControlService.airCompressor_getPressureDirect") disabledump = true;
+    if (cmdstr == "DeviceIOControlService.airCompressor_getPressure") disabledump = true;
+    if (cmdstr == "DeviceIOControlService.airCompressor_getValve1") disabledump = true;
+    if (cmdstr == "DeviceIOControlService.airCompressor_getValve2") disabledump = true;
+
+
     if (!disabledump) logger->info("rx:{}", cmd.dump());
 
     m_frontMsgProcesser->processMsg(cmd, receipt);

src/service/device_io_control_service.cpp

@@ -72,6 +72,13 @@ void DeviceIoControlService::startScan() {
 
       if (m_zcanHost->huacheng_pressure_sensor_read_c1005(2, sdata) == 0) {
         lock_guard<recursive_mutex> lock(lock_);
+        // uint8_t precision;
+        // uint8_t unit;
+        // int16_t value;
+        // int16_t zero;
+        // int16_t full;
+        // precision: 1 unit:1 value:0 zero:0 full:8000
+        // logger->info("precision: {} unit:{} value:{} zero:{} full:{}", sdata.precision, sdata.unit, sdata.value, sdata.zero, sdata.full);
         m_pressure_sensor_data[2] = sdata;
       }
 
@@ -555,10 +562,11 @@ int   DeviceIoControlService::airCompressor_getValve1() { return m_airCompressor
 int   DeviceIoControlService::airCompressor_getValve2() { return m_airCompressor_valve2State; }
 int   DeviceIoControlService::airCompressor_getChannelIndex() { return m_airCompressor_channelIndex; }
 float DeviceIoControlService::airCompressor_getPressure() { return m_pressure_sensor_data[2].value / 10.0; }
-float DeviceIoControlService::airCompressor_getPressureDirect() {
-  int32_t ack = 0;
-  m_zcanHost->call(kcmd_air_compressor_read_pressure, &ack);
-  return ack / 10.0;
+float DeviceIoControlService::airCompressor_getPressureDirectKpa() {
+  // int32_t ack = 0;
+  // m_zcanHost->call(kcmd_air_compressor_read_pressure, &ack);
+  // return ack / 10.0;
+  return airCompressor_getPressure();
 }
 
 #endif

src/service/device_io_control_service.hpp

@@ -154,7 +154,7 @@ class DeviceIoControlService : public IF_DeviceIoContrlService {
   virtual int   airCompressor_getValve1() override;
   virtual int   airCompressor_getValve2() override;
   virtual float airCompressor_getPressure() override;
-  virtual float airCompressor_getPressureDirect() override;
+  virtual float airCompressor_getPressureDirectKpa() override;
 #endif
 
   /*******************************************************************************

src/service/device_io_control_service_test.cpp

@@ -228,7 +228,7 @@ int DeviceIoControlServiceTest::airCompressor_setValve2(int32_t val) {
 int   DeviceIoControlServiceTest::airCompressor_getValve1() { return m_airCompressor_valve1State; }
 int   DeviceIoControlServiceTest::airCompressor_getValve2() { return m_airCompressor_valve2State; }
 float DeviceIoControlServiceTest::airCompressor_getPressure() { return 123.0; }
-float DeviceIoControlServiceTest::airCompressor_getPressureDirect() { return 123.0; }
+float DeviceIoControlServiceTest::airCompressor_getPressureDirectKpa() { return 123.0; }
 #endif
 
 #ifdef PROJECT_TYPE_PIPE_DISINFECTION

src/service/device_io_control_service_test.hpp

@@ -137,7 +137,7 @@ class DeviceIoControlServiceTest : public IF_DeviceIoContrlService {
   virtual int   airCompressor_getValve1() override;
   virtual int   airCompressor_getValve2() override;
   virtual float airCompressor_getPressure() override;
-  virtual float airCompressor_getPressureDirect() override;
+  virtual float airCompressor_getPressureDirectKpa() override;
 #endif
 
 #ifdef PROJECT_TYPE_PIPE_DISINFECTION

src/service/if_devoce_io_contrl_service.hpp

@@ -152,7 +152,7 @@ class IF_DeviceIoContrlService {
   virtual int   airCompressor_getValve1()                = 0;
   virtual int   airCompressor_getValve2()                = 0;
   virtual float airCompressor_getPressure()              = 0;
-  virtual float airCompressor_getPressureDirect()        = 0;
+  virtual float airCompressor_getPressureDirectKpa()        = 0;
 #endif
 
 #ifdef PROJECT_TYPE_PIPE_DISINFECTION