Bladeren bron

格式化代码;

lch 6 maanden geleden
bovenliggende
commit
1958a067c1

+ 1 - 5
app_public/fuxi_public/fuxi_bsp/include/bspconfig.h

@@ -45,11 +45,7 @@
 
 
 //----------------------------- 设备级联  ---------------------------
-#ifdef FUN_NETWORK_ADD40
-	#define CFG_LINK_104_NUM		48	// 104级联数目
-#else
-	#define CFG_LINK_104_NUM		8	// 104级联数目
-#endif
+#define CFG_LINK_104_NUM		8	// 104级联数目
 #define CFG_LINK_101_NUM		6	// 101级联数目
 #define CFG_LONK_EQU_SOE_NUM	10	// 级联装置保存SOE数量
 

File diff suppressed because it is too large
+ 1474 - 1530
dtu/dtu_main_t536/app/IECComm.c


File diff suppressed because it is too large
+ 3064 - 3099
dtu/dtu_main_t536/app/Maintain.c


File diff suppressed because it is too large
+ 398 - 307
dtu/dtu_main_t536/app/set.c


+ 20 - 20
dtu/dtu_main_t536/app/set.h

@@ -812,12 +812,12 @@ enum
     PARA_LABEL_LINK,  // 列表名
     PARA_IP_104LINK1, // 104级联IP1
     PARA_IP_104LINK2, // 104级联IP2
-    PARA_IP_104LINK3, // 104级联IP1
-    PARA_IP_104LINK4, // 104级联IP2
-    PARA_IP_104LINK5, // 104级联IP1
-    PARA_IP_104LINK6, // 104级联IP2
-    PARA_IP_104LINK7, // 104级联IP1
-    PARA_IP_104LINK8, // 104级联IP2
+    PARA_IP_104LINK3, // 104级联IP3
+    PARA_IP_104LINK4, // 104级联IP4
+    PARA_IP_104LINK5, // 104级联IP5
+    PARA_IP_104LINK6, // 104级联IP6
+    PARA_IP_104LINK7, // 104级联IP7
+    PARA_IP_104LINK8, // 104级联IP8
 
     PARA_LABEL_SERIAL,    // 列表名 串行口
     PARA_PROTOCOL_S1,     // 规约类型
@@ -889,21 +889,21 @@ enum
     PARA_BAT_ALARM,     // 电池告警阀值
 
     PARA_LABLE_RMT,     // 列表名 远动参数
-    PARA_DEAD_ZONE_ALL, // "遥测死区",
-    PARA_DEAD_I,        // "电流死区",
-    PARA_DEAD_U,        //"交流电压死区",
-    PARA_DEAD_ZL,       //"直流电压死区",
-    PARA_DEAD_P,        //"功率死区",
-    PARA_DEAD_F,        //"频率死区",
-    PARA_DEAD_COS,      //"功率因数死区",
-    PARA_YXFD,          //"遥信防抖时间",
-    PARA_FZPULSE,       //"分闸脉冲",
-    PARA_HZPULSE,       //"合闸脉冲",
-    PARA_U_ZERO,        //"电压零漂
-    PARA_PHASE_I_ZERO,  //"相电流零漂"
-    PARA_ZERO_I_ZERO,   //"零序电流零漂"
+    PARA_DEAD_ZONE_ALL, // 遥测死区
+    PARA_DEAD_I,        // 电流死区
+    PARA_DEAD_U,        // 交流电压死区
+    PARA_DEAD_ZL,       // 直流电压死区
+    PARA_DEAD_P,        // 功率死区
+    PARA_DEAD_F,        // 频率死区
+    PARA_DEAD_COS,      // 功率因数死区
+    PARA_YXFD,          // 遥信防抖时间
+    PARA_FZPULSE,       // 分闸脉冲
+    PARA_HZPULSE,       // 合闸脉冲
+    PARA_U_ZERO,        // 电压零漂
+    PARA_PHASE_I_ZERO,  // 相电流零漂 
+    PARA_ZERO_I_ZERO,   // 零序电流零漂 
 #ifdef CPU_FUXI
-    PARA_DC_ZERO, //"直流电压零漂
+    PARA_DC_ZERO, // 直流电压零漂
 #endif
 
     PARA_LABEL_OTHERS, // 列表名 其它

Some files were not shown because too many files changed in this diff