3路板

truring_ctrl_upgrade/PDU-AC_ADA_NEW/hardware/detection/detection.c

@@ -182,10 +182,10 @@ void key_init(void)
 	
 #if (RelaySlaveChaNum >= 3)
 	rcu_periph_clock_enable(RCU_GPIOA);
-	gpio_mode_set(KEY_TEST_3_4_GPIO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY_TEST_3_IO);	
+	gpio_mode_set(KEY_TEST_3_4_5_GPIO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY_TEST_3_IO);	
 #endif
 #if (RelaySlaveChaNum >= 4)
-	gpio_mode_set(KEY_TEST_3_4_GPIO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY_TEST_4_IO);
+	gpio_mode_set(KEY_TEST_3_4_5_GPIO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY_TEST_4_IO);
 #endif
 	board->get_lock_key = get_lock_key;
 	board->opt_lock_key = self_lock_opt;
@@ -663,7 +663,7 @@ static void get_lock_key(void)
 #endif
 	
 #if (RelaySlaveChaNum >= 3)
-	if(gpio_input_bit_get(KEY_TEST_3_4_GPIO,KEY_TEST_3_IO) == RESET)
+	if(gpio_input_bit_get(KEY_TEST_3_4_5_GPIO,KEY_TEST_3_IO) == RESET)
 	{
 		board->val_key[2] = 1;
 	}else
@@ -673,7 +673,7 @@ static void get_lock_key(void)
 #endif
 	
 #if (RelaySlaveChaNum >= 4)
-	if(gpio_input_bit_get(KEY_TEST_3_4_GPIO,KEY_TEST_4_IO) == RESET)
+	if(gpio_input_bit_get(KEY_TEST_3_4_5_GPIO,KEY_TEST_4_IO) == RESET)
 	{
 		board->val_key[3] = 1;
 	}else

truring_ctrl_upgrade/PDU-AC_ADA_NEW/user/board_cfg.h

@@ -55,7 +55,7 @@
 #define PT_SUB_COUNT_3             3
 #define PT_SUB_COUNT_4             4
 
-#define   PRJ_8_NEW									0
+#define   PRJ_8_NEW									1
 #define   PRJ_3_4                   0
 #define   PRJ_3_2                   0
 #define 	PRJ_DC_8									0
@@ -84,7 +84,10 @@
 
 #define   PRJ_4_KEY_EXIT            0
 
-#define   PRJ_5_KEY_EXIT            1
+#define   PRJ_5_KEY_EXIT            0
+
+
+#define   PRJ_3_SELF_LOCK           0
 
 
 
@@ -162,6 +165,16 @@
 	#define   SUPPORT_DETECTION         1
 	#define   SUPPORT_RELAY_REMENBER		1
 	#define   SUPPORT_SELF_LOCK         1
+#elif PRJ_3_SELF_LOCK
+	#define 	RelaySlaveChaNum 					3
+	#define 	ACSingCurrid 							2 
+	#define   SURPPORT_2_PT             0
+	#define   PT_SUB_COUNT              (RelaySlaveChaNum)
+	#define   SUPPORT_DETECTION         1
+	#define   SUPPORT_RELAY_REMENBER		1
+	#define   SUPPORT_SELF_LOCK         1
+	#define   SUPPORT_PWM_OUT_RELAY     1
+	
 #elif PRJ_4_KEY_EXIT
 
 	#define 	RelaySlaveChaNum 					4

truring_ctrl_upgrade/PDU-AC_ADA_NEW/user/main.c

@@ -70,11 +70,8 @@ int main(){
 	key_init();
 	//device
 	fwdgt_Init();
-#if SUPPORT_PWM_OUT_RELAY
+
 	eMBInit(MB_RTU, ac_board.haddr, 0, 38400, MB_PAR_NONE);
-#else
-	eMBInit(MB_RTU, ac_board.haddr, 0, 115200, MB_PAR_NONE);
-#endif
 
 	eMBEnable();
 	
@@ -143,11 +140,9 @@ int main(){
 	{
 		if(eMBCheck())
 		{
-#if SUPPORT_PWM_OUT_RELAY
+
 			eMBInit(MB_RTU, ac_board.haddr, 0, 38400, MB_PAR_NONE);
-#else
-			eMBInit(MB_RTU, ac_board.haddr, 0, 115200, MB_PAR_NONE);
-#endif
+
 			eMBEnable();
 			DelayNms(1);
 		}