diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c index fbdde96..aebf32e 100644 --- a/APP/peripheral_main.c +++ b/APP/peripheral_main.c @@ -259,7 +259,22 @@ int main(void) // 改成 4000000 波特率了 BSP_UART1_Init(4000000); #endif - DelayMs(1000 * 2); + + CH58x_BLEInit(); + HAL_Init(); + GAPRole_PeripheralInit(); + Peripheral_Init(); + + for (uint8_t i = 0; i < 10; i++) + { + if (TMOS_GetSystemClock() > 0) + { + logDebug("i = %d ms", i * 100); + logDebug("TMOS_GetSystemClock = %d", TMOS_GetSystemClock()); + break; + } + DelayMs(100); + } ShowRestartReason(); @@ -276,11 +291,6 @@ int main(void) logDebug("MacAddr: %02X:%02X:%02X:%02X:%02X:%02X", MacAddr[5], MacAddr[4] , MacAddr[3], MacAddr[2], MacAddr[1], MacAddr[0]); - CH58x_BLEInit(); - HAL_Init(); - GAPRole_PeripheralInit(); - Peripheral_Init(); - BSP_FLASH_Init(); BSP_KEY_Init(app_task_handler); @@ -290,8 +300,6 @@ int main(void) BSP_VAVLE_Init(); - // DelayMs(2000 * 1); - // 如果电压低就都不亮灯、蜂鸣器 if (bat_mv <= LOW_VABAT_CLOSE_MV) { diff --git a/BSP/src/bsp_adc.c b/BSP/src/bsp_adc.c index 7806e3f..729d6b7 100644 --- a/BSP/src/bsp_adc.c +++ b/BSP/src/bsp_adc.c @@ -34,9 +34,10 @@ __HIGH_CODE uint8_t BSP_ReadVbat(void) { uint8_t i; + logDebug("BSP_ReadVbat start"); BSP_NoNeedBoost(); - // DelayMs(1); + DelayUs(2); // VBAT uint32_t CountBat = 0; @@ -79,6 +80,8 @@ uint8_t BSP_ReadVbat(void) bat_mv = CountBat; + logDebug("BSP_ReadVbat end"); + //缩小到100mV return vbat; }