diff --git a/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.c b/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.c index 1cdf685f..f7fa3067 100644 --- a/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.c +++ b/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.c @@ -209,14 +209,14 @@ void OLED_ShowString(uint8_t x,uint8_t y,uint8_t *chr) } /*************************************************************** -* 函数名称: OLED_ShowCHinese +* 函数名称: OLED_ShowChinese * 说 明: 在指定位置显示中文 * 参 数: x,起始位置x坐标 y,起始位置y坐标 no,要显示的中文在字库中的编号,编号从0开始 * 返 回 值: 无 ***************************************************************/ -void OLED_ShowCHinese(uint8_t x,uint8_t y,uint8_t no) +void OLED_ShowChinese(uint8_t x,uint8_t y,uint8_t no) { uint8_t t,adder=0; OLED_Set_Pos(x,y); diff --git a/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.h b/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.h index 0152bb1a..02a86942 100644 --- a/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.h +++ b/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.h @@ -37,7 +37,7 @@ void OLED_Fill(uint8_t x1,uint8_t y1,uint8_t x2,uint8_t y2,uint8_t dot); void OLED_ShowChar(uint8_t x,uint8_t y,uint8_t chr); void OLED_ShowNum(uint8_t x,uint8_t y,uint32_t num,uint8_t len,uint8_t size); void OLED_ShowString(uint8_t x,uint8_t y, uint8_t *p); -void OLED_ShowCHinese(uint8_t x,uint8_t y,uint8_t no); +void OLED_ShowChinese(uint8_t x,uint8_t y,uint8_t no); void OLED_DrawBMP(unsigned char x0, unsigned char y0,unsigned char x1, unsigned char y1,unsigned char BMP[]); /**************************************************************/ /************** OLED设置接口 ************************/ diff --git a/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Src/mcu_init.c b/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Src/mcu_init.c index 6d3c81bd..ae297f30 100644 --- a/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Src/mcu_init.c +++ b/board/TOS_tiny_EVK_STM32L431CBT6/BSP/Src/mcu_init.c @@ -41,17 +41,17 @@ void board_init(void) OLED_Init(); Init_BH1750(); DHT11_Init(); - //OLED_ShowCHinese(0,0,0); - //OLED_ShowCHinese(18,0,1); - //OLED_ShowCHinese(38,0,2); - //OLED_ShowCHinese(56,0,3); - //OLED_ShowCHinese(74,0,4); + //OLED_ShowChinese(0,0,0); + //OLED_ShowChinese(18,0,1); + //OLED_ShowChinese(38,0,2); + //OLED_ShowChinese(56,0,3); + //OLED_ShowChinese(74,0,4); OLED_ShowString(10,0,(uint8_t*)"TencentOS tiny"); -// OLED_ShowCHinese(1,3,5); -// OLED_ShowCHinese(21,3,6); +// OLED_ShowChinese(1,3,5); +// OLED_ShowChinese(21,3,6); // OLED_ShowString(39,3,(uint8_t*)":25 C"); -// OLED_ShowCHinese(1,6,7); -// OLED_ShowCHinese(21,6,8); +// OLED_ShowChinese(1,6,7); +// OLED_ShowChinese(21,6,8); // OLED_ShowString(39,6,(uint8_t*)":88 RH%"); } diff --git a/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.c b/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.c index 33c36183..efc0ce7b 100644 --- a/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.c +++ b/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.c @@ -239,7 +239,7 @@ void OLED_ShowString(uint8_t x,uint8_t y,uint8_t *chr,uint8_t Char_Size) } } //显示汉字 -void OLED_ShowCHinese(uint8_t x,uint8_t y,uint8_t no) +void OLED_ShowChinese(uint8_t x,uint8_t y,uint8_t no) { uint8_t t,adder=0; OLED_Set_Pos(x,y); diff --git a/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.h b/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.h index 3c25a34e..2bec557a 100644 --- a/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.h +++ b/board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.h @@ -27,7 +27,7 @@ //OLED接口控制用函数 void OLED_ShowNum(uint8_t x,uint8_t y,uint32_t num,uint8_t len,uint8_t size); void OLED_ShowString(uint8_t x,uint8_t y, uint8_t *p,uint8_t Char_Size); -void OLED_ShowCHinese(uint8_t x,uint8_t y,uint8_t no); +void OLED_ShowChinese(uint8_t x,uint8_t y,uint8_t no); void OLED_DrawBMP(unsigned char x0, unsigned char y0,unsigned char x1, unsigned char y1,unsigned char BMP[]); diff --git a/board/TencentOS_tiny_EVB_MX/BSP/Src/mcu_init.c b/board/TencentOS_tiny_EVB_MX/BSP/Src/mcu_init.c index 73df039d..d18754e9 100644 --- a/board/TencentOS_tiny_EVB_MX/BSP/Src/mcu_init.c +++ b/board/TencentOS_tiny_EVB_MX/BSP/Src/mcu_init.c @@ -53,12 +53,12 @@ void board_init(void) DHT11_Init(); OLED_Init(); OLED_Clear(); - OLED_ShowCHinese(0,0,0); - OLED_ShowCHinese(18,0,1); - OLED_ShowCHinese(36,0,2); - OLED_ShowCHinese(54,0,3); - OLED_ShowCHinese(72,0,4); - OLED_ShowCHinese(90,0,5); + OLED_ShowChinese(0,0,0); + OLED_ShowChinese(18,0,1); + OLED_ShowChinese(36,0,2); + OLED_ShowChinese(54,0,3); + OLED_ShowChinese(72,0,4); + OLED_ShowChinese(90,0,5); OLED_ShowString(0,2,(uint8_t*)str,16); }