Merge branch 'master' of https://github.com/stm32duino/Arduino_Core_STM32

Author: ghent360

.editorconfig

@@ -0,0 +1,10 @@
+[*.sh]
+# like -i=2
+indent_style = space
+indent_size = 2
+
+#shell_variant      = posix # like -ln=posix
+#binary_next_line   = true  # like -bn
+switch_case_indent = true  # like -ci
+space_redirects    = true  # like -sr
+#keep_padding       = true  # like -kp

.gitattributes

@@ -0,0 +1,20 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.cpp text
+*.h text
+*.s text
+*.S text
+*.ld text
+*.txt text
+*.xml text
+*.py text
+*.md text
+*.json text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

CI/build/arduino-cli.py

@@ -80,7 +80,8 @@
 skip_count = 0
 
 # format
-build_format = "| {:8} | {:44} | {:9} "
+build_format_header = "| {:^8} | {:42} | {:^10} | {:^7} |"
+build_format_result = "| {:^8} | {:42} | {:^19} | {:^6.2f}s |"
 build_separator = "-" * 80
 
 
@@ -495,31 +496,37 @@ def check_status(status, build_conf, boardKo):
     elif status[1] == 1:
         # Check if failed due to a region overflowed
         logFile = os.path.join(build_conf[3], sketch_name + ".log")
+        error_pattern = re.compile(":\\d+:\\d+:\\serror:\\s")
         ld_pattern = re.compile("arm-none-eabi/bin/ld:")
         overflow_pattern = re.compile(
             "will not fit in region|region .+ overflowed by [\\d]+ bytes"
         )
+        error_found = False
         for i, line in enumerate(open(logFile)):
-            if ld_pattern.search(line):
+            if error_pattern.search(line):
+                error_found = True
+            elif ld_pattern.search(line):
                 # If one ld line is not for region overflowed --> failed
                 if overflow_pattern.search(line) is None:
-                    result = "\033[31mfailed\033[0m   "
-                    boardKo.append(build_conf[0])
-                    if args.ci:
-                        cat(logFile)
-                    nb_build_failed += 1
-                    break
+                    error_found = True
+            if error_found:
+                result = "\033[31mfailed\033[0m"
+                boardKo.append(build_conf[0])
+                if args.ci:
+                    cat(logFile)
+                nb_build_failed += 1
+                break
         else:
             # else consider it succeeded
-            result = "\033[32msucceeded\033[0m"
+            result = "\033[32msucceeded*\033[0m"
             if args.bin:
                 empty_bin(build_conf[0], sketch_name)
             nb_build_passed += 1
     else:
-        result = "\033[31merror\033[0m   "
+        result = "\033[31merror\033[0m"
 
     print(
-        (build_format + "| {:5.2f}s |").format(
+        (build_format_result).format(
             "{}/{}".format(build_conf[1], build_conf[2]),
             build_conf[0],
             result,
@@ -730,12 +737,12 @@ def build_config(sketch, boardSkipped):
                 for pattern in na_sketch_pattern[build_conf_list[idx][0]]:
                     if re.search(pattern, sketch, re.IGNORECASE):
                         print(
-                            (build_format + "| {:5.2f}s |").format(
+                            (build_format_result).format(
                                 "{}/{}".format(
                                     build_conf_list[idx][1], build_conf_list[idx][2]
                                 ),
                                 build_conf_list[idx][0],
-                                "\033[33mskipped\033[0m  ",
+                                "\033[33mskipped\033[0m",
                                 0.00,
                             )
                         )
@@ -782,7 +789,7 @@ def build_all():
         for line in wrapped_path_:
             print("| {:^76} |".format("{}".format(line)))
         print(build_separator)
-        print((build_format + "| {:6} |").format("Num", "Board", "Result", "Time"))
+        print((build_format_header).format("Num", "Board", "Result", "Time"))
         print(build_separator)
 
         build_conf_list = build_config(sketch, boardSkipped)

CI/utils/gen_wrapper.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -
-set -o nounset                              # Treat unset variables as an error
+set -o nounset # Treat unset variables as an error
 
 # Base path
 Core_path=../..
@@ -23,40 +23,41 @@ LLoutInc_path=$Core_path/cores/arduino/stm32/LL
 CMSIS_Startupfile=$Core_path/cores/arduino/stm32/stm32_def_build.h
 
 # Variables
-series=(`ls -d $HALDrivers_path/STM32*/ | sed -e "s#$HALDrivers_path/STM32##g" | sed -e "s#xx_HAL_Driver/##g"`)
+series=($(find $HALDrivers_path -maxdepth 1 -type d -name "STM32*" | sed -e "s#$HALDrivers_path/STM32##g" -e "s#xx_HAL_Driver##g" | sort))
+
 all_LL_file=stm32yyxx_ll.h
 
 # Create the file
 print_C_header() {
-if [[ $1 = *"template"* ]]; then
-  echo "#if 0" > $1
-else
-  touch $1
-fi
+  if [[ $1 = *"template"* ]]; then
+    echo "#if 0" > "$1"
+  else
+    touch "$1"
+  fi
 }
 
 # Add some pragma to ll header files to avoid several warnings
 # which will be corrected along Cube update
 print_LL_header() {
-upper=`echo $1 | awk '{print toupper($1)}' | sed -e "s/\./_/g"`
-echo "#ifndef _${upper}_
+  upper=$(echo "$1" | awk '{print toupper($1)}' | sed -e "s/\./_/g")
+  echo "#ifndef _${upper}_
 #define _${upper}_
 /* LL raised several warnings, ignore them */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored \"-Wunused-parameter\"
 #pragma GCC diagnostic ignored \"-Wstrict-aliasing\"
-" > $LLoutInc_path/$1
+" > $LLoutInc_path/"$1"
 }
 
 print_CMSIS_Startup_header() {
-echo "#ifndef _STM32_DEF_BUILD_
+  echo "#ifndef _STM32_DEF_BUILD_
 #define _STM32_DEF_BUILD_
 
 #if !defined(CMSIS_STARTUP_FILE) && !defined(CUSTOM_STARTUP_FILE)" > $CMSIS_Startupfile
 }
 
 print_CMSIS_Startup_footer() {
-echo "#else
+  echo "#else
 #error UNKNOWN CHIP
 #endif
 #else
@@ -66,29 +67,31 @@ echo "#else
 }
 
 print_CMSIS_Startup_list() {
-# Handle first elements
-# File name
-local f=`echo ${list[0]} | awk -F/ '{print $NF}'`
-local upper=`echo $f | awk -F'[_.]' '{print toupper($2)}' | tr X x`
-echo "#if defined($upper)
+  # Handle first elements
+  # File name
+  local f
+  local upper
+  f=$(echo "${list[0]}" | awk -F/ '{print $NF}')
+  upper=$(echo "$f" | awk -F'[_.]' '{print toupper($2)}' | tr X x)
+  echo "#if defined($upper)
 #define CMSIS_STARTUP_FILE \"$f\"" >> $CMSIS_Startupfile
 
-if [ ${#list[@]} -gt 1 ]; then
-	for fp in ${list[@]:1}
-    do
-    # File name
-    f=`echo $fp | awk -F/ '{print $NF}'`
-		upper=`echo $f | awk -F'[_.]' '{print toupper($2)}' | tr X x`
-		echo "#elif defined($upper)
+  if [ ${#list[@]} -gt 1 ]; then
+    for fp in "${list[@]:1}"; do
+      # File name
+      f=$(echo "$fp" | awk -F/ '{print $NF}')
+      upper=$(echo "$f" | awk -F'[_.]' '{print toupper($2)}' | tr X x)
+      upper="${upper//MP15xx/MP1xx}"
+      echo "#elif defined($upper)
 #define CMSIS_STARTUP_FILE \"$f\"" >> $CMSIS_Startupfile
-	done
-fi
+    done
+  fi
 }
 
 # main
 # Check if this is the right place
 if [ ! -d $HALDrivers_path ]; then
-  echo "Could not find $HAL_outSrcpath!"
+  echo "Could not find $HALDrivers_path!"
   echo "Launch $0 from scripts folder!"
   exit 1
 fi
@@ -97,51 +100,52 @@ fi
 rm -f $HALoutSrc_path/* $LLoutSrc_path/* $LLoutInc_path/* $CMSIS_Startupfile
 
 # Search all files for each series
-for serie in ${series[@]}
-do
-  if [ -d $HALDrivers_path/STM32${serie}xx_HAL_Driver/Src ]; then
-    lower=`echo $serie | awk '{print tolower($0)}'`
+for serie in "${series[@]}"; do
+  if [ -d $HALDrivers_path/STM32"${serie}"xx_HAL_Driver/Src ]; then
+    lower=$(echo "$serie" | awk '{print tolower($0)}')
     echo -n "Generating for $serie..."
 
     # Generate stm32yyxx_[hal|ll]*.c file
-    filelist=(`find $HALDrivers_path/STM32${serie}xx_HAL_Driver/Src -maxdepth 1 -name "stm32${lower}xx_*.c"`)
-    for fp in ${filelist[@]}
-    do
+    filelist=($(find $HALDrivers_path/STM32"${serie}"xx_HAL_Driver/Src -maxdepth 1 -name "stm32${lower}xx_*.c"))
+    for fp in "${filelist[@]}"; do
       outp=$HALoutSrc_path
       # File name
-      f=`echo $fp | awk -F/ '{print $NF}'`
+      f=$(echo "$fp" | awk -F/ '{print $NF}')
       # Compute generic file name
-      g=`echo $f | sed -e "s/$lower/yy/g"`
-      if [[  $f = *"_ll_"* ]]; then
+      g="${f//$lower/yy}"
+      if [[ $f = *"_ll_"* ]]; then
         outp=$LLoutSrc_path
       fi
-      if [ ! -f $outp/$g ]; then
-        print_C_header $outp/$g
+      if [ ! -f $outp/"$g" ]; then
+        print_C_header $outp/"$g"
       fi
       # Amend file name under serie switch
-      echo "#ifdef STM32${serie}xx" >> $outp/$g
-      echo "#include \"$f\"" >> $outp/$g
-      echo "#endif" >> $outp/$g
+      {
+        echo "#ifdef STM32${serie}xx"
+        echo "#include \"$f\""
+        echo "#endif"
+      } >> $outp/"$g"
     done
 
     # Generate stm32yyxx_ll_*.h file
-    filelist=(`find $HALDrivers_path/STM32${serie}xx_HAL_Driver/Inc -maxdepth 2 -name "stm32${lower}xx_ll_*.h"`)
-    for fp in ${filelist[@]}
-    do
+    filelist=($(find $HALDrivers_path/STM32"${serie}"xx_HAL_Driver/Inc -maxdepth 2 -name "stm32${lower}xx_ll_*.h"))
+    for fp in "${filelist[@]}"; do
       # File name
-      f=`echo $fp | awk -F/ '{print $NF}'`
+      f=$(echo "$fp" | awk -F/ '{print $NF}')
       # Compute generic file name
-      g=`echo $f | sed -e "s/$lower/yy/g"`
+      g="${f//$lower/yy}"
 
-      if [ ! -f $LLoutInc_path/$g ]; then
-        print_LL_header $g
+      if [ ! -f $LLoutInc_path/"$g" ]; then
+        print_LL_header "$g"
       fi
       # Amend full LL header file
       echo "#include \"$g\"" >> $LLoutInc_path/${all_LL_file}.tmp
       # Amend file name under serie switch
-      echo "#ifdef STM32${serie}xx" >> $LLoutInc_path/$g
-      echo "#include \"$f\"" >> $LLoutInc_path/$g
-      echo "#endif" >> $LLoutInc_path/$g
+      {
+        echo "#ifdef STM32${serie}xx"
+        echo "#include \"$f\""
+        echo "#endif"
+      } >> $LLoutInc_path/"$g"
     done
     echo "done"
   fi
@@ -156,30 +160,28 @@ sort -u $LLoutInc_path/${all_LL_file}.tmp >> $LLoutInc_path/${all_LL_file}
 rm -f $LLoutInc_path/${all_LL_file}.tmp
 
 # Search all template file to end "#if 0"
-filelist=(`find $HALoutSrc_path -maxdepth 1 -name "stm32*_template.c"`)
-for fp in ${filelist[@]}
-do
- echo "#endif /* 0 */" >> $fp
+filelist=($(find $HALoutSrc_path -maxdepth 1 -name "stm32*_template.c"))
+for fp in "${filelist[@]}"; do
+  echo "#endif /* 0 */" >> "$fp"
 done
 
 # Search all LL header files to end guard
-filelist=(`find $LLoutInc_path -maxdepth 1 -name "stm32yyxx_ll*.h"`)
-for fp in ${filelist[@]}
-do
-  upper=`basename $fp | awk '{print toupper($1)}' | sed -e "s/\./_/g"`
-  echo "#pragma GCC diagnostic pop" >> $fp
-  echo "#endif /* _${upper}_ */" >> $fp
+filelist=($(find $LLoutInc_path -maxdepth 1 -name "stm32yyxx_ll*.h"))
+for fp in "${filelist[@]}"; do
+  upper=$(basename "$fp" | awk '{print toupper($1)}' | sed -e "s/\./_/g")
+  echo "#pragma GCC diagnostic pop" >> "$fp"
+  echo "#endif /* _${upper}_ */" >> "$fp"
 done
 
 # CMSIS startup files
-list=(`find $CMSIS_Device_ST_path -name "startup_*.s" | grep gcc | sort -u`)
+list=($(find $CMSIS_Device_ST_path -name "startup_*.s" | grep gcc | sort -du))
 if [ ${#list[@]} -ne 0 ]; then
-	echo "Number of startup files: ${#list[@]}"
-	print_CMSIS_Startup_header
-	print_CMSIS_Startup_list
-	print_CMSIS_Startup_footer
+  echo "Number of startup files: ${#list[@]}"
+  print_CMSIS_Startup_header
+  print_CMSIS_Startup_list
+  print_CMSIS_Startup_footer
 else
-	echo "No startup files found!"
+  echo "No startup files found!"
 fi
 
 # CMSIS DSP C source files
@@ -189,16 +191,15 @@ if [ ! -d $CMSIS_DSPSrc_path ]; then
   echo "Skip CMSIS DSP generation."
 else
   # Remove old file
-  rm -fr $CMSIS_DSP_outSrc_path/*/
+  rm -fr "${CMSIS_DSP_outSrc_path:?}"/*/
 
-  filelist=(`find $CMSIS_DSPSrc_path -name "*.c" | sed -e "s#$CMSIS_DSPSrc_path/##g" | sort -u`)
-  for fp in ${filelist[@]}
-  do
+  filelist=($(find $CMSIS_DSPSrc_path -name "*.c" | sed -e "s#$CMSIS_DSPSrc_path/##g" | sort -u))
+  for fp in "${filelist[@]}"; do
     # Directory name
-    d=`echo $fp | awk -F/ '{print $(NF-1)}'`
-    if [ ! -d $CMSIS_DSP_outSrc_path/$d ]; then
-      mkdir $CMSIS_DSP_outSrc_path/$d
-      echo "#include \"../Source/$d/$d.c\"" > $CMSIS_DSP_outSrc_path/$d/$d.c
+    d=$(echo "$fp" | awk -F/ '{print $(NF-1)}')
+    if [ ! -d $CMSIS_DSP_outSrc_path/"$d" ]; then
+      mkdir $CMSIS_DSP_outSrc_path/"$d"
+      echo "#include \"../Source/$d/$d.c\"" > $CMSIS_DSP_outSrc_path/"$d"/"$d".c
     fi
   done
 fi

README.md

@@ -1,7 +1,7 @@
 # Arduino core support for STM32 based boards
 [![forums](https://img.shields.io/badge/join-the%20forums-blue.svg)](https://www.stm32duino.com/)
 [![wiki](https://img.shields.io/badge/browse-the%20wiki-orange.svg)](https://github.com/stm32duino/wiki/wiki)
-![Continuous Integration](https://github.com/stm32duino/Arduino_Core_STM32/workflows/STM32%20Core%20Continuous%20Integration/badge.svg)
+![STM32 Core Continuous Integration](https://github.com/stm32duino/Arduino_Core_STM32/workflows/STM32%20Core%20Continuous%20Integration/badge.svg?branch=master)
 
 [![GitHub release](https://img.shields.io/github/release/stm32duino/Arduino_Core_STM32.svg)](https://github.com/stm32duino/Arduino_Core_STM32/releases/latest)
 ![GitHub All Releases](https://img.shields.io/github/downloads/stm32duino/Arduino_Core_STM32/total.svg?label=downloads%20since%201.4.0)
@@ -77,6 +77,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 
 | Status | [Nucleo 32](https://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-nucleo-boards.html) | Release | Comment |
 | :---: | --- | :---: | :--- |
+| :yellow_heart: | [Nucleo F031K6](https://www.st.com/en/evaluation-tools/nucleo-f031k6.html) | **1.9.0** |  |
 | :green_heart: | [Nucleo F303K8](http://www.st.com/en/evaluation-tools/nucleo-f303k8.html) | *1.1.0* |  |
 | :green_heart: | [Nucleo G431KB](https://www.st.com/en/evaluation-tools/nucleo-g431kb.html) | *1.7.0* |  |
 | :green_heart: | [Nucleo L031K6](http://www.st.com/en/evaluation-tools/nucleo-l031k6.html) | *1.1.1* |  |