修改了pio的响应错误

q-iot · Mar 5, 2019 · ba287fc · ba287fc
1 parent 1025c0b
commit ba287fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Common/Misc/IoDefines.c b/src/Common/Misc/IoDefines.c
@@ -26,7 +26,7 @@ static const IO_IN_HAL_DEFINE gIoInDefs[IOIN_MAX]={
 {IOIN_PIO5,		GPI_A,  GPin5, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
 {IOIN_PIO6,		GPI_A,  GPin6, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
 {IOIN_PIO7,		GPI_A,  GPin7, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,0,0},
-{IOIN_IR_IN,		GPI_A,  GPin3, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI3_IRQn,EXTI_Pio_Priority},
+{IOIN_IR_IN,		GPI_A,  GPin11, GPIO_Mode_IPU,EXTI_Trigger_Rising_Falling,EXTI3_IRQn,EXTI_Pio_Priority},
 
 };
 
@@ -35,7 +35,7 @@ static const IO_OUT_HAL_DEFINE gIoOutDefs[IOOUT_MAX]={
 {IOOUT_LED2,			GPI_B,	GPin9,		GPIO_Mode_Out_PP,TRUE},
 {IOOUT_FLASH_CS,	GPI_A,	GPin8,		GPIO_Mode_Out_PP,TRUE},//flash cs
 {IOOUT_FLASH_WP,	GPI_B,	GPin12,	GPIO_Mode_Out_PP,FALSE},//flash wp
-{IOOUT_IR_OUT,		GPI_B,	GPin4,		GPIO_Mode_Out_PP,FALSE},//ir out
+{IOOUT_IR_OUT,		GPI_A,	GPin12,		GPIO_Mode_Out_PP,FALSE},//ir out
 
 };
 

diff --git a/src/Core/User/stm32f10x_it.c b/src/Core/User/stm32f10x_it.c
@@ -101,7 +101,7 @@ void SVC_Handler(void)
 //定时器变量引用
 #define KEY_MAX_PUSH_DELAY_MS 20000
 #define KEY_FILTER_DELAY 50
-static volatile u32 gKeyDelay[WAVER_IO_NUM]={0,0,0,0,0,0,0,0};//防止毛刺
+static volatile u32 gKeyDelay[IOIN_MAX]={0};//防止毛刺
 extern volatile u32 gSysTick;//系统定时器
 extern volatile SYS_TIMER_RCD gpSysTimerRcd[SYS_TIMER_MAX_NUM];
 void SysTick_Handler(void)
@@ -241,7 +241,7 @@ void EXTI0_IRQHandler(void)
 	{  
 		EXTI_ClearITPendingBit(EXTI_Line0);	
 		//PIO_EXTI_Handler(IOIN_PIO0,IOIN_ReadIoStatus(IOIN_PIO0));//如果是数字io，调用这个
-		Key_EXTI_Handler(IOIN_PIO0,IOIN_ReadIoStatus(IOIN_PIO0),TRUE);//如果是key，调用这个
+		//Key_EXTI_Handler(IOIN_PIO0,IOIN_ReadIoStatus(IOIN_PIO0),TRUE);//如果是key，调用这个
 	}
 }
 
@@ -252,7 +252,7 @@ void EXTI1_IRQHandler(void)
 	if(EXTI_GetITStatus(EXTI_Line1) != RESET)
 	{
 		EXTI_ClearITPendingBit(EXTI_Line1);
-		PIO_EXTI_Handler(IOIN_PIO1,IOIN_ReadIoStatus(IOIN_PIO1));
+
 	}
 }