Unified some Generic variant definition and update CI configuration

CI/build/arduino-cli.py

@@ -492,10 +492,11 @@ 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")
+        # error or fatal error
+        error_pattern = re.compile(r":\d+:\d+:\s.*error:\s")
         ld_pattern = re.compile("arm-none-eabi/bin/ld:")
         overflow_pattern = re.compile(
-            "will not fit in region|region .+ overflowed by [\\d]+ bytes"
+            r"will not fit in region|region .+ overflowed by [\d]+ bytes"
         )
         error_found = False
         for i, line in enumerate(open(logFile)):

CI/build/conf/cores_config.json

@@ -23,9 +23,56 @@
       ],
       "sketches": [
         {
+          "comment": "By default, ignore all those boards",
+          "pattern": "^.*$",
+          "applicable": false,
+          "boards": [
+            "AFROFLIGHT_F103CB_12M",
+            "BLACKPILL_F103CB",
+            "BLACK_F407VG",
+            "BLACK_F407ZE",
+            "BLACK_F407ZG",
+            "BLUEPILL_F103C6",
+            "BLUEPILL_F103CB",
+            "DEMO_F030F4_16M",
+            "DEMO_F030F4_HSI",
+            "Generic_F103R8T6",
+            "Generic_F103RBT6",
+            "Generic_F103RCT6",
+            "Generic_F103ZC",
+            "Generic_F103ZD",
+            "Generic_F103ZE",
+            "Generic_F103ZF",
+            "Generic_F401CB",
+            "Generic_F401CC",
+            "Generic_F401CD",
+            "Generic_F401RB",
+            "Generic_F401RC",
+            "Generic_F401RD",
+            "Generic_F405RG",
+            "Generic_F407VE",
+            "Generic_F410C8",
+            "Generic_F410R8",
+            "Generic_F411CC",
+            "Generic_F411RE",
+            "Generic_F412CE",
+            "Generic_F412RE",
+            "Generic_F413CG",
+            "Generic_F413RG",
+            "Generic_F417VE",
+            "Generic_F423CH",
+            "Generic_F446RC",
+            "NUCLEO_H743ZI",
+            "NUCLEO_L496ZG",
+            "NUCLEO_L4R5ZI",
+            "RAK811_TRACKERA"
+          ]
+        },
+        {
+          "comment": "Ignore also those boards except for BareMinimum",
           "pattern": "^((?!BareMinimum).)*$",
           "applicable": false,
-          "boards": [ "DEMO_F030F4", "DEMO_F030F4_16M", "DEMO_F030F4_HSI", "RHF76_052" ]
+          "boards": [ "DEMO_F030F4", "RHF76_052" ]
         },
         {
           "pattern": "DISCO_IOT_|M24SR64-Y|MX25R6435F",
@@ -52,13 +99,9 @@
           "applicable": false,
           "boards": [
             "AFROFLIGHT_F103CB",
-            "AFROFLIGHT_F103CB_12M",
             "ARMED_V1",
             "BLUE_F407VE_Mini",
             "BLACKPILL_F103C8",
-            "BLACKPILL_F103CB",
-            "BLUEPILL_F103C6",
-            "BLUEPILL_F103C8",
             "BLUEPILL_F103CB",
             "BLACKPILL_F303CC",
             "BLACKPILL_F401CC",
@@ -67,9 +110,6 @@
             "EEXTR_F030_V1",
             "ELEKTOR_F072C8",
             "FEATHER_F405",
-            "Generic_F103R8T6",
-            "Generic_F103RBT6",
-            "Generic_F103RCT6",
             "Generic_F103RET6",
             "HY_TinySTM103TB",
             "MALYANM200_F070CB",
@@ -85,7 +125,6 @@
             "PRNTR_V2",
             "RUMBA32",
             "RAK811_TRACKER",
-            "RAK811_TRACKERA",
             "REMRAM_V1",
             "Sparky_V1",
             "Wraith32_V1"
@@ -105,14 +144,14 @@
           "pattern": "Firmata/",
           "applicable": false,
           "boards": [
-            "BLUEPILL_F103C6", "EEXTR_F030_V1", "ELEKTOR_F072C8", "MALYANM200_F103CB",
-            "PX_HER0", "STEVAL_MKSBOX1V1", "VAKE_F446VE", "Wraith32_V1"
+            "EEXTR_F030_V1", "ELEKTOR_F072C8", "FYSETC_S6", "MALYANM200_F103CB",
+            "PRNTR_V2", "PX_HER0", "STEVAL_MKSBOX1V1", "VAKE_F446VE", "Wraith32_V1"
           ]
         },
         {
           "pattern": "Blink(WithoutDelay)?",
           "applicable": false,
-          "boards": [ "EEXTR_F030_V1", "MALYANM200_F103CB", "PRNTR_V2" ]
+          "boards": [ "EEXTR_F030_V1", "FYSETC_S6", "MALYANM200_F103CB", "PRNTR_V2" ]
         },
         {
           "pattern": "STM32SD",
@@ -123,7 +162,7 @@
           "pattern": "Ethernet/|STM32FreeRTOS",
           "applicable": false,
           "boards": [
-            "BLUEPILL_F103C6", "EEXTR_F030_V1", "MALYANM200_F103CB", "NUCLEO_F030R8",
+            "EEXTR_F030_V1", "FYSETC_S6", "MALYANM200_F103CB", "NUCLEO_F030R8",
             "NUCLEO_L031K6", "PRNTR_V2" ]
         },
         {
@@ -152,22 +191,15 @@
           "applicable": false,
           "boards": [
             "AFROFLIGHT_F103CB",
-            "AFROFLIGHT_F103CB_12M",
             "ARMED_V1",
             "BLACKPILL_F103C8",
-            "BLACKPILL_F103CB",
-            "BLUEPILL_F103C6",
             "BLUEPILL_F103C8",
-            "BLUEPILL_F103CB",
             "BLACKPILL_F303CC",
             "BLACKPILL_F401CC",
             "BLUE_F407VE_Mini",
             "CoreBoard_F401RC",
             "DIYMORE_F407VGT",
             "EEXTR_F030_V1",
-            "Generic_F103R8T6",
-            "Generic_F103RBT6",
-            "Generic_F103RCT6",
             "Generic_F103RET6",
             "HY_TinySTM103TB",
             "MALYANM200_F070CB",
@@ -198,16 +230,15 @@
           "applicable": false,
           "boards": [
             "ARMED_V1",
-            "BLUEPILL_F103C6", 
             "EEXTR_F030_V1",
             "ELEKTOR_F072C8",
             "FEATHER_F405",
+            "FYSETC_S6",
             "MALYANM200_F103CB",
             "NUCLEO_L031K6",
             "PRNTR_V2",
             "PX_HER0",
             "RAK811_TRACKER",
-            "RAK811_TRACKERA",
             "REMRAM_V1",
             "STEVAL_MKSBOX1V1",
             "THUNDERPACK_F411",
@@ -223,7 +254,6 @@
             "EEXTR_F030_V1",
             "PX_HER0",
             "RAK811_TRACKER",
-            "RAK811_TRACKERA",
             "REMRAM_V1",
             "STEVAL_MKSBOX1V1",
             "THUNDERPACK_F411",
@@ -237,19 +267,18 @@
             "ARMED_V1",
             "EEXTR_F030_V1",
             "RAK811_TRACKER",
-            "RAK811_TRACKERA",
             "STEVAL_MKSBOX1V1"
           ]
         },
         {
           "pattern": "SerialLoop|Tests_basic_functions",
           "applicable": false,
-          "boards": [ "BLUEPILL_F103C6", "NUCLEO_L031K6", "Wraith32_V1" ]
+          "boards": [ "NUCLEO_L031K6", "Wraith32_V1" ]
         },
         {
           "pattern": "(Alarm)?TimedWak(e)?up|SerialDeepSleep",
           "applicable": false,
-          "boards": [ "EEXTR_F030_V1", "MALYANM200_F103CB", "PRNTR_V2", "STEVAL_MKSBOX1V1" ]
+          "boards": [ "EEXTR_F030_V1", "FYSETC_S6", "MALYANM200_F103CB", "PRNTR_V2", "STEVAL_MKSBOX1V1" ]
         },
         {
           "pattern": "ArduinoISP",
@@ -278,8 +307,7 @@
           "pattern": "PWM_FullConfiguration",
           "applicable": false,
           "boards": [
-            "GENERIC_F401RB", "GENERIC_F401RC", "GENERIC_F401RD", "GENERIC_F401RE",
-            "HY_TinySTM103TB", "THUNDERPACK_F411", "THUNDERPACK_L072"
+            "GENERIC_F401RE", "HY_TinySTM103TB", "THUNDERPACK_F411", "THUNDERPACK_L072"
           ]
         },
         {

CI/build/conf/cores_config_ci.json

@@ -34,6 +34,7 @@
             "BLUEPILL_F103C6",
             "BLUEPILL_F103CB",
             "DEMO_F030F4_16M",
+            "DEMO_F030F4_HSI",
             "Generic_F103R8T6",
             "Generic_F103RBT6",
             "Generic_F103RCT6",
@@ -47,6 +48,7 @@
             "Generic_F401RB",
             "Generic_F401RC",
             "Generic_F401RD",
+            "Generic_F405RG",
             "Generic_F407VE",
             "Generic_F410C8",
             "Generic_F410R8",

README.md

@@ -116,7 +116,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :---: | --- | :---: | :--- |
 | :green_heart: | [BluePill F103C(6-8-B)](https://stm32-base.org/boards/STM32F103C8T6-Blue-Pill) | *1.2.0* | USB CDC support since *1.5.0*, Maple bootloaders support since *1.6.0* |
 | :green_heart: | [BlackPill F103C(8-B)](https://stm32-base.org/boards/STM32F103C8T6-Black-Pill) | *1.5.0* |  |
-| :green_heart: | [Generic F103R(8-B-C-E)T6](https://stm32-base.org/boards/STM32F103RET6-Generic-Board) | *1.7.0* | Blue Button |
+| :green_heart: | [Generic F103R(8-B-C-E)T6](https://stm32-base.org/boards/STM32F103RET6-Generic-Board) | *1.7.0* |  |
 | :yellow_heart: | Generic F103Z(C-D-E-F-G) | **1.9.0** |  |
 | :green_heart: | HY-TinySTM103T | *1.5.0* |  |
 | :green_heart: | MapleMini F103CB | *1.2.0* | USB CDC support since *1.5.0*, Maple bootloaders support since *1.6.0* |

boards.txt

@@ -873,29 +873,29 @@ GenF1.menu.pnum.BLACKPILL_F103CB.build.board=BLACKPILL_F103CB
 GenF1.menu.pnum.BLACKPILL_F103CB.build.product_line=STM32F103xB
 GenF1.menu.pnum.BLACKPILL_F103CB.build.variant=PILL_F103XX
 
-# Generic STM32F103Rx boards (Blue button)
-GenF1.menu.pnum.Generic_F103R8T6=Generic F103R8T6 (Blue Button)
+# Generic STM32F103Rx boards
+GenF1.menu.pnum.Generic_F103R8T6=Generic F103R8T6
 GenF1.menu.pnum.Generic_F103R8T6.upload.maximum_size=65536
 GenF1.menu.pnum.Generic_F103R8T6.upload.maximum_data_size=20480
 GenF1.menu.pnum.Generic_F103R8T6.build.board=GENERIC_F103R8T6
 GenF1.menu.pnum.Generic_F103R8T6.build.product_line=STM32F103xB
 GenF1.menu.pnum.Generic_F103R8T6.build.variant=Generic_F103Rx
 
-GenF1.menu.pnum.Generic_F103RBT6=Generic F103RBT6 (Blue Button)
+GenF1.menu.pnum.Generic_F103RBT6=Generic F103RBT6
 GenF1.menu.pnum.Generic_F103RBT6.upload.maximum_size=131072
 GenF1.menu.pnum.Generic_F103RBT6.upload.maximum_data_size=20480
 GenF1.menu.pnum.Generic_F103RBT6.build.board=GENERIC_F103RBT6
 GenF1.menu.pnum.Generic_F103RBT6.build.product_line=STM32F103xB
 GenF1.menu.pnum.Generic_F103RBT6.build.variant=Generic_F103Rx
 
-GenF1.menu.pnum.Generic_F103RCT6=Generic F103RCT6 (Blue Button)
+GenF1.menu.pnum.Generic_F103RCT6=Generic F103RCT6
 GenF1.menu.pnum.Generic_F103RCT6.upload.maximum_size=262144
 GenF1.menu.pnum.Generic_F103RCT6.upload.maximum_data_size=49152
 GenF1.menu.pnum.Generic_F103RCT6.build.board=GENERIC_F103RCT6
 GenF1.menu.pnum.Generic_F103RCT6.build.product_line=STM32F103xE
 GenF1.menu.pnum.Generic_F103RCT6.build.variant=Generic_F103Rx
 
-GenF1.menu.pnum.Generic_F103RET6=Generic F103RET6 (Blue Button)
+GenF1.menu.pnum.Generic_F103RET6=Generic F103RET6
 GenF1.menu.pnum.Generic_F103RET6.upload.maximum_size=524288
 GenF1.menu.pnum.Generic_F103RET6.upload.maximum_data_size=65536
 GenF1.menu.pnum.Generic_F103RET6.build.board=GENERIC_F103RET6

variants/BLACK_F407XX/variant.h

@@ -290,15 +290,9 @@ extern "C" {
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
-#define SERIAL_UART_INSTANCE    1 //ex: 2 for Serial2 (USART2)
-// DEBUG_UART could be redefined to print on another instance than 'Serial'
-//#define DEBUG_UART              ((USART_TypeDef *) U(S)ARTX) // ex: USART3
-// DEBUG_UART baudrate, default: 9600 if not defined
-//#define DEBUG_UART_BAUDRATE     x
-// DEBUG_UART Tx pin name, default: the first one found in PinMap_UART_TX for DEBUG_UART
-//#define DEBUG_PINNAME_TX        PX_n // PinName used for TX
+#define SERIAL_UART_INSTANCE    1
 
-// Default pin used for 'Serial' instance (ex: ST-Link)
+// Default pin used for 'Serial' instance
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9

variants/Generic_F103Rx/variant.cpp

@@ -23,6 +23,14 @@ extern "C" {
 #endif
 
 const PinName digitalPin[] = {
+  PA_0,
+  PA_1,
+  PA_2,
+  PA_3,
+  PA_4,
+  PA_5,
+  PA_6,
+  PA_7,
   PA_8,
   PA_9,  // RXD
   PA_10, // TXD
@@ -31,6 +39,8 @@ const PinName digitalPin[] = {
   PA_13, // JTDI
   PA_14, // JTCK
   PA_15,
+  PB_0,
+  PB_1,
   PB_2,
   PB_3,  // JTDO
   PB_4,  // JTRST
@@ -45,6 +55,12 @@ const PinName digitalPin[] = {
   PB_13,
   PB_14,
   PB_15,
+  PC_0,
+  PC_1,
+  PC_2,
+  PC_3,
+  PC_4,
+  PC_5,
   PC_6,
   PC_7,
   PC_8,
@@ -53,28 +69,31 @@ const PinName digitalPin[] = {
   PC_11,
   PC_12,
   PC_13,
-  NC,     // PC_14 OSC32_1
-  NC,     // PC_15 OSC32_2
-  NC,     // PD_0 OSCIN
-  NC,     // PD_1 OSCOUT
-  PD_2,
+  PC_14,  // OSC32_1
+  PC_15,  // OSC32_2
+  PD_0,   // OSCIN
+  PD_1,   // OSCOUT
+  PD_2
+};
 
-  PA_0,
-  PA_1,
-  PA_2,
-  PA_3,
-  PA_4,
-  PA_5,
-  PA_6,
-  PA_7,
-  PB_0,
-  PB_1,
-  PC_0,
-  PC_1,
-  PC_2,
-  PC_3,
-  PC_4,
-  PC_5
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  32, // A10, PC0
+  33, // A11, PC1
+  34, // A12, PC2
+  35, // A13, PC3
+  36, // A14, PC4
+  37  // A15, PC5
 };
 
 #ifdef __cplusplus