Merge branch 'stm32duino:main' into hal-irqhandler-flagdisabling

Author: Santynolo

.github/actions/pio-build/README.md

@@ -2,12 +2,6 @@
 
 This action build thanks PIO.
 
-## Inputs
-
-### `cmsis-version`
-
-The CMSIS version to use. Default `"5.9.0"`.
-
 ## Example usage
 
 ```yaml

.github/actions/pio-build/action.yml

@@ -1,12 +1,6 @@
 # action.yml
 name: 'PlatformIO Build'
 description: 'Compile using PlatformIO'
-inputs:
-  cmsis-version:
-    description: 'CMSIS package version to use'
-    default: '5.9.0'
 runs:
   using: 'docker'
   image: 'Dockerfile'
-  args:
-    - ${{ inputs.cmsis-version }}

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

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-readonly CMSIS_VERSION="$1"
-readonly CMSIS_ARCHIVE="CMSIS-${CMSIS_VERSION}.tar.bz2"
-
 # Use python venv
 python3 -m venv "$HOME/venv"
 # shellcheck disable=SC1091
@@ -11,24 +8,18 @@ python3 -m venv "$HOME/venv"
 python3 -m pip install --quiet --upgrade platformio
 
 # Install the development version of ststm32 platform
-platformio platform install "https://github.com/platformio/platform-ststm32.git" || {
+pio pkg install --platform "https://github.com/platformio/platform-ststm32.git" --force --global || {
   exit 1
 }
 # Prepare framework for CI
+# Modify platform.json to use local framework-arduinoststm32 package
 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'] = '*'; del data['packages']['framework-arduinoststm32']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
   exit 1
 }
-
+# Create symbolic link to the framework-arduinoststm32 package pointing to the repository workspace
 ln --symbolic "$GITHUB_WORKSPACE" "$HOME/.platformio/packages/framework-arduinoststm32" || {
   exit 1
 }
-# Download and unpack CMSIS package
-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
 }

boards.txt

@@ -114,7 +114,7 @@
     void serialEventLP2() __attribute__((weak));
   #endif
   #if defined(HAVE_HWSERIALLP3)
-    HardwareSerial SerialLP2(LPUART3);
+    HardwareSerial SerialLP3(LPUART3);
     void serialEventLP3() __attribute__((weak));
   #endif
 #endif // HAVE_HWSERIALx

cores/arduino/HardwareSerial.cpp

@@ -53,6 +53,12 @@ void CDC_deInit(void);
 bool CDC_connected(void);
 void CDC_enableDTR(bool enable);
 
+// getters for CDC line codings. Do not expose struct directly
+uint32_t CDC_getBaudrate(void);
+uint8_t  CDC_getStopBits(void);
+uint8_t  CDC_getParity(void);
+uint8_t  CDC_getDataBits(void);
+
 #ifdef __cplusplus
 }
 #endif

libraries/USBDevice/inc/usbd_cdc_if.h

@@ -158,22 +158,26 @@ void USBSerial::flush(void)
 
 uint32_t USBSerial::baud()
 {
-  return 115200;
+  // return (virtual) CDC line setting coding
+  return CDC_getBaudrate();
 }
 
 uint8_t USBSerial::stopbits()
 {
-  return ONE_STOP_BIT;
+  // return (virtual) CDC line setting coding
+  return CDC_getStopBits();
 }
 
 uint8_t USBSerial::paritytype()
 {
-  return NO_PARITY;
+  // return (virtual) CDC line setting coding
+  return CDC_getParity();
 }
 
 uint8_t USBSerial::numbits()
 {
-  return 8;
+  // return (virtual) CDC line setting coding
+  return CDC_getDataBits();
 }
 
 void USBSerial::dtr(bool enable)

libraries/USBDevice/src/USBSerial.cpp

@@ -379,6 +379,30 @@ void CDC_enableDTR(bool enable)
   CDC_DTR_enabled = enable;
 }
 
+// getter for CDC baudrate
+uint32_t CDC_getBaudrate()
+{
+  return linecoding.bitrate;
+}
+
+// getter for CDC stop bits. Note: CDC definition identical to USBSerial.h
+uint8_t  CDC_getStopBits(void)
+{
+  return linecoding.format;
+}
+
+// getter for CDC parity. Note: CDC definition identical to USBSerial.h
+uint8_t  CDC_getParity(void)
+{
+  return linecoding.paritytype;
+}
+
+// getter for CDC data bits. Note: CDC definition identical to USBSerial.h
+uint8_t  CDC_getDataBits(void)
+{
+  return linecoding.datatype;
+}
+
 #endif /* USBD_USE_CDC */
 #endif /* USBCON */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/