Pārlūkot izejas kodu

控制板增加不控 8路板和7路板

liyi 10 mēneši atpakaļ
vecāks
revīzija
2edaa63af8

+ 2 - 1
truing_control/PDU-AC_ADA_NEW_6/hardware/electricity/electricity.c

@@ -179,7 +179,7 @@ static void opt_over_func(uint8_t channel)
 		if(channel >= 2)
 				return;
 #endif
-				
+#ifndef SUPPORT_MON
 		if(board->md_data.r_data.state.state[channel].state == RELAY_OPEN)
 		{
 				async_data da = {0};
@@ -191,5 +191,6 @@ static void opt_over_func(uint8_t channel)
 				da.w_eep_flag = FLAG_N_W_EEP;
 				set_relay_sta_async(&da);				
 		}
+#endif
 	}
 }

+ 21 - 2
truing_control/PDU-AC_ADA_NEW_6/user/board_cfg.h

@@ -65,15 +65,18 @@
 #define 	PRJ_4_SELF_LOCK       	  0
 #define   PRJ_4_BASE                0
 #define   PRJ_1_BASE                0
-#define 	PRJ_1_SELF_LOCK       	  0
+#define 	PRJ_1_SELF_LOCK       	  1
 #define   PRJ_1_ALL_MON             0
 
 #define   PRJ_3_NEW_2               0
 #define   PRJ_7_NEW                 0
 
 #define   PRJ_4_SELF_LOCK_2_2       0
-#define   PPRJ_4_BASE_2_2           1
+#define   PPRJ_4_BASE_2_2           0
 
+#define   PRJ_7_NO_MON              0
+
+#define   PRJ_8_NO_MON              0
 
 
 
@@ -184,6 +187,22 @@
 	#define   PT_SUB_COUNT              (PT_SUB_COUNT_4)
 	#define   SUPPORT_DETECTION         1
 	#define   SUPPORT_RELAY_REMENBER		1
+#elif PRJ_7_NO_MON
+
+	#define 	RelaySlaveChaNum 					7
+	#define 	ACSingCurrid 							2 
+	#define   SURPPORT_2_PT             1
+	#define   PT_SUB_COUNT              (PT_SUB_COUNT_4)
+	#define   SUPPORT_MON               1
+#elif PRJ_8_NO_MON
+
+	#define 	RelaySlaveChaNum 					8
+	#define 	ACSingCurrid 							2 
+	#define   SURPPORT_2_PT             1
+	#define   PT_SUB_COUNT              (PT_SUB_COUNT_4)
+	#define   SUPPORT_MON               1
+	
+	
 #endif