update to v0.1.6

Author: dh-04

drivers/baremetal/drv_usart.c

@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2019-11-09     xiangxistu   first version
+ * 2020-05-18     chenyaxing   modify stm32_uart_config struct
  */
 
 #include <string.h>
@@ -209,7 +210,7 @@ static long stm32_gpio_clk_enable(GPIO_TypeDef *gpiox)
     return 0;
 }
 
-char * up_char(char * c)
+static int up_char(char * c)
 {
     if ((*c >= 'a') && (*c <= 'z'))
     {

drivers/nano/SConscript

@@ -0,0 +1,37 @@
+import os
+from building import *
+
+
+def modify_board_h_file(filepath, include_str):
+    is_include_file_exist = False
+
+    with open(filepath, mode='r') as f:
+        for line in f:
+            if include_str.strip() in line:
+                is_include_file_exist = True
+                break
+
+    if not is_include_file_exist:
+        w_str = ""
+        with open(filepath, mode='r') as f:
+            for line in f:
+                if '#define __BOARD_H__' in line:
+                    w_str += line
+                    w_str += include_str
+                else:
+                    w_str += line
+        with open(filepath, mode='w') as f:
+            f.write(w_str)
+
+
+cwd = GetCurrentDir()
+group = DefineGroup('', [], depend=[''], CPPPATH=[])
+
+file_path = "board.h"
+include_str = """
+#include <stm32g4xx.h>
+"""
+modify_board_h_file(os.path.join(cwd, file_path), include_str)
+os.remove(os.path.join(cwd,"SConscript"))
+
+Return('group')

drivers/nano/drv_clk.c

@@ -40,7 +40,7 @@ void system_clock_config(int target_freq_mhz)
      RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
      {
-       Error_Handler();
+        Error_Handler();
      }
      /** Initializes the CPU, AHB and APB busses clocks
      */
@@ -53,7 +53,7 @@ void system_clock_config(int target_freq_mhz)
 
      if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_8) != HAL_OK)
      {
-       Error_Handler();
+        Error_Handler();
      }
 }
 

drivers/nano/drv_usart.c

@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2019-11-09     xiangxistu   first version
+ * 2020-05-18     chenyaxing   modify stm32_uart_config struct
  */
 
 #include "stdlib.h"

drivers/rtt/SConscript

@@ -0,0 +1,37 @@
+import os
+from building import *
+
+
+def modify_board_h_file(filepath, include_str):
+    is_include_file_exist = False
+
+    with open(filepath, mode='r') as f:
+        for line in f:
+            if include_str.strip() in line:
+                is_include_file_exist = True
+                break
+
+    if not is_include_file_exist:
+        w_str = ""
+        with open(filepath, mode='r') as f:
+            for line in f:
+                if '#define __BOARD_H__' in line:
+                    w_str += line
+                    w_str += include_str
+                else:
+                    w_str += line
+        with open(filepath, mode='w') as f:
+            f.write(w_str)
+
+
+cwd = GetCurrentDir()
+group = DefineGroup('', [], depend=[''], CPPPATH=[])
+
+file_path = "board.h"
+include_str = """
+#include <stm32g4xx.h>
+"""
+modify_board_h_file(os.path.join(cwd, file_path), include_str)
+os.remove(os.path.join(cwd,"SConscript"))
+
+Return('group')

drivers/rtt/drv_clk.c

@@ -40,7 +40,7 @@ void system_clock_config(int target_freq_mhz)
      RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
      {
-       Error_Handler();
+        Error_Handler();
      }
      /** Initializes the CPU, AHB and APB busses clocks
      */
@@ -53,7 +53,7 @@ void system_clock_config(int target_freq_mhz)
 
      if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_8) != HAL_OK)
      {
-       Error_Handler();
+        Error_Handler();
      }
 }
 int clock_information(void)

drivers/rtt/drv_usart.c

@@ -6,7 +6,9 @@
  * Change Logs:
  * Date           Author       Notes
  * 2018-10-30     SummerGift   first version
+ * 2020-05-23     chenyaxing   modify stm32_uart_config
  */
+
 #include "string.h"
 #include "stdlib.h"
 #include "drv_common.h"
@@ -329,14 +331,16 @@ static rt_err_t stm32_gpio_clk_enable(GPIO_TypeDef *gpiox)
 
     return RT_EOK;
 }
-char * up_char(char * c)
+
+static int up_char(char * c)
 {
     if ((*c >= 'a') && (*c <= 'z'))
     {
         *c = *c - 32;
     }
     return 0;
 }
+
 static void get_pin_by_name(const char* pin_name, GPIO_TypeDef **port, uint16_t *pin)
 {
     int pin_num = atoi((char*) &pin_name[2]);