PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30 from acevest/fix_typo

Browse Source 
fix typo
This commit is contained in:
Supowang1989
2019-10-08 10:11:24 +08:00
committed by GitHub
parent 1c41f1d5ab 9deea199ca
commit e9f2070789
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.c
View File

@@ -209,14 +209,14 @@ void OLED_ShowString(uint8_t x,uint8_t y,uint8_t *chr)
}
/***************************************************************
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: OLED_ShowCHinese
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: OLED_ShowChinese
* ˵ <20><>: <20><>ָ<EFBFBD><D6B8>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
* <20><> <20><>: x<><78><EFBFBD><EFBFBD>ʼλ<CABC><CEBB>x<EFBFBD><78><EFBFBD><EFBFBD>
y<><79><EFBFBD><EFBFBD>ʼλ<CABC><CEBB>y<EFBFBD><79><EFBFBD><EFBFBD>
no<6E><6F>Ҫ<EFBFBD><D2AA>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֿ<EFBFBD><D6BF>еı<D0B5><C4B1>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD>Ŵ<EFBFBD>0<EFBFBD><30>ʼ
* <20><> <20><> ֵ: <20><>
***************************************************************/
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);

2
board/TOS_tiny_EVK_STM32L431CBT6/BSP/Hardware/OLED/oled.h
View File

@@ -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<45><44><EFBFBD>ýӿ<C3BD> ************************/

18
board/TOS_tiny_EVK_STM32L431CBT6/BSP/Src/mcu_init.c
View File

@@ -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%");
}

2
board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.c
View File

@@ -239,7 +239,7 @@ void OLED_ShowString(uint8_t x,uint8_t y,uint8_t *chr,uint8_t Char_Size)
}
}
//<2F><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>
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);

2
board/TencentOS_tiny_EVB_MX/BSP/Hardware/OLED/oled.h
View File

@@ -27,7 +27,7 @@
//OLED<45>ӿڿ<D3BF><DABF><EFBFBD><EFBFBD>ú<EFBFBD><C3BA><EFBFBD>
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[]);

12
board/TencentOS_tiny_EVB_MX/BSP/Src/mcu_init.c
View File

@@ -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);
}