Skip to content

Commit f3345c0

Browse files
committed
update to v0.1.6
1 parent 8499da2 commit f3345c0

6 files changed

Lines changed: 17 additions & 10 deletions

File tree

drivers/baremetal/drv_clk.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void system_clock_config(int target_freq_Mhz)
4848
#endif
4949
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
5050
{
51-
Error_Handler();
51+
Error_Handler();
5252
}
5353
/** Initializes the CPU, AHB and APB busses clocks
5454
*/
@@ -72,10 +72,10 @@ void system_clock_config(int target_freq_Mhz)
7272
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
7373
#endif
7474
#if defined(STM32F105xC) || defined(STM32F107xC)
75-
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
75+
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
7676
#endif
7777
{
78-
Error_Handler();
78+
Error_Handler();
7979
}
8080
}
8181

drivers/baremetal/drv_usart.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Change Logs:
77
* Date Author Notes
88
* 2019-11-09 xiangxistu first version
9+
* 2020-05-18 chenyaxing modify stm32_uart_config struct
910
*/
1011

1112
#include <string.h>
@@ -216,14 +217,15 @@ static long stm32_gpio_clk_enable(GPIO_TypeDef *gpiox)
216217
return 0;
217218
}
218219

219-
char * up_char(char * c)
220+
static int up_char(char * c)
220221
{
221222
if ((*c >= 'a') && (*c <= 'z'))
222223
{
223224
*c = *c - 32;
224225
}
225226
return 0;
226227
}
228+
227229
static void get_pin_by_name(const char* pin_name, GPIO_TypeDef **port, uint16_t *pin)
228230
{
229231
int pin_num = atoi((char*) &pin_name[2]);
@@ -456,4 +458,3 @@ void print_char(char c)
456458
{
457459
HAL_UART_Transmit(&handle, (uint8_t *) (&c), 1, 1);
458460
}
459-

drivers/baremetal/uart_config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* Date Author Notes
88
* 2018-10-30 SummerGift first version
99
* 2019-01-03 zylx modify dma support
10+
* 2020-05-18 chenyaxing modify uart_config struct
1011
*/
1112

1213
#ifndef __UART_CONFIG_H__

drivers/nano/drv_clk.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void system_clock_config(int target_freq_Mhz)
4747
#endif
4848
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
4949
{
50-
Error_Handler();
50+
Error_Handler();
5151
}
5252
/** Initializes the CPU, AHB and APB busses clocks
5353
*/
@@ -71,10 +71,10 @@ void system_clock_config(int target_freq_Mhz)
7171
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
7272
#endif
7373
#if defined(STM32F105xC) || defined(STM32F107xC)
74-
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
74+
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
7575
#endif
7676
{
77-
Error_Handler();
77+
Error_Handler();
7878
}
7979
}
8080

drivers/nano/drv_usart.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Change Logs:
77
* Date Author Notes
88
* 2019-11-09 xiangxistu first version
9+
* 2020-05-18 chenyaxing modify usart3 remap check
910
*/
1011

1112
#include "stdlib.h"
@@ -222,14 +223,15 @@ static rt_err_t stm32_gpio_clk_enable(GPIO_TypeDef *gpiox)
222223
return RT_EOK;
223224
}
224225

225-
char * up_char(char * c)
226+
static int up_char(char * c)
226227
{
227228
if ((*c >= 'a') && (*c <= 'z'))
228229
{
229230
*c = *c - 32;
230231
}
231232
return 0;
232233
}
234+
233235
static void get_pin_by_name(const char* pin_name, GPIO_TypeDef **port, uint16_t *pin)
234236
{
235237
int pin_num = atoi((char*) &pin_name[2]);

drivers/rtt/drv_usart.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Change Logs:
77
* Date Author Notes
88
* 2018-10-30 SummerGift first version
9+
* 2020-05-18 chenyaxing modify usart3 remap check
910
*/
1011
#include "string.h"
1112
#include "stdlib.h"
@@ -329,14 +330,16 @@ static rt_err_t stm32_gpio_clk_enable(GPIO_TypeDef *gpiox)
329330

330331
return RT_EOK;
331332
}
332-
char * up_char(char * c)
333+
334+
static int up_char(char * c)
333335
{
334336
if ((*c >= 'a') && (*c <= 'z'))
335337
{
336338
*c = *c - 32;
337339
}
338340
return 0;
339341
}
342+
340343
static void get_pin_by_name(const char* pin_name, GPIO_TypeDef **port, uint16_t *pin)
341344
{
342345
int pin_num = atoi((char*) &pin_name[2]);

0 commit comments

Comments
 (0)