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

Author: ghent360

platform.txt

@@ -99,25 +99,13 @@ build.flash_offset=0
 
 # Pre and post build hooks
 build.opt.name=build_opt.h
-build.opt.sourcepath={build.source.path}/{build.opt.name}
 build.opt.path={build.path}/sketch/{build.opt.name}
 
-build.src_wrapper.path={build.path}/sketch/SrcWrapper.cpp
+extras.path={build.system.path}/extras
 
-# Create sketch dir if not exists
-recipe.hooks.prebuild.1.pattern.windows=cmd /c if not exist "{build.path}\sketch" mkdir "{build.path}\sketch"
-recipe.hooks.prebuild.1.pattern.linux=bash -c "[ -f {build.path}/sketch ] || mkdir -p {build.path}/sketch"
-recipe.hooks.prebuild.1.pattern.macosx=bash -c "[ -f {build.path}/sketch ] || mkdir -p {build.path}/sketch"
-
-# Create empty {build.opt} if not exists in the sketch dir
-recipe.hooks.prebuild.2.pattern.windows=cmd /c if not exist "{build.opt.sourcepath}" type NUL > "{build.opt.path}"
-recipe.hooks.prebuild.2.pattern.linux=bash -c "[ -f {build.opt.sourcepath} ] || touch {build.opt.path}"
-recipe.hooks.prebuild.2.pattern.macosx=bash -c "[ -f {build.opt.sourcepath} ] || touch {build.opt.path}"
-
-# Force include of SrcWrapper library
-recipe.hooks.prebuild.3.pattern.windows=cmd /c echo #include ^<SrcWrapper.h^> > "{build.src_wrapper.path}"
-recipe.hooks.prebuild.3.pattern.linux=bash -c "echo $0 > {build.src_wrapper.path}" "#include <SrcWrapper.h>"
-recipe.hooks.prebuild.3.pattern.macosx=bash -c "echo $0 > {build.src_wrapper.path}" "#include <SrcWrapper.h>"
+# Create empty {build.opt} if not exists in the output sketch dir and force include of SrcWrapper library
+recipe.hooks.prebuild.1.pattern="{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}" 
+recipe.hooks.prebuild.1.pattern.windows="{runtime.tools.STM32Tools.path}/tools/win/busybox.exe" sh "{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}"
 
 # compile patterns
 # ---------------------
@@ -162,9 +150,8 @@ recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 # -------------------
 
 # Upload to board via mass storage
-tools.massStorageCopy.cmd=massStorageCopy
+tools.massStorageCopy.cmd=massStorageCopy.sh
 tools.massStorageCopy.cmd.windows=massStorageCopy.bat
-tools.massStorageCopy.cmd.macosx=massStorageCopyMacOsX
 tools.massStorageCopy.path={runtime.tools.STM32Tools.path}/tools/win
 tools.massStorageCopy.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
 tools.massStorageCopy.path.linux={runtime.tools.STM32Tools.path}/tools/linux
@@ -174,7 +161,6 @@ tools.massStorageCopy.upload.pattern="{path}/{cmd}" {upload.verbose} -I "{build.
 
 # STM32CubeProgrammer upload
 tools.stm32CubeProg.cmd=stm32CubeProg.sh
-tools.stm32CubeProg.cmd.macosx=stm32CubeProg
 tools.stm32CubeProg.cmd.windows=stm32CubeProg.bat
 tools.stm32CubeProg.path.linux={runtime.tools.STM32Tools.path}/tools/linux
 tools.stm32CubeProg.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
@@ -202,7 +188,7 @@ tools.hid_upload.upload.params.quiet=n
 tools.hid_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin" {serial.port.file}                                                                                                                             
 
 # Upload using Maple bootloader over DFU
-tools.maple_upload.cmd=maple_upload
+tools.maple_upload.cmd=maple_upload.sh
 tools.maple_upload.cmd.windows=maple_upload.bat
 tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win
 tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx

system/extras/prebuild.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+BUILD_PATH="$1"
+BUILD_SOURCE_PATH="$2"
+
+# Create sketch dir if not exists
+if [ ! -f "$BUILD_PATH/sketch" ]; then
+  mkdir -p "$BUILD_PATH/sketch"
+fi
+
+# Create empty build.opt.h if not exists in the original sketch dir
+if [ ! -f "$BUILD_SOURCE_PATH/build_opt.h" ]; then
+  touch "$BUILD_PATH/sketch/build_opt.h"
+fi
+
+# Force include of SrcWrapper library
+echo "#include <SrcWrapper.h>" >"$BUILD_PATH/sketch/SrcWrapper.cpp"

variants/Generic_F411Cx/variant.h

@@ -81,7 +81,10 @@ extern "C" {
 #define LED_GREEN               LED_BUILTIN
 
 // On-board user button
-#if !defined(USER_BTN) && !defined(ARDUINO_BLACKPILL_F411CE)
+#ifdef ARDUINO_BLACKPILL_F411CE
+#define USER_BTN                PA0
+#endif
+#if !defined(USER_BTN)
 #define USER_BTN                PC13
 #endif
 

variants/NUCLEO_F767ZI/variant.h

@@ -37,10 +37,10 @@ extern "C" {
 #define PF13 7
 #define PF12 8
 #define PD15 9
-#define PD14 A10
-#define PA7  A11
-#define PA6  A12
-#define PA5  13
+#define PD14 10
+#define PA7  A10
+#define PA6  A11
+#define PA5  A12
 #define PB9  14
 #define PB8  15
 #define PC6  16