老 4 路

control/PDU-AC-COMBINE/App/Key/Key.c

@@ -75,10 +75,10 @@
 		#define DERECTION_IO_1_EXIT      							EXTI_1
 #endif
 
-#if SUPPORT_DETECTION
+//#if SUPPORT_DETECTION
 	uint8_t  key_detection_1 = 0;
 	uint8_t  key_detection_2 = 0;
-#endif
+//#endif
 
 
 
@@ -100,7 +100,10 @@ static  void  ConfigKeyGPIO(void)
   gpio_mode_set(KEY_F_IO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY2);   //配置PF6为上拉输入K2
   gpio_mode_set(KEY_A_IO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY3);   //配置PA12为上拉输入K3
 	gpio_mode_set(KEY_A_IO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY4);   //配置PA12为上拉输入K3
+#if SUPPORT_4_KEY
+#else
 	gpio_mode_set(KEY_B_IO, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, KEY5); 
+#endif
 }
 
 static void   ConfigDetection(void)
@@ -168,8 +171,15 @@ unsigned char ReadKeyValue(void)
 	s_arrKeyDownLevel[1]=ScanKey(KEY_F_IO,KEY2);
 	s_arrKeyDownLevel[2]=ScanKey(KEY_A_IO,KEY3);
 	s_arrKeyDownLevel[3]=ScanKey(KEY_A_IO,KEY4);
+#if SUPPORT_4_KEY
+#else
 	s_arrKeyDownLevel[4]=ScanKey(KEY_B_IO,KEY5);
+#endif
+#if SUPPORT_4_KEY
+	SlaveAddress=(~((s_arrKeyDownLevel[3]<<3)|(s_arrKeyDownLevel[2]<<2)|(s_arrKeyDownLevel[1]<<1)|s_arrKeyDownLevel[0]))&0x0f;
+#else
 	SlaveAddress=(~((s_arrKeyDownLevel[4]<<4)|(s_arrKeyDownLevel[3]<<3)|(s_arrKeyDownLevel[2]<<2)|(s_arrKeyDownLevel[1]<<1)|s_arrKeyDownLevel[0]))&0x1f;
+#endif
 	return SlaveAddress;
 }
 

control/PDU-AC-COMBINE/App/Main/board_cfg.h

@@ -9,11 +9,12 @@
 #define 	PRJ_6_BASE								0
 #define 	PRJ_8_BASE								0
 #define   PRJ_1_ALL_O_ALL_C         0
-#define   PRJ_1_SELF_LOCK_SWITCH    1
+#define   PRJ_1_SELF_LOCK_SWITCH    0
 #define   PRJ_TWIN_FIRE             0
 #define 	PRJ_ITK_8_CHANNEL					0
 #define   PRJ_2_2_BASE              0
 #define   PRJ_8_NEW									0
+#define 	PRJ_OLD_4                 1
 
 
 
@@ -85,6 +86,10 @@
 	#define 	SUPPORT_SWITCH_REMENBER		1
 	#define   SUPPORT_DETECTION         1
 	#define 	ACSingCurrid 							1 
+#elif    PRJ_OLD_4
+	#define 	RelaySlaveChaNum 					4
+	#define   SUPPORT_4_KEY             1
+	#define 	ACSingCurrid 							2 
 #endif
 
 

control/PDU-AC-COMBINE/Project/GD32KeilPrj.uvprojx

@@ -49,7 +49,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>jeff-40A-1通道-自锁-20250228</OutputName>
+          <OutputName>jeff-40A-4通道-老板-0308</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>