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

Author: ghent360

.github/actions/pio-build/Dockerfile

@@ -5,10 +5,10 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
 # Install prerequisites
-RUN apt-get update && apt-get install -y git python3 python3-pip wget
+RUN apt-get --quiet=2 update && apt-get install --quiet=2 --assume-yes git python3 python3-pip wget
 
 # Install PlatformIO
-RUN pip3 install -U platformio
+RUN pip3 install --quiet --upgrade platformio
 CMD /bin/bash
 
 # Copies your code file from your action repository to the filesystem path `/` of the container

.github/actions/pio-build/entrypoint.sh

@@ -1,19 +1,29 @@
-#!/bin/bash -x
+#!/bin/bash
 
-CMSIS_VERSION=$1
-CMSIS_ARCHIVE=CMSIS-${CMSIS_VERSION}.tar.bz2
+readonly CMSIS_VERSION="$1"
+readonly CMSIS_ARCHIVE="CMSIS-${CMSIS_VERSION}.tar.bz2"
 
 # Install the development version of ststm32 platform
-platformio platform install https://github.com/platformio/platform-ststm32.git
-
+platformio platform install "https://github.com/platformio/platform-ststm32.git" || {
+  exit 1
+}
 # Prepare framework for CI
-python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoststm32']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
-
-ln -sf $GITHUB_WORKSPACE $HOME/.platformio/packages/framework-arduinoststm32
+python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoststm32']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
+  exit 1
+}
+ln --symbolic "$GITHUB_WORKSPACE" "$HOME/.platformio/packages/framework-arduinoststm32" || {
+  exit 1
+}
 # Download and unpack CMSIS package
-wget https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/$CMSIS_VERSION/CMSIS-$CMSIS_VERSION.tar.bz2
-tar -xvjf CMSIS-$CMSIS_VERSION.tar.bz2
-cd $GITHUB_WORKSPACE/CI/build/
+wget --no-verbose "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/$CMSIS_VERSION/$CMSIS_ARCHIVE" || {
+  exit 1
+}
+tar --extract --bzip2 --file="$CMSIS_ARCHIVE" || {
+  exit 1
+}
+cd "$GITHUB_WORKSPACE/CI/build/" || {
+  exit 1
+}
 python3 platformio-builder.py --board=blackpill_f103c8 --board=remram_v1
 
 exit $?

cores/arduino/stm32/usb/usbd_conf.c

@@ -28,6 +28,11 @@
 #else
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
+#if !defined(USBD_VBUS_DETECTION_ENABLE)
+#define VBUS_SENSING DISABLE
+#else
+#define VBUS_SENSING ENABLE
+#endif
 
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
@@ -479,14 +484,14 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
   g_hpcd.Init.phy_itface = PCD_PHY_ULPI;
 #endif
   g_hpcd.Init.speed = PCD_SPEED_HIGH;
-  g_hpcd.Init.vbus_sensing_enable = ENABLE;
+  g_hpcd.Init.vbus_sensing_enable = VBUS_SENSING;
   g_hpcd.Init.use_external_vbus = DISABLE;
 #else /* USE_USB_FS */
 #ifdef USB_OTG_FS
   g_hpcd.Instance = USB_OTG_FS;
   g_hpcd.Init.use_dedicated_ep1 = DISABLE;
   g_hpcd.Init.dma_enable = DISABLE;
-  g_hpcd.Init.vbus_sensing_enable = DISABLE;
+  g_hpcd.Init.vbus_sensing_enable = VBUS_SENSING;
   g_hpcd.Init.use_external_vbus = DISABLE;
 #else
   g_hpcd.Instance = USB;

variants/board_template/variant.h

@@ -157,6 +157,11 @@ extern "C" {
 // SD Read/Write timeout, default value defined in STM32SD library
 //#define SD_DATATIMEOUT          x
 
+// USB Vbus sensing. Require to have Vbus pin connected to Vbus signal.
+// Warning, pin is different depending on FullSpeed or High Speed mode used
+// See AN4879 https://www.st.com/content/st_com/en/search.html#q=AN4879-t=resources-page=1
+//#define USBD_VBUS_DETECTION_ENABLE
+
 #ifdef __cplusplus
 } // extern "C"
 #endif