diff --git a/.vscode/settings.json b/.vscode/settings.json index 3501524..d93d7be 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,5 +21,8 @@ "hal.h": "c", "bsp_iwdg.h": "c", "bsp_valve_dect.h": "c" +======= + "bsp_iwdg.h": "c" +>>>>>>> ff9c225 (波特率拉高到2.5Mbps) } } diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c index 71c63e6..93ac32f 100644 --- a/APP/peripheral_main.c +++ b/APP/peripheral_main.c @@ -213,9 +213,17 @@ int main(void) BSP_KEY_Init(app_task_handler); - DelayMs(10); + // IWDG_Init(1500); + DelayMs(1000 * 3); + BSP_ADC_Init(); + BSP_VAVLE_Init(); + + HAL_Init(); + GAPRole_PeripheralInit(); + Peripheral_Init(); + BSP_BlockSleep(); BSP_RequestBoost(); #if 0