SXDT-Embedded
/
IoT_SCV_CH584M
mirror of https://gitee.com/SXDT-Embedded/iot_-scv_-ch584-m.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V1-1硬件，更改KEY IO

This commit is contained in:
stark1898y 2025-05-23 10:19:17 +08:00
parent 4d2621e2e4
commit a6f40e4c90
4 changed files with 31 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp/inc/bsp_key.h
View File

@ -17,11 +17,11 @@
#define KEY_IDLE_TIMEOUT_EVT (0x0001 << 3) #define KEY_IDLE_TIMEOUT_EVT (0x0001 << 3)
// KEY_B_PIN at PB7,low->active // KEY_B_PIN at PB7,low->active
#define KEY_A_PIN GPIO_Pin_7 #define KEY_BPIN GPIO_Pin_15
extern volatile uint8_t key_wakeup_flag; extern volatile uint8_t key_wakeup_flag;
#define IS_KEY_Vaild() ((GPIOA_ReadPortPin(KEY_A_PIN) ? 0 : 1)) #define IS_KEY_Vaild() ((GPIOB_ReadPortPin(KEY_BPIN) ? 0 : 1))
typedef enum typedef enum
{ {

8
bsp/inc/bsp_led.h
View File

@ -13,7 +13,7 @@
#define LED_VALVE_R_PIN GPIO_Pin_8 #define LED_VALVE_R_PIN GPIO_Pin_8
#define LED_VALVE_G_PIN GPIO_Pin_9 #define LED_VALVE_G_PIN GPIO_Pin_9
#define LED_ALARM_PIN GPIO_Pin_1 #define LED_ALARM_PIN GPIO_Pin_1
#define LED_VBAT_PIN GPIO_Pin_12 #define LED_VBAT_PIN GPIO_Pin_7
/*********************************************************************************************** /***********************************************************************************************
#define LED_VALVE_OPEN {GPIOA_ResetBits(LED_VALVE_R_PIN | LED_VALVE_G_PIN | LED_VALVE_Y_PIN);\ #define LED_VALVE_OPEN {GPIOA_ResetBits(LED_VALVE_R_PIN | LED_VALVE_G_PIN | LED_VALVE_Y_PIN);\
@ -26,12 +26,12 @@
#define LED_ALARM_CLOSE GPIOB_ResetBits(LED_ALARM_PIN) #define LED_ALARM_CLOSE GPIOB_ResetBits(LED_ALARM_PIN)
#define LED_VBAT_OPEN GPIOB_SetBits(LED_VBAT_PIN) #define LED_VBAT_OPEN GPIOA_SetBits(LED_VBAT_PIN)
#define LED_VBAT_CLOSE GPIOB_ResetBits(LED_VBAT_PIN) #define LED_VBAT_CLOSE GPIOA_ResetBits(LED_VBAT_PIN)
#define LED_ALL_OPEN {GPIOA_SetBits(LED_VALVE_R_PIN | LED_VALVE_G_PIN | LED_VALVE_Y_PIN);\ #define LED_ALL_OPEN {GPIOA_SetBits(LED_VALVE_R_PIN | LED_VALVE_G_PIN | LED_VALVE_Y_PIN);\
GPIOB_SetBits(LED_ALARM_PIN | LED_VBAT_PIN);} GPIOA_SetBits(LED_ALARM_PIN | LED_VBAT_PIN)}
#define LED_ALL_CLOSE {GPIOA_ResetBits(LED_VALVE_R_PIN | LED_VALVE_G_PIN | LED_VALVE_Y_PIN);\ #define LED_ALL_CLOSE {GPIOA_ResetBits(LED_VALVE_R_PIN | LED_VALVE_G_PIN | LED_VALVE_Y_PIN);\
GPIOA_ResetBits(LED_ALARM_PIN | LED_VBAT_PIN);} GPIOA_ResetBits(LED_ALARM_PIN | LED_VBAT_PIN);}

25
bsp/src/bsp_bmp390.c
View File

@ -424,8 +424,8 @@ void Lower_IO_Deinit(void)
GPIOA_ModeCfg(LED_VBAT_PIN | LED_ALARM_PIN, GPIO_ModeIN_PD); GPIOA_ModeCfg(LED_VBAT_PIN | LED_ALARM_PIN, GPIO_ModeIN_PD);
// KEY | RESET KEY | boot KEY // KEY | RESET KEY | boot KEY
GPIOA_ResetBits(KEY_A_PIN); GPIOA_ResetBits(KEY_BPIN);
GPIOA_ModeCfg(KEY_A_PIN, GPIO_ModeIN_PU); GPIOA_ModeCfg(KEY_BPIN, GPIO_ModeIN_PU);
// GPIOB_ResetBits(GPIO_Pin_23 | GPIO_Pin_22); // GPIOB_ResetBits(GPIO_Pin_23 | GPIO_Pin_22);
// GPIOB_ModeCfg(GPIO_Pin_23 | GPIO_Pin_22, GPIO_ModeIN_PD); // GPIOB_ModeCfg(GPIO_Pin_23 | GPIO_Pin_22, GPIO_ModeIN_PD);
@ -1162,27 +1162,6 @@ __INTERRUPT
__HIGH_CODE __HIGH_CODE
void GPIOA_IRQHandler(void) void GPIOA_IRQHandler(void)
{ {
// 清除中断标志位
GPIOA_ClearITFlagBit(KEY_A_PIN);
// 检查是否为真实按键事件（通过确认电平是否真的接近0V）
if (GPIOA_ReadPortPin(KEY_A_PIN) == 0)
{
// 再次确认是否真的为低电平（接近0V）
DelayUs(10); // 短暂延时50
if (GPIOA_ReadPortPin(KEY_A_PIN) == 0)
{
// 确认是真实按键事件
// 阻止睡眠
BSP_BlockSleep();
// 关按键中断
BSP_KEY_ExitLowpower();
printf("KEY IRQHandler !!!");
key_wakeup_flag = 1;
}
}
if (R16_PA_INT_IF & GPIO_Pin_9) if (R16_PA_INT_IF & GPIO_Pin_9)
{ {
R16_PA_INT_IF = GPIO_Pin_9; R16_PA_INT_IF = GPIO_Pin_9;

48
bsp/src/bsp_key.c
View File

@ -173,14 +173,14 @@ void BSP_KEY_EnterLowpower(void)
// TODO:按键电平触发设置 // TODO:按键电平触发设置
// 下降沿触发 // 下降沿触发
GPIOA_ITModeCfg(KEY_A_PIN, GPIO_ITMode_FallEdge); GPIOB_ITModeCfg(KEY_BPIN, GPIO_ITMode_FallEdge);
// 开启GPIO的睡眠唤醒,如果需要的话 // 开启GPIO的睡眠唤醒,如果需要的话
// PWR_PeriphWakeUpCfg(ENABLE, RB_SLP_GPIO_WAKE, Long_Delay); // PWR_PeriphWakeUpCfg(ENABLE, RB_SLP_GPIO_WAKE, Long_Delay);
PWR_PeriphWakeUpCfg(ENABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay); PWR_PeriphWakeUpCfg(ENABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay);
// 开启GPIOB中断 // 开启GPIOB中断
PFIC_EnableIRQ(GPIO_A_IRQn); PFIC_EnableIRQ(GPIO_B_IRQn);
} }
void BSP_KEY_ExitLowpower(void) void BSP_KEY_ExitLowpower(void)
@ -188,7 +188,7 @@ void BSP_KEY_ExitLowpower(void)
BSP_BlockSleep(); BSP_BlockSleep();
// 关闭GPIOB中断 // 关闭GPIOB中断
PFIC_DisableIRQ(GPIO_A_IRQn); PFIC_DisableIRQ(GPIO_B_IRQn);
PWR_PeriphWakeUpCfg(DISABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay); PWR_PeriphWakeUpCfg(DISABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay);
} }
@ -298,21 +298,19 @@ void BSP_KEY_Init(app_task_evt_handler_t handler)
key_task_id = TMOS_ProcessEventRegister(KEY_Task_ProcessEvent); key_task_id = TMOS_ProcessEventRegister(KEY_Task_ProcessEvent);
// 由外部上拉电阻了 // 由外部上拉电阻了
// 设置为浮空输入模式 GPIOB_ModeCfg(KEY_BPIN, GPIO_ModeIN_PU);
// GPIOB_SetBits(KEY_B_PIN);
GPIOA_ModeCfg(KEY_A_PIN, GPIO_ModeIN_PU);
// 下降沿触发 // 下降沿触发
GPIOA_ITModeCfg(KEY_A_PIN, GPIO_ITMode_FallEdge); // GPIOB_ITModeCfg(KEY_BPIN, GPIO_ITMode_FallEdge);
// 开启GPIO的睡眠唤醒,如果需要的话 // 开启GPIO的睡眠唤醒,如果需要的话
// PWR_PeriphWakeUpCfg(ENABLE, RB_SLP_GPIO_WAKE, Long_Delay); // PWR_PeriphWakeUpCfg(ENABLE, RB_SLP_GPIO_WAKE, Long_Delay);
PWR_PeriphWakeUpCfg(ENABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay); // PWR_PeriphWakeUpCfg(ENABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay);
// 开启GPIOB中断 // 开启GPIOB中断
PFIC_EnableIRQ(GPIO_A_IRQn); // PFIC_EnableIRQ(GPIO_B_IRQn);
tmos_start_task(key_task_id, KEY_SCAN_EVT, MS1_TO_SYSTEM_TIME(KEY_SACN_MS)); // tmos_start_task(key_task_id, KEY_SCAN_EVT, MS1_TO_SYSTEM_TIME(KEY_SACN_MS));
// tmos_start_task(key_task_id, KEY_SCAN_EVT, MS1_TO_SYSTEM_TIME(5)); // tmos_start_task(key_task_id, KEY_SCAN_EVT, MS1_TO_SYSTEM_TIME(5));
@ -368,43 +366,23 @@ void KEY_ProcessLoop(void)
} }
} }
__INTERRUPT // 告诉编译器使用硬件压栈 __INTERRUPT // 告诉编译器使用硬件压栈
__HIGH_CODE // 放到RAM里 __HIGH_CODE // 放到RAM里
void GPIOB_IRQHandler(void) void GPIOB_IRQHandler(void)
{ {
/* // 清除中断标志位 // 清除中断标志位
GPIOA_ClearITFlagBit(KEY_A_PIN); GPIOB_ClearITFlagBit(KEY_BPIN);
// 检查是否为真实按键事件（通过确认电平是否真的接近0V） // 检查是否为真实按键事件（通过确认电平是否真的接近0V）
if (GPIOA_ReadPortPin(KEY_A_PIN) == 0) { if (IS_KEY_Vaild() == 0)
// 再次确认是否真的为低电平（接近0V） {
DelayUs(50); // 短暂延时
if (GPIOA_ReadPortPin(KEY_A_PIN) == 0) {
// 确认是真实按键事件 // 确认是真实按键事件
// 阻止睡眠 // 阻止睡眠
BSP_BlockSleep(); BSP_BlockSleep();
// 关按键中断 // 关按键中断
BSP_KEY_ExitLowpower(); BSP_KEY_ExitLowpower();
printf("KEY IRQ"); logDebug("KEY IRQ");
key_wakeup_flag = 1; key_wakeup_flag = 1;
} }
} else {
// 可能是电源波动导致的中断，忽略此次中断
printf("Power Fluctuation - Ignored");
} */
// // 阻止睡眠
// BSP_BlockSleep();
// // 关按键中断
// BSP_KEY_ExitLowpower();
// printf("KEY IRQ");
// GPIOB_ClearITFlagBit(KEY_B_PIN);
// key_wakeup_flag = 1;
} }