recode

appsrc/appsetting/project_setting/project_setting_mgr.cpp

@@ -1,8 +1,10 @@
 #include "project_setting_mgr.hpp"
 
 #include "components/zservice_container/zservice_container.hpp"
+#include "appbase/appbase.hpp"
 using namespace std;
 using namespace iflytop;
+#define INSERT(id, boardId, subId) componentIdMap.insert({id, {boardId, subId}})
 
 static string projectType2Str(int val) {
   switch (val) {
@@ -53,4 +55,48 @@ void ProjectSettingMgr::initProjectSetting(int projectTypeInt) {
   } else {
     ZCHECK(false, "projectTypeInt not support: " + to_string(projectTypeInt));
   }
+
+  if (isLageSpaceDM() || isSmallSpaceDM() || isPipeDM()) {
+    // 加液泵
+    INSERT(HardwareComponent::kAddLiquidPump, kFixBoardId_LiquidCtrl, kpumpid_add_liquid);
+    // 喷雾泵
+    INSERT(HardwareComponent::kSprayPump, kFixBoardId_LiquidCtrl, kpumpid_spray);
+    // 风机
+    INSERT(HardwareComponent::kBlower, kFixBoardId_PowerControl, 0);
+    // 空压机
+    INSERT(HardwareComponent::kAirCompressor, kFixBoardId_PowerControl, 0);
+    // 加热器
+    INSERT(HardwareComponent::kHeater, kFixBoardId_PowerControl, 0);
+    // 报警灯
+    INSERT(HardwareComponent::kWarningLight, kFixBoardId_LiquidCtrl, 0);
+    // 蒸发仓水浸
+    INSERT(HardwareComponent::kEvaporationBinWS, kFixBoardId_LiquidCtrl, 0);
+    // 底部水浸
+    INSERT(HardwareComponent::kDeviceBottomWS, kFixBoardId_LiquidCtrl, 0);
+    // 主H2O2传感器
+    INSERT(HardwareComponent::kMainH2O2Sensor, kFixBoardId_PowerControl, 0);
+    // 液体重量传感器
+    INSERT(HardwareComponent::kLiquidWeightPS, kFixBoardId_LiquidCtrl, 1);
+    // 空压机后压力传感器
+    INSERT(HardwareComponent::kACPostPS, kFixBoardId_LiquidCtrl, 0);
+    // 喷雾泵后压力传感器
+    INSERT(HardwareComponent::kSprayPumpPostPS, kFixBoardId_LiquidCtrl, 0);
+    // 加液泵后压力传感器
+    INSERT(HardwareComponent::kAddLiquidPumpPostPS, kFixBoardId_LiquidCtrl, 0);
+
+    if (isPipeDM()) {
+      // 正压比例阀
+      INSERT(HardwareComponent::kPositivePressureProportional, kFixBoardId_LiquidCtrl, POSITIVE_PRESSURE_PROPORTIONAL_ID);
+      // 负压比例阀
+      INSERT(HardwareComponent::kNegativePressureProportional, kFixBoardId_LiquidCtrl, NEGATIVE_PRESSURE_PROPORTIONAL_ID);
+      // 气密传感器
+      INSERT(HardwareComponent::kAirLeakDetectPS, kFixBoardId_LiquidCtrl, 0);
+      // 空气密度测试空压机
+      INSERT(HardwareComponent::kAirLeakDetectTestAC, kFixBoardId_LiquidCtrl, 0);
+      // 空气密度测试通道控制
+      INSERT(HardwareComponent::kAirLeakDetectTestChannelCtrl, kFixBoardId_LiquidCtrl, 0);
+    }
+  }
+  if (isDrawBarDM()) {
+  }
 }

appsrc/baseservice/baseservice.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
+#include "appsetting/appsetting.hpp"
 //
 #include "appcomponents/app_errorcode_mgr/app_errorcode_mgr.hpp"
 #include "appcomponents/canchannel/transmit_disinfection_can_master.hpp"

appsrc/baseservice/db/base/dbbase.hpp

@@ -15,7 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
+#include "appsetting/appsetting.hpp"
 
 /**
  * @brief

appsrc/baseservice/db/base/keyvaldb.hpp

@@ -15,8 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "dbbase.hpp"
+#include "appsetting/appsetting.hpp"
 
 namespace iflytop {
 using namespace std;

appsrc/baseservice/db/db_service.hpp

@@ -15,7 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
+#include "appsetting/appsetting.hpp"
 #include "formula_db_dao.hpp"
 #include "setting_db_dao.hpp"
 #include "user_behavior_des.hpp"

appsrc/baseservice/db/formula_db_dao.hpp

@@ -15,7 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
+#include "appsetting/appsetting.hpp"
+
 #include "base/dbbase.hpp"
 #include "base/keyvaldb.hpp"
 #include "user_behavior_des.hpp"

appsrc/baseservice/db/setting_db_dao.hpp

@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "appsetting/appsetting.hpp"
 //
 

appsrc/baseservice/devicestate/device_state_service.hpp

@@ -13,7 +13,8 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
+#include "appsetting/appsetting.hpp"
 
 /**
  * @brief

appsrc/baseservice/front_msg_processer/front_msg_processer.hpp

@@ -13,7 +13,8 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
+#include "appsetting/appsetting.hpp"
 
 /**
  * @brief

appsrc/baseservice/iflytop_front_end_service/iflytop_front_end_service.hpp

@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "appsetting/appsetting.hpp"
 
 /**

appsrc/baseservice/udisk_mgr_service.hpp

@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "appsetting/appsetting.hpp"
 namespace iflytop {
 

appsrc/main.cpp

@@ -2,7 +2,7 @@
 #include <signal.h>
 #include <sqlite3.h>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "appsetting/appsetting.hpp"
 #include "service/main_control_service.hpp"
 

appsrc/service/disinfection_logs_service.hpp

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 //
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "appsetting/appsetting.hpp"
 
 #include "baseservice/baseservice.hpp"

appsrc/service/main_control_service.hpp

@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "appbase/dep.hpp"
+#include "appbase/appbase.hpp"
 #include "appsetting/appsetting.hpp"
 
 /**