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

Author: ghent360

.github/workflows/Continuous-Integration.yml

@@ -32,6 +32,9 @@ jobs:
     - name: Astyle check
       id: Astyle
       uses: stm32duino/actions/astyle-check@master
+      with:
+        astyle-definition: 'CI/astyle/.astylerc'
+        ignore-path-list: 'CI/astyle/.astyleignore'
 
     # Use the output from the `Astyle` step
     - name: Astyle Errors

.gitignore

@@ -1,9 +1,36 @@
-*.orig
-*.swp
-.DS_Store
+# Specific
 astyle.out
 boards.local.txt
 platform.local.txt
-*.code-workspace
-.vscode
 path_config.json
+
+# Backup
+*.bak
+*.gho
+*.ori
+*.swp
+*.tmp
+
+# macOS
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Patch
+*.orig
+*.rej
+
+# Python
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace

CI/build/conf/cores_config.json

@@ -11,6 +11,14 @@
         {
           "name": "STEVAL_MKSBOX1V1",
           "options": "usb=CDCgen"
+        },
+        {
+          "name": "STM32MP157A_DK1",
+          "options": "virtio=enabled"
+        },
+        {
+          "name": "STM32MP157C_DK2",
+          "options": "virtio=generic"
         }
       ],
       "sketches": [

CI/build/conf/cores_config_ci.json

@@ -11,6 +11,14 @@
         {
           "name": "STEVAL_MKSBOX1V1",
           "options": "usb=CDCgen"
+        },
+        {
+          "name": "STM32MP157A_DK1",
+          "options": "virtio=enabled"
+        },
+        {
+          "name": "STM32MP157C_DK2",
+          "options": "virtio=generic"
         }
       ],
       "sketches": [

CI/build/conf/cores_config_travis.json

@@ -7,6 +7,14 @@
         {
           "name": "NUCLEO_L031K6",
           "options": "opt=oslto"
+        },
+        {
+          "name": "STM32MP157A_DK1",
+          "options": "virtio=enabled"
+        },
+        {
+          "name": "STM32MP157C_DK2",
+          "options": "virtio=generic"
         }
       ],
       "sketches": [

CI/build/examples/BareMinimum/BareMinimum.ino

@@ -42,7 +42,8 @@ SoftwareSerial swSerial(10, 11);
 
 void setup() {
   // Serial HW & SW
-#if !defined(USBD_USE_CDC) && !defined(DISABLE_GENERIC_SERIALUSB)
+#if (!defined(USBD_USE_CDC) && !defined(DISABLE_GENERIC_SERIALUSB)) &&\
+    (!defined(VIRTIOCON) && !defined(DISABLE_GENERIC_SERIALVIRTIO))
   Serial.setRx(PIN_SERIAL_RX);
   Serial.setTx(digitalPinToPinName(PIN_SERIAL_TX));
 #endif

README.md

@@ -94,6 +94,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :yellow_heart: | [STM32G0316-DISCO](https://www.st.com/en/evaluation-tools/stm32g0316-disco.html) | **1.9.0** |  |
 | :green_heart: | [B-L072Z-LRWAN1](http://www.st.com/en/evaluation-tools/b-l072z-lrwan1.html) | *1.1.0* |  |
 | :green_heart: | [B-L475E-IOT01A](http://www.st.com/en/evaluation-tools/b-l475e-iot01a.html) | *1.0.1* |  |
+| :yellow_heart: | [32F413HDISCOVERY](https://www.st.com/en/evaluation-tools/32f413hdiscovery.html) | **1.9.0** |  |
 
 | Status | [Eval](https://www.st.com/en/evaluation-tools/stm32-eval-boards.html) | Release | Comment |
 | :---: | --- | :---: | :--- |
@@ -170,6 +171,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart: | [RUMBA32](https://github.com/Aus3D/RUMBA32) | *1.5.0* |  |
 | :green_heart: | [STEVAL-3DP001V1](https://www.st.com/en/evaluation-tools/steval-3dp001v1.html) | *1.6.0* |  |
 | :green_heart: | [VAkE v1.0](https://www.facebook.com/pages/category/Product-Service/VAkE-Board-2290066274575218/) | *1.6.0* |  |
+| :yellow_heart: | [FYSETC_S6](https://wiki.fysetc.com/FYSETC_S6/) | **1.9.0** | |
 
 | Status | LoRa boards | Release | Comment |
 | :---: | --- | :---: | :--- |

boards.txt

@@ -5,6 +5,7 @@ menu.pnum=Board part number
 menu.xserial=U(S)ART support
 menu.usb=USB support (if available)
 menu.xusb=USB speed (if available)
+menu.virtio=Virtual serial support
 
 menu.opt=Optimize
 menu.rtlib=C Runtime Library
@@ -592,6 +593,19 @@ Disco.menu.pnum.DISCO_F407VG.build.product_line=STM32F407xx
 Disco.menu.pnum.DISCO_F407VG.build.variant=DISCO_F407VG
 Disco.menu.pnum.DISCO_F407VG.build.cmsis_lib_gcc=arm_cortexM4lf_math
 
+# DISCO_F413ZH board
+Disco.menu.pnum.DISCO_F413ZH=STM32F413H-DISCO
+Disco.menu.pnum.DISCO_F413ZH.node=DIS_F413ZH
+Disco.menu.pnum.DISCO_F413ZH.upload.maximum_size=1572864
+Disco.menu.pnum.DISCO_F413ZH.upload.maximum_data_size=327680
+Disco.menu.pnum.DISCO_F413ZH.build.mcu=cortex-m4
+Disco.menu.pnum.DISCO_F413ZH.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
+Disco.menu.pnum.DISCO_F413ZH.build.board=DISCO_F413ZH
+Disco.menu.pnum.DISCO_F413ZH.build.series=STM32F4xx
+Disco.menu.pnum.DISCO_F413ZH.build.product_line=STM32F413xx
+Disco.menu.pnum.DISCO_F413ZH.build.variant=DISCO_F413ZH
+Disco.menu.pnum.DISCO_F413ZH.build.cmsis_lib_gcc=arm_cortexM4lf_math
+
 # DISCO_F746NG board
 Disco.menu.pnum.DISCO_F746NG=STM32F746G-DISCOVERY
 Disco.menu.pnum.DISCO_F746NG.node=DIS_F746NG
@@ -707,7 +721,7 @@ STM32MP1.build.mcu=cortex-m4
 STM32MP1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
 STM32MP1.build.series=STM32MP1xx
 STM32MP1.build.cmsis_lib_gcc=arm_cortexM4l_math
-STM32MP1.build.extra_flags=-DCORE_CM4 -DUSE_FULL_LL_DRIVER -D{build.product_line} {build.xSerial}
+STM32MP1.build.extra_flags=-DCORE_CM4 -DUSE_FULL_LL_DRIVER -D{build.product_line} {build.enable_virtio} {build.xSerial}
 
 # STM32MP157A-DK1 board
 STM32MP1.menu.pnum.STM32MP157A_DK1=STM32MP157A-DK1
@@ -1576,8 +1590,8 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 # ARMED_V1 board
 3dprinter.menu.pnum.ARMED_V1=Armed V1
-3dprinter.menu.pnum.ARMED_V1.upload.maximum_size=1048576
-3dprinter.menu.pnum.ARMED_V1.upload.maximum_data_size=196608
+3dprinter.menu.pnum.ARMED_V1.upload.maximum_size=524288
+3dprinter.menu.pnum.ARMED_V1.upload.maximum_data_size=131072
 3dprinter.menu.pnum.ARMED_V1.build.mcu=cortex-m4
 3dprinter.menu.pnum.ARMED_V1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
 3dprinter.menu.pnum.ARMED_V1.build.board=ARMED_V1
@@ -1711,6 +1725,20 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.VAKE_F446VE.build.variant=VAKE_F446VE
 3dprinter.menu.pnum.VAKE_F446VE.build.cmsis_lib_gcc=arm_cortexM4lf_math
 
+# FYSETC_S6 board
+3dprinter.menu.pnum.FYSETC_S6=FYSETC_S6
+3dprinter.menu.pnum.FYSETC_S6.upload.maximum_size=458752
+3dprinter.menu.pnum.FYSETC_S6.upload.maximum_data_size=131072
+3dprinter.menu.pnum.FYSETC_S6.build.mcu=cortex-m4
+3dprinter.menu.pnum.FYSETC_S6.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
+3dprinter.menu.pnum.FYSETC_S6.build.board=FYSETC_S6
+3dprinter.menu.pnum.FYSETC_S6.build.series=STM32F4xx
+3dprinter.menu.pnum.FYSETC_S6.build.product_line=STM32F446xx
+3dprinter.menu.pnum.FYSETC_S6.build.variant=FYSETC_S6
+3dprinter.menu.pnum.FYSETC_S6.build.cmsis_lib_gcc=arm_cortexM4lf_math
+3dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x10000
+3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
+
 # Upload menu
 3dprinter.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
 3dprinter.menu.upload_method.swdMethod.upload.protocol=0
@@ -1886,6 +1914,13 @@ Eval.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
 Eval.menu.xserial.disabled=Disabled (no Serial support)
 Eval.menu.xserial.disabled.build.xSerial=
 
+STM32MP1.menu.virtio.disable=Disabled (no SerialVirtIO nor /dev/ttyRPMSG0 available)
+STM32MP1.menu.virtio.disable.build.enable_virtio=
+STM32MP1.menu.virtio.generic=SerialVirtIO (= generic 'Serial') <=> /dev/ttyRPMSG0
+STM32MP1.menu.virtio.generic.build.enable_virtio={build.virtio_flags}
+STM32MP1.menu.virtio.enabled=SerialVirtIO <=> /dev/ttyRPMSG0
+STM32MP1.menu.virtio.enabled.build.enable_virtio={build.virtio_flags} -DDISABLE_GENERIC_SERIALVIRTIO
+
 STM32MP1.menu.xserial.generic=UART only (generic 'Serial')
 STM32MP1.menu.xserial.generic.build.xSerial=-DHAL_UART_MODULE_ENABLED
 STM32MP1.menu.xserial.none=UART only (no generic 'Serial')

cores/arduino/Arduino.h

@@ -40,6 +40,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
+// Weak empty variant initialization function.
+// May be redefined by variant files.
+extern void initVariant() __attribute__((weak));
+
 extern void setup(void) ;
 extern void loop(void) ;
 

cores/arduino/Print.cpp

@@ -28,6 +28,10 @@
 
 #include "Print.h"
 
+#if defined (VIRTIO_LOG)
+#include "virtio_log.h"
+#endif
+
 // Public Methods //////////////////////////////////////////////////////////////
 
 /* default implementation: may be overridden */
@@ -203,10 +207,13 @@ extern "C" {
     switch (file) {
       case STDOUT_FILENO:
       case STDERR_FILENO:
-#if defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
         /* Used for core_debug() */
+#if defined (VIRTIO_LOG)
+        virtio_log((uint8_t *)ptr, (uint32_t)len);
+#elif defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
         uart_debug_write((uint8_t *)ptr, (uint32_t)len);
 #endif
+        break;
       case STDIN_FILENO:
         break;
       default: