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

fix bh1750 code style

Browse Source
This commit is contained in:
mculover666
2019-09-21 20:40:09 +08:00
parent cce7ab6e3b
commit ea3a97b152
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
board/BearPi_STM32L31RC/BSP/Hardware/BH1750/BH1750.c
View File

@@ -14,7 +14,7 @@ int result;
* <20><> <20><>: <20><> * <20><> <20><>: <20><>
* <20><> <20><> ֵ: <20><> * <20><> <20><> ֵ: <20><>
***************************************************************/ ***************************************************************/
void Init_BH1750(void) void BH1750_Init(void)
{ {
uint8_t t_Data = 0x01; uint8_t t_Data = 0x01;
HAL_I2C_Master_Transmit(&hi2c1,BH1750_Addr,&t_Data,1,0xff); HAL_I2C_Master_Transmit(&hi2c1,BH1750_Addr,&t_Data,1,0xff);
@@ -26,7 +26,7 @@ void Init_BH1750(void)
* <20><> <20><>: <20><> * <20><> <20><>: <20><>
* <20><> <20><> ֵ: <20><> * <20><> <20><> ֵ: <20><>
***************************************************************/ ***************************************************************/
void Start_BH1750(void) void BH1750_Start(void)
{ {
uint8_t t_Data = 0x10; uint8_t t_Data = 0x10;
HAL_I2C_Master_Transmit(&hi2c1,BH1750_Addr,&t_Data,1,0xff); HAL_I2C_Master_Transmit(&hi2c1,BH1750_Addr,&t_Data,1,0xff);
@@ -40,9 +40,9 @@ void Start_BH1750(void)
* <20><> <20><>: <20><> * <20><> <20><>: <20><>
* <20><> <20><> ֵ: <20><>ǿֵ * <20><> <20><> ֵ: <20><>ǿֵ
***************************************************************/ ***************************************************************/
float Convert_BH1750(void) float BH1750_Convert(void)
{ {
Start_BH1750(); BH1750_Start();
HAL_Delay(180); HAL_Delay(180);
HAL_I2C_Master_Receive(&hi2c1, BH1750_Addr+1,BUF,2,0xff); HAL_I2C_Master_Receive(&hi2c1, BH1750_Addr+1,BUF,2,0xff);
result=BUF[0]; result=BUF[0];

8
board/BearPi_STM32L31RC/BSP/Hardware/BH1750/bh1750.h
View File

@@ -27,10 +27,10 @@ typedef struct
void Init_BH1750(void); //IO<49><4F>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD> void BH1750_Init(void); //IO<49><4F>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
void Start_BH1750(void); //<2F>ϵ磬<CFB5><E7A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼĴ<DDBC><C4B4><EFBFBD> void BH1750_Start(void); //<2F>ϵ磬<CFB5><E7A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼĴ<DDBC><C4B4><EFBFBD>
//void Read_BH1750(void); //<2F><><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD>ȡ<EFBFBD>ڲ<EFBFBD><DAB2>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //void BH1750_Read(void); //<2F><><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD>ȡ<EFBFBD>ڲ<EFBFBD><DAB2>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
float Convert_BH1750(void); float BH1750_Convert(void);
#endif #endif

26
board/BearPi_STM32L31RC/BSP/Src/mcu_init.c
View File

@@ -40,21 +40,21 @@ void board_init(void)
{ {
char *str = "TencentOS tiny"; char *str = "TencentOS tiny";
HAL_Init(); HAL_Init();
SystemClock_Config(); SystemClock_Config();
MX_GPIO_Init(); MX_GPIO_Init();
MX_ADC1_Init(); MX_ADC1_Init();
MX_I2C1_Init(); MX_I2C1_Init();
MX_LPUART1_UART_Init(); MX_LPUART1_UART_Init();
MX_USART1_UART_Init(); MX_USART1_UART_Init();
MX_USART2_UART_Init(); MX_USART2_UART_Init();
MX_USART3_UART_Init(); MX_USART3_UART_Init();
MX_SPI1_Init(); MX_SPI1_Init();
MX_SPI3_Init(); MX_SPI3_Init();
Init_BH1750(); BH1750_Init();
LCD_Init(); LCD_Init();
LCD_Clear(WHITE); LCD_Clear(WHITE);
LCD_Show_Image(0,0,240,55,gImage_logo); LCD_Show_Image(0,0,240,55,gImage_logo);
LCD_ShowCharStr(36,100,(char*)str, WHITE, BLUE, 24); LCD_ShowCharStr(36,100,(char*)str, WHITE, BLUE, 24);
} }