add OLED init delay time when power-up

ChnMasterOG · Mar 4, 2024 · 6b1daa8 · 6b1daa8
1 parent 81561fa
commit 6b1daa8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mounriver_project/KEYBOARD_CH582M/HAL/MCU.c b/mounriver_project/KEYBOARD_CH582M/HAL/MCU.c
@@ -1036,6 +1036,7 @@ void HAL_Init(void)
  uint16_t tmp;
  char debug_info[128] = "OK";
 
+ DelayMs(20); //上电延迟
  halTaskID = TMOS_ProcessEventRegister( HAL_ProcessEvent );
  HAL_TimeInit();
 #ifdef FIRST_USED
@@ -1055,9 +1056,6 @@ void HAL_Init(void)
 #if (defined HAL_HW_I2C) && (HAL_HW_I2C == TRUE)
  HW_I2C_Init( );
 #endif
-#if (defined HAL_OLED) && (HAL_OLED == TRUE)
- HAL_OLED_Init( );
-#endif
 #if (defined HAL_BATTADC) && (HAL_BATTADC == TRUE)
  BATTERY_Init( );
 #endif
@@ -1081,6 +1079,9 @@ void HAL_Init(void)
  MPR121_Init(debug_info);
 #endif
 #endif
+#if (defined HAL_OLED) && (HAL_OLED == TRUE) // 最后初始化保证上电延迟
+ HAL_OLED_Init( );
+#endif
 #if (defined HAL_LED) && (HAL_LED == TRUE)
  debug_info[7] = '\0';
  if ( strcmp(debug_info, "OK") == 0 ) {

diff --git a/mounriver_project/KEYBOARD_CH582M/HAL/OLED.c b/mounriver_project/KEYBOARD_CH582M/HAL/OLED.c
@@ -492,7 +492,6 @@ void HAL_OLED_Init(void)
  OLED_CLK_GPIO_(ModeCfg)( OLED_CLK_Pin, GPIO_ModeOut_PP_5mA );
  OLED_SDA_GPIO_(ModeCfg)( OLED_SDA_Pin, GPIO_ModeOut_PP_5mA );
 #endif
- DelayMs(20); //上电延迟
 
 #ifdef OLED_0_42
  //display off