新4路不控

truing_control/PDU-AC_ADA_NEW_6/hardware/relay/relay.c

@@ -94,21 +94,33 @@ void relay_init(void)
 	#if (RelaySlaveChaNum >=1)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_NONE,RELAY_1);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_1);
-		gpio_bit_reset(RELAY_GPIO, RELAY_1);
+		#if SUPPORT_MON
+			gpio_bit_set(RELAY_GPIO, RELAY_1);
+		#else
+			gpio_bit_reset(RELAY_GPIO, RELAY_1);
+		#endif
 	#endif
 	#if (RelaySlaveChaNum >=2)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_NONE,RELAY_2);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_2);
-		gpio_bit_reset(RELAY_GPIO, RELAY_2);
+		#if SUPPORT_MON
+			gpio_bit_set(RELAY_GPIO, RELAY_2);
+		#else
+			gpio_bit_reset(RELAY_GPIO, RELAY_2);
+		#endif
 	#endif
 	#if (RelaySlaveChaNum >=3)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_NONE,RELAY_3);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_3);
-#if SUPPORT_CTRL2_LOCK2
-		gpio_bit_set(RELAY_GPIO, RELAY_3);
-#else
-		gpio_bit_reset(RELAY_GPIO, RELAY_3);
-#endif
+		#if SUPPORT_CTRL2_LOCK2
+				gpio_bit_set(RELAY_GPIO, RELAY_3);
+		#else
+			#if SUPPORT_MON
+				gpio_bit_set(RELAY_GPIO, RELAY_3);
+			#else
+				gpio_bit_reset(RELAY_GPIO, RELAY_3);
+			#endif
+		#endif
 	#endif
 #if SUPPORT_4_ON_FLASH
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_NONE,RELAY_4);
@@ -119,34 +131,57 @@ void relay_init(void)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_NONE,RELAY_4);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_4);
 		
-#if SUPPORT_CTRL2_LOCK2
-		gpio_bit_set(RELAY_GPIO, RELAY_4);
-#else
-		gpio_bit_reset(RELAY_GPIO, RELAY_4);
-#endif
+		#if SUPPORT_CTRL2_LOCK2
+				gpio_bit_set(RELAY_GPIO, RELAY_4);
+		#else
+			#if SUPPORT_MON
+				gpio_bit_set(RELAY_GPIO, RELAY_4);
+			#else
+				gpio_bit_reset(RELAY_GPIO, RELAY_4);
+			#endif
+		#endif
 	#endif
 	
 	#if (RelaySlaveChaNum >=5)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_PULLDOWN,RELAY_5);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_5);
-		gpio_bit_reset(RELAY_GPIO, RELAY_5);
+		#if SUPPORT_MON
+			gpio_bit_set(RELAY_GPIO, RELAY_5);
+		#else
+			gpio_bit_reset(RELAY_GPIO, RELAY_5);
+		#endif
 	#endif
 	#if (RelaySlaveChaNum >=6)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_PULLDOWN,RELAY_6);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_6);
-		gpio_bit_reset(RELAY_GPIO, RELAY_6);
+		#if SUPPORT_MON
+			gpio_bit_set(RELAY_GPIO, RELAY_6);
+		#else
+			gpio_bit_reset(RELAY_GPIO, RELAY_6);
+		#endif
 	#endif
 	#if (RelaySlaveChaNum >=7)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_PULLDOWN,RELAY_7);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_7);
-		gpio_bit_reset(RELAY_GPIO, RELAY_7);
+		#if SUPPORT_MON
+			gpio_bit_set(RELAY_GPIO, RELAY_7);
+		#else
+			gpio_bit_reset(RELAY_GPIO, RELAY_7);
+		#endif
 	#endif
 	#if (RelaySlaveChaNum >=8)
 		gpio_mode_set(RELAY_GPIO,GPIO_MODE_OUTPUT,GPIO_PUPD_PULLDOWN,RELAY_8);
 		gpio_output_options_set(RELAY_GPIO, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_8);
-		gpio_bit_reset(RELAY_GPIO, RELAY_8);
+		#if SUPPORT_MON
+			gpio_bit_set(RELAY_GPIO, RELAY_8);
+		#else
+			gpio_bit_reset(RELAY_GPIO, RELAY_8);
+		#endif
 	#endif	
 
+
+
+
 		board->unlock();
 		board->lock();
 

truing_control/PDU-AC_ADA_NEW_6/user/board_cfg.h

@@ -59,14 +59,15 @@
 #define   PRJ_3_4                   0
 #define   PRJ_3_2                   0
 #define 	PRJ_DC_8									0
-#define   PRJ_6_NEW                 0
+#define   PRJ_6_NEW                 1
 #define   PRJ_3_NEW                 0
 #define 	PRJ_5_NEW									0
 #define 	PRJ_4_SELF_LOCK       	  0
 #define   PRJ_4_BASE                0
 #define   PRJ_1_BASE                0
-#define 	PRJ_1_SELF_LOCK       	  1
+#define 	PRJ_1_SELF_LOCK       	  0
 #define   PRJ_1_ALL_MON             0
+#define   PRJ_4_NO_MON              1
 
 #define   PRJ_3_NEW_2               0
 #define   PRJ_7_NEW                 0
@@ -94,7 +95,14 @@
 	#define 	SUPPORT_ALL_ON_OFF        0
 	#define   PT_SUB_COUNT              (PT_SUB_COUNT_4)
 	#define 	ACSingCurrid 							1 
-	
+#elif PRJ_4_NO_MON
+
+	#define 	RelaySlaveChaNum 					4
+	#define 	ACSingCurrid 							2 
+	#define   SURPPORT_2_PT             0
+	#define   PT_SUB_COUNT              (RelaySlaveChaNum)
+	#define   SUPPORT_MON               1
+
 #elif PRJ_6_NEW
 	#define 	RelaySlaveChaNum 					6
 	#define 	ACSingCurrid 							1 
@@ -157,6 +165,7 @@
 	#define   PT_SUB_COUNT              (RelaySlaveChaNum)
 	#define   SUPPORT_DETECTION         1
 	#define   SUPPORT_RELAY_REMENBER		1
+	#define   SUPPORT_ALL_ON_OFF    		1
 #elif PRJ_1_SELF_LOCK
 	#define 	RelaySlaveChaNum 					1
 	#define 	ACSingCurrid 							2