Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

control/PDU-AC-COMBINE_UPGRADE/App/Main/Main.c

@@ -174,6 +174,11 @@ void switch_recode();
 	bool handle_status[RelaySlaveChaNum] = {0};
 	#if ((RelaySlaveChaNum == 6) || (SUPPORT_2_DETECTION && RelaySlaveChaNum == 8))
 			uint8_t handle_detection[2] = {1,1};
+			uint32_t input_1_ms_count = 0;
+			uint32_t input_2_ms_count = 0;
+			
+			uint8_t  input_1_en = 0;
+			uint8_t  input_2_en = 0;
 	#else
 			uint8_t handle_detection[1] = {1};
 	#endif
@@ -542,6 +547,7 @@ void switch_recode()
 							handle_status[k] = EE_ACDC_State_ReadReg[k].ACDC_Cha_On_Off_State;
 					}
 					handle_detection[0] = 0;
+					EE_ACDC_State_ReadReg[0].ACDC_ALLCha_Off_State=true;
 					for(uint8_t k = 0; k < (RelaySlaveChaNum/2);k++)
 						EE_ACDC_State_ReadReg[k].ACDC_Cha_On_Off_State=false;
 					for(uint8_t k = 0; k < (RelaySlaveChaNum/2);k++)
@@ -553,10 +559,14 @@ void switch_recode()
 					handle_detection[0] = 1;
 					for(uint8_t k = 0; k < (RelaySlaveChaNum/2);k++)
 						EE_ACDC_State_ReadReg[k].ACDC_Cha_On_Off_State=handle_status[k];
-					for(uint8_t k = 0; k < (RelaySlaveChaNum/2);k++)
-						RelayState_ch(k);
+						EE_ACDC_State_ReadReg[0].ACDC_ALLCha_On_State=true;
+							input_1_en = 1;
+							input_1_ms_count = 0;
+
+							
 				}
 			}
+			
 			if((detection_value & 2) == 0)
 			{
 				if(handle_detection[1] == 1)
@@ -564,6 +574,7 @@ void switch_recode()
 					for(uint8_t k = (RelaySlaveChaNum/2); k < RelaySlaveChaNum;k++)
 						handle_status[k] = EE_ACDC_State_ReadReg[k].ACDC_Cha_On_Off_State;
 				}
+				EE_ACDC_State_ReadReg[0].ACDC_ALLCha_Off_State=true;
 				handle_detection[1] = 0;
 				for(uint8_t k = (RelaySlaveChaNum/2); k < RelaySlaveChaNum;k++)
 					EE_ACDC_State_ReadReg[k].ACDC_Cha_On_Off_State=false;
@@ -577,10 +588,13 @@ void switch_recode()
 					handle_detection[1] = 1;
 					for(uint8_t k = (RelaySlaveChaNum/2); k < RelaySlaveChaNum;k++)
 						EE_ACDC_State_ReadReg[k].ACDC_Cha_On_Off_State=handle_status[k];
-					for(uint8_t k = (RelaySlaveChaNum/2); k < RelaySlaveChaNum;k++)
-						RelayState_ch(k);
+					EE_ACDC_State_ReadReg[0].ACDC_ALLCha_On_State=true;
+							input_2_en = 1;
+							input_2_ms_count = 0;
+
 				}
 			}
+
 #elif (SUPPORT_TWIN_FIRE)
 		if((detection_value & 0x3) != 0x3)
 		{

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

@@ -7,7 +7,7 @@
 #define 	PRJ_4_ALL_O_ALL_C					0
 #define   PRJ_4_SELF_LOCK_SWITCH    0
 #define 	PRJ_6_BASE								0
-#define 	PRJ_8_BASE								1
+#define 	PRJ_8_BASE								0
 #define   PRJ_1_ALL_O_ALL_C         0
 #define   PRJ_1_SELF_LOCK_SWITCH    0
 #define   PRJ_TWIN_FIRE             0
@@ -16,6 +16,8 @@
 #define   PRJ_8_NEW									0
 #define 	PRJ_OLD_4                 0
 #define   PRJ_1_All_OLD             0
+#define   PRJ_7                     0
+#define   PRJ_3_ALL_O_ALL_C         1
 
 
 #if PRJ_4_BASE
@@ -40,9 +42,11 @@
 	#define 	RelaySlaveChaNum 					6
 	#define 	SUPPORT_SWITCH_REMENBER		1
 	#define   SUPPORT_DETECTION         1
+  #define   SUPPORT_FALLING_DETECTED  0
 	#define 	ACSingCurrid 							1 
 #elif PRJ_8_BASE
 	#define 	RelaySlaveChaNum 					8
+	#define   SUPPORT_FALLING_DETECTED  0
 	#define 	SUPPORT_SWITCH_REMENBER		1
 	#define   SUPPORT_DETECTION         1
 	#define 	ACSingCurrid 							1 
@@ -82,6 +86,7 @@
 	#define 	SUPPORT_2_DETECTION       1
 	#define 	SUPPORT_SWITCH_REMENBER		1
 	#define   SUPPORT_DETECTION         1
+	#define   SUPPORT_FALLING_DETECTED  0
 	#define 	ACSingCurrid 							1 
 #elif    PRJ_OLD_4
 	#define 	RelaySlaveChaNum 					4
@@ -92,6 +97,20 @@
 	#define 	RelaySlaveChaNum 					1
 	#define   SUPPORT_4_KEY             1
 	#define 	ACSingCurrid 							2 
+#elif   PRJ_7
+	#define 	RelaySlaveChaNum 					7
+	#define 	SUPPORT_SWITCH_REMENBER		1
+	#define   SUPPORT_DETECTION         1
+	#define 	ACSingCurrid 							1
+	#define   SUPPORT_FALLING_DETECTED  0	
+#elif PRJ_3_ALL_O_ALL_C 
+	#define 	RelaySlaveChaNum 					3
+	#define   SUPPORT_SWITCH_REMENBER   1
+	#define 	SUPPORT_ALL_ON_OFF        1
+	#define 	SUPPORT_JLINK							1
+	#define   SUPPORT_DETECTION         1
+	#define   SUPPORT_FALLING_DETECTED  1	
+	#define 	ACSingCurrid 							2 
 #endif
 
 

control/PDU-AC-COMBINE_UPGRADE/App/Relay/Relay.c

@@ -61,38 +61,38 @@ static void ConfigRelayGPIO(void)
 				//使能RCU相关时钟
 		rcu_periph_clock_enable(RCU_GPIOB);  
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_8);             //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_8);   //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_8);                                              //将Relay_8默认状态设置为关闭
+		gpio_mode_set(RELAY_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_8);             //设置GPIO模式
+		gpio_output_options_set(RELAY_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_8);   //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_8_RCU, RELAY_8);                                              //将Relay_8默认状态设置为关闭
 		
                                       			   //使能GPIOA的时钟
-		gpio_mode_set(RELAY_1_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_1);           //设置GPIO模式
-		gpio_output_options_set(RELAY_1_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_1); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_1_RCU, RELAY_1);   																				 //将Relay_1默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_1);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_1); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_1);   																				 //将Relay_1默认状态设置为关闭
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_2);           //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_2); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_2);   																				 //将Relay_2默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_2);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_2); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_2);   																				 //将Relay_2默认状态设置为关闭
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_3);           //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_3); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_3);   																				 //将Relay_3默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_3);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_3); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_3);   																				 //将Relay_3默认状态设置为关闭
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_4);           //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_4); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_4);   																				 //将Relay_4默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_4);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_4); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_4);   																				 //将Relay_4默认状态设置为关闭
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_5);           //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_5); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_5);   																				 //将Relay_5默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_5);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_5); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_5);   																				 //将Relay_5默认状态设置为关闭
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_6);           //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_6); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_6);   																				 //将Relay_6默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_6);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_6); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_6);   																				 //将Relay_6默认状态设置为关闭
 		
-		gpio_mode_set(RELAY_2_8_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_7);           //设置GPIO模式
-		gpio_output_options_set(RELAY_2_8_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_7); //设置GPIO输出模式及速度
-		gpio_bit_reset(RELAY_2_8_RCU, RELAY_7); 								                           //将Relay_7默认状态设置为关闭
+		gpio_mode_set(RELAY_1_7_RCU, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, RELAY_7);           //设置GPIO模式
+		gpio_output_options_set(RELAY_1_7_RCU, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RELAY_7); //设置GPIO输出模式及速度
+		gpio_bit_reset(RELAY_1_7_RCU, RELAY_7); 								                           //将Relay_7默认状态设置为关闭
 
 #endif
 	

control/PDU-AC-COMBINE_UPGRADE/App/Relay/Relay.h

@@ -80,44 +80,44 @@
 		#define RELAY_4_OFF                       gpio_bit_reset(RELAY_2_4_RCU, RELAY_4)							      		// 输出低电平
 		#define RELAY_4_ON                     		gpio_bit_set(RELAY_2_4_RCU,RELAY_4)  		                      // 输出高电平
 #else
-		#define RELAY_1_RCU GPIOA
+		#define RELAY_8_RCU GPIOA
 		
-		#define RELAY_2_8_RCU GPIOB
+		#define RELAY_1_7_RCU GPIOB
 		
 		
-		#define RELAY_1 GPIO_PIN_15				//靠近单片机那边是继电器8
-		#define RELAY_2 GPIO_PIN_3
-		#define RELAY_3 GPIO_PIN_4
-		#define RELAY_4 GPIO_PIN_5
+		#define RELAY_8 GPIO_PIN_15				//靠近单片机那边是继电器8
+		#define RELAY_7 GPIO_PIN_3
+		#define RELAY_6 GPIO_PIN_4
+		#define RELAY_5 GPIO_PIN_5
 
-		#define RELAY_5 GPIO_PIN_6
-		#define RELAY_6 GPIO_PIN_7
-		#define RELAY_7 GPIO_PIN_8
-		#define RELAY_8 GPIO_PIN_9				//靠近电压互感器那边是继电器1
+		#define RELAY_4 GPIO_PIN_6
+		#define RELAY_3 GPIO_PIN_7
+		#define RELAY_2 GPIO_PIN_8
+		#define RELAY_1 GPIO_PIN_9				//靠近电压互感器那边是继电器1
 
-		#define RELAY_1_OFF                       gpio_bit_reset(RELAY_1_RCU, RELAY_1)							      			// 输出低电平
-		#define RELAY_1_ON                     		gpio_bit_set(RELAY_1_RCU,RELAY_1)  		                      	// 输出高电平
+		#define RELAY_1_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_1)							      			// 输出低电平
+		#define RELAY_1_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_1)  		                      	// 输出高电平
 
-		#define RELAY_2_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_2)							      		// 输出低电平
-		#define RELAY_2_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_2)  		                      // 输出高电平
+		#define RELAY_2_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_2)							      		// 输出低电平
+		#define RELAY_2_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_2)  		                      // 输出高电平
 
-		#define RELAY_3_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_3)							      		// 输出低电平
-		#define RELAY_3_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_3)  		                      // 输出高电平
+		#define RELAY_3_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_3)							      		// 输出低电平
+		#define RELAY_3_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_3)  		                      // 输出高电平
 
-		#define RELAY_4_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_4)							      		// 输出低电平
-		#define RELAY_4_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_4)  		                      // 输出高电平
+		#define RELAY_4_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_4)							      		// 输出低电平
+		#define RELAY_4_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_4)  		                      // 输出高电平
 
-		#define RELAY_5_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_5)							      		// 输出低电平
-		#define RELAY_5_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_5)  		                      // 输出高电平
+		#define RELAY_5_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_5)							      		// 输出低电平
+		#define RELAY_5_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_5)  		                      // 输出高电平
 
-		#define RELAY_6_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_6)							      		// 输出低电平
-		#define RELAY_6_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_6)  		                      // 输出高电平
+		#define RELAY_6_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_6)							      		// 输出低电平
+		#define RELAY_6_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_6)  		                      // 输出高电平
 
-		#define RELAY_7_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_7)							      		// 输出低电平
-		#define RELAY_7_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_7)  		                      // 输出高电平
+		#define RELAY_7_OFF                       gpio_bit_reset(RELAY_1_7_RCU, RELAY_7)							      		// 输出低电平
+		#define RELAY_7_ON                     		gpio_bit_set(RELAY_1_7_RCU,RELAY_7)  		                      // 输出高电平
 
-		#define RELAY_8_OFF                       gpio_bit_reset(RELAY_2_8_RCU, RELAY_8)							      			// 输出低电平
-		#define RELAY_8_ON                     		gpio_bit_set(RELAY_2_8_RCU,RELAY_8)  		                      	// 输出高电平
+		#define RELAY_8_OFF                       gpio_bit_reset(RELAY_8_RCU, RELAY_8)							      			// 输出低电平
+		#define RELAY_8_ON                     		gpio_bit_set(RELAY_8_RCU,RELAY_8)  		                      	// 输出高电平
 
 #endif
 

control/PDU-AC-COMBINE_UPGRADE/HW/Timer/Timer.c

@@ -354,6 +354,7 @@ void TIMER14_IRQHandler(void)
 				}									
 #endif				
 #endif
+				
 #if (RelaySlaveChaNum >= 1)
 				if((EE_ACDC_Delay_ReadReg_On[0].ACDC_Delay==Delay_Ms_2)||(EE_ACDC_Delay_ReadReg_On[0].ACDC_Delay==0xffff)||(EE_ACDC_Delay_ReadReg_On[0].ACDC_Delay==0))//确保这里的和读取电能参数的顺序是一致的
 				{
@@ -440,6 +441,71 @@ void TIMER14_IRQHandler(void)
 * 创建日期：2021年07月01日
 * 注    意：每毫秒进入一次中断服务函数
 *********************************************************************************************************/
+
+
+
+#if ((RelaySlaveChaNum == 6) || ((RelaySlaveChaNum == 8) && SUPPORT_2_DETECTION))
+
+extern uint8_t input_1_en;
+extern uint8_t input_2_en;
+
+extern uint32_t input_1_ms_count;
+extern uint32_t input_2_ms_count;
+
+
+static void detection_remember()
+{
+		if(input_1_en == 1)
+		{
+			input_1_ms_count++;
+			for(int i = 0;i < (RelaySlaveChaNum/2);i++)
+			{
+					if((EE_ACDC_Delay_ReadReg_On[i].ACDC_Delay==input_1_ms_count)||(EE_ACDC_Delay_ReadReg_On[i].ACDC_Delay==0xffff)||(EE_ACDC_Delay_ReadReg_On[i].ACDC_Delay==0))
+					{
+							//BUFF;			
+							RelayState_ch(i);
+							//LOCK;
+							break;
+					}
+			}
+			if((Sort_Onbuf[(RelaySlaveChaNum / 2)-1]==input_1_ms_count)||(Sort_Onbuf[(RelaySlaveChaNum / 2)-1]==0xffff)||(Sort_Onbuf[(RelaySlaveChaNum / 2)-1]==0))						//当达到最大延时时间后退出当前循环
+			{		
+				input_1_en	= 0;
+//				if(input_2_en == 0)
+//				{
+//					timer_disable(TIMER15);	
+//				}		
+				input_1_ms_count = 0;				
+			}
+		}
+		if(input_2_en == 1)
+		{
+			input_2_ms_count++;
+			for(int i = RelaySlaveChaNum / 2;i < RelaySlaveChaNum;i++)
+			{
+					if((EE_ACDC_Delay_ReadReg_On[i].ACDC_Delay==input_2_ms_count)||(EE_ACDC_Delay_ReadReg_On[i].ACDC_Delay==0xffff)||(EE_ACDC_Delay_ReadReg_On[i].ACDC_Delay==0))
+					{
+							//BUFF;			
+							RelayState_ch(i);
+							//LOCK;
+							break;
+					}
+			}
+			if((Sort_Onbuf[RelaySlaveChaNum -1]==input_2_ms_count)||(Sort_Onbuf[RelaySlaveChaNum-1]==0xffff)||(Sort_Onbuf[RelaySlaveChaNum-1]==0))						//当达到最大延时时间后退出当前循环
+		  {	
+				input_2_en	= 0;
+//				if(input_1_en == 0)
+//				{
+//					timer_disable(TIMER15);
+//				}
+				input_2_ms_count = 0;
+			}
+		}
+}
+
+#endif
+
+
 void TIMER15_IRQHandler(void)
 {  
   static  unsigned short s_iCnt100 = 0;                            //定义一个静态变量s_iCnt100作为100ms计数器
@@ -470,6 +536,10 @@ void TIMER15_IRQHandler(void)
     s_iCnt100 = 0;        //重置100ms计数器的计数值为0
     s_i100msFlag = 1;     //将100ms标志位的值设置为1 
   }
+#if ((RelaySlaveChaNum == 6) || ((RelaySlaveChaNum == 8) && SUPPORT_2_DETECTION))
+	detection_remember();
+#endif
+	
 }
 
 /*********************************************************************************************************
@@ -505,7 +575,6 @@ void TIMER16_IRQHandler(void)
 		write_2_minute_flag = 1;
 		cnt = 0;
 	}
-
 }
 
 /*********************************************************************************************************

control/PDU-AC-COMBINE_UPGRADE/HW/Uart1/Uart1.c

@@ -640,43 +640,43 @@ void select_channel(uint8_t chx)
 								break;
 	#endif
 #else
-							case 0x07:		//011
+							case 0x00:		//011
 								SEL0_H;
 								SEL1_H;
 								SEL2_L;
 								break;					
-							case 0x06:		//010
+							case 0x01:		//010
 								SEL0_L;
 								SEL1_H;
 								SEL2_L;
 								break;
 
-							case 0x05:		//001
+							case 0x02:		//001
 								SEL0_H;
 								SEL1_L;
 								SEL2_L;
 								break;							
-						case 0x04:		//000
+						case 0x03:		//000
 							SEL0_L;
 							SEL1_L;
 							SEL2_L;
 							break;		
-						case 0x03:    //111
+						case 0x04:    //111
 							SEL0_H;
 							SEL1_H;
 							SEL2_H;
 							break;
-						case 0x02:    //110
+						case 0x05:    //110
 							SEL0_L;
 							SEL1_H;
 							SEL2_H;
 							break;
-						case 0x01:    //101
+						case 0x06:    //101
 							SEL0_H;
 							SEL1_L;
 							SEL2_H;
 							break;
-						case 0x00:    //100
+						case 0x07:    //100
 							SEL0_L;
 							SEL1_L;
 							SEL2_H;