From ea3a97b152782944417b3b6172bf0ff852430548 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Sat, 21 Sep 2019 20:40:09 +0800 Subject: [PATCH] fix bh1750 code style --- .../BSP/Hardware/BH1750/BH1750.c | 8 +++--- .../BSP/Hardware/BH1750/bh1750.h | 8 +++--- board/BearPi_STM32L31RC/BSP/Src/mcu_init.c | 26 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/BH1750.c b/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/BH1750.c index 64149313..e711d6c5 100644 --- a/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/BH1750.c +++ b/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/BH1750.c @@ -14,7 +14,7 @@ int result; * 参 数: 无 * 返 回 值: 无 ***************************************************************/ -void Init_BH1750(void) +void BH1750_Init(void) { uint8_t t_Data = 0x01; HAL_I2C_Master_Transmit(&hi2c1,BH1750_Addr,&t_Data,1,0xff); @@ -26,7 +26,7 @@ void Init_BH1750(void) * 参 数: 无 * 返 回 值: 无 ***************************************************************/ -void Start_BH1750(void) +void BH1750_Start(void) { uint8_t t_Data = 0x10; HAL_I2C_Master_Transmit(&hi2c1,BH1750_Addr,&t_Data,1,0xff); @@ -40,9 +40,9 @@ void Start_BH1750(void) * 参 数: 无 * 返 回 值: 光强值 ***************************************************************/ -float Convert_BH1750(void) +float BH1750_Convert(void) { - Start_BH1750(); + BH1750_Start(); HAL_Delay(180); HAL_I2C_Master_Receive(&hi2c1, BH1750_Addr+1,BUF,2,0xff); result=BUF[0]; diff --git a/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/bh1750.h b/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/bh1750.h index 8347fc08..125a483d 100644 --- a/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/bh1750.h +++ b/board/BearPi_STM32L31RC/BSP/Hardware/BH1750/bh1750.h @@ -27,10 +27,10 @@ typedef struct -void Init_BH1750(void); //IO初始化, -void Start_BH1750(void); //上电,设置清除数据寄存器 -//void Read_BH1750(void); //连续的读取内部寄存器数据 -float Convert_BH1750(void); +void BH1750_Init(void); //IO初始化, +void BH1750_Start(void); //上电,设置清除数据寄存器 +//void BH1750_Read(void); //连续的读取内部寄存器数据 +float BH1750_Convert(void); #endif diff --git a/board/BearPi_STM32L31RC/BSP/Src/mcu_init.c b/board/BearPi_STM32L31RC/BSP/Src/mcu_init.c index 17e3ea01..2b0a8eea 100644 --- a/board/BearPi_STM32L31RC/BSP/Src/mcu_init.c +++ b/board/BearPi_STM32L31RC/BSP/Src/mcu_init.c @@ -40,21 +40,21 @@ void board_init(void) { char *str = "TencentOS tiny"; - HAL_Init(); - SystemClock_Config(); - MX_GPIO_Init(); - MX_ADC1_Init(); - MX_I2C1_Init(); - MX_LPUART1_UART_Init(); + HAL_Init(); + SystemClock_Config(); + MX_GPIO_Init(); + MX_ADC1_Init(); + MX_I2C1_Init(); + MX_LPUART1_UART_Init(); MX_USART1_UART_Init(); - MX_USART2_UART_Init(); + MX_USART2_UART_Init(); MX_USART3_UART_Init(); - MX_SPI1_Init(); - MX_SPI3_Init(); - Init_BH1750(); - LCD_Init(); - LCD_Clear(WHITE); - LCD_Show_Image(0,0,240,55,gImage_logo); + MX_SPI1_Init(); + MX_SPI3_Init(); + BH1750_Init(); + LCD_Init(); + LCD_Clear(WHITE); + LCD_Show_Image(0,0,240,55,gImage_logo); LCD_ShowCharStr(36,100,(char*)str, WHITE, BLUE, 24); }