Merge pull request #1253 from fpistm/updateG0

Update STM32G0 HAL and CMSIS drivers

Author: fpistm

CI/utils/patch/HAL/G0/0001-G0-Fix-HAL-definition.patch

@@ -5771,6 +5771,14 @@ GenG4.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenG4.menu.xusb.HSFS=High Speed in Full Speed mode
 GenG4.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
+GenG0.menu.usb.none=None
+GenG0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
+GenG0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
+GenG0.menu.usb.CDC=CDC (no generic 'Serial')
+GenG0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
+GenG0.menu.usb.HID=HID (keyboard and mouse)
+GenG0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
+
 GenH7.menu.usb.none=None
 GenH7.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenH7.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC

boards.txt

@@ -30,7 +30,7 @@
 #if defined(HAVE_HWSERIAL1) || defined(HAVE_HWSERIAL2) || defined(HAVE_HWSERIAL3) ||\
   defined(HAVE_HWSERIAL4) || defined(HAVE_HWSERIAL5) || defined(HAVE_HWSERIAL6) ||\
   defined(HAVE_HWSERIAL7) || defined(HAVE_HWSERIAL8) || defined(HAVE_HWSERIAL9) ||\
-  defined(HAVE_HWSERIAL10) || defined(HAVE_HWSERIALLP1)
+  defined(HAVE_HWSERIAL10) || defined(HAVE_HWSERIALLP1) || defined(HAVE_HWSERIALLP2)
   // SerialEvent functions are weak, so when the user doesn't define them,
   // the linker just sets their address to 0 (which is checked below).
   #if defined(HAVE_HWSERIAL1)
@@ -107,6 +107,11 @@
     HardwareSerial SerialLP1(LPUART1);
     void serialEventLP1() __attribute__((weak));
   #endif
+
+  #if defined(HAVE_HWSERIALLP2)
+    HardwareSerial SerialLP2(LPUART2);
+    void serialEventLP2() __attribute__((weak));
+  #endif
 #endif // HAVE_HWSERIALx
 
 // Constructors ////////////////////////////////////////////////////////////////
@@ -252,11 +257,19 @@ HardwareSerial::HardwareSerial(void *peripheral, HalfDuplexMode_t halfDuplex)
                           setTx(PIN_SERIALLP1_TX);
                         } else
 #endif
-                          // else get the pins of the first peripheral occurence in PinMap
-                        {
-                          _serial.pin_rx = pinmap_pin(peripheral, PinMap_UART_RX);
-                          _serial.pin_tx = pinmap_pin(peripheral, PinMap_UART_TX);
-                        }
+#if defined(PIN_SERIALLP2_TX) && defined(LPUART2_BASE)
+                          if (peripheral == LPUART2) {
+#if defined(PIN_SERIALLP2_RX)
+                            setRx(PIN_SERIALLP2_RX);
+#endif
+                            setTx(PIN_SERIALLP2_TX);
+                          } else
+#endif
+                            // else get the pins of the first peripheral occurence in PinMap
+                          {
+                            _serial.pin_rx = pinmap_pin(peripheral, PinMap_UART_RX);
+                            _serial.pin_tx = pinmap_pin(peripheral, PinMap_UART_TX);
+                          }
   if (halfDuplex == HALF_DUPLEX_ENABLED) {
     _serial.pin_rx = NC;
   }

cores/arduino/HardwareSerial.cpp

@@ -207,5 +207,7 @@ class HardwareSerial : public Stream {
 #if defined(LPUART1)
   extern HardwareSerial SerialLP1;
 #endif
-
+#if defined(LPUART2)
+  extern HardwareSerial SerialLP2;
+#endif
 #endif

cores/arduino/HardwareSerial.h

@@ -1489,6 +1489,11 @@ extern "C" {
     if (HardwareTimer_Handle[TIMER3_INDEX]) {
       HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER3_INDEX]->handle);
     }
+#if defined(STM32G0xx) && defined(TIM4_BASE)
+    if (HardwareTimer_Handle[TIMER4_INDEX]) {
+      HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER4_INDEX]->handle);
+    }
+#endif
   }
 #endif //TIM3_BASE
 

cores/arduino/HardwareTimer.cpp

@@ -57,6 +57,11 @@ WEAK void serialEventRun(void)
     serialEventLP1();
   }
 #endif
+#if defined(HAVE_HWSERIALLP2)
+  if (serialEventLP2 && SerialLP2.available()) {
+    serialEventLP2();
+  }
+#endif
 #if defined(HAVE_SERIALUSB)
   if (serialEventUSB && SerialUSB.available()) {
     serialEventUSB();

cores/arduino/WSerial.cpp

@@ -46,6 +46,12 @@
         #define Serial SerialLP1
         #define serialEvent serialEventLP1
       #endif
+    #elif SERIAL_UART_INSTANCE == 102
+      #define ENABLE_HWSERIALLP2
+      #if !defined(Serial)
+        #define Serial SerialLP2
+        #define serialEvent serialEventLP2
+      #endif
     #elif SERIAL_UART_INSTANCE == 1
       #define ENABLE_HWSERIAL1
       #if !defined(Serial)
@@ -118,6 +124,11 @@
       #define HAVE_HWSERIALLP1
     #endif
   #endif
+  #if defined(ENABLE_HWSERIALLP2)
+    #if defined(LPUART2_BASE)
+      #define HAVE_HWSERIALLP2
+    #endif
+  #endif
   #if defined(ENABLE_HWSERIAL1)
     #if defined(USART1_BASE)
       #define HAVE_HWSERIAL1
@@ -202,6 +213,9 @@
   #if defined(HAVE_HWSERIALLP1)
     extern void serialEventLP1(void) __attribute__((weak));
   #endif
+  #if defined(HAVE_HWSERIALLP2)
+    extern void serialEventLP2(void) __attribute__((weak));
+  #endif
 #endif /* HAL_UART_MODULE_ENABLED  && !HAL_UART_MODULE_ONLY */
 
 extern void serialEventRun(void);

cores/arduino/WSerial.h

@@ -8,6 +8,9 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_crs.h"
 #endif
+#ifdef STM32G0xx
+  #include "stm32g0xx_ll_crs.h"
+#endif
 #ifdef STM32G4xx
   #include "stm32g4xx_ll_crs.h"
 #endif

cores/arduino/stm32/LL/stm32yyxx_ll_crs.h

@@ -23,6 +23,9 @@
 #ifdef STM32F7xx
   #include "stm32f7xx_ll_usb.h"
 #endif
+#ifdef STM32G0xx
+  #include "stm32g0xx_ll_usb.h"
+#endif
 #ifdef STM32G4xx
   #include "stm32g4xx_ll_usb.h"
 #endif

cores/arduino/stm32/LL/stm32yyxx_ll_usb.h

@@ -65,6 +65,12 @@
   #define CAN1 CAN
 #endif
 
+/* STM32G0xx defined USB_DRD_FS */
+#if !defined(USB ) && defined(USB_DRD_FS)
+  #define USB USB_DRD_FS
+  #define PinMap_USB PinMap_USB_DRD_FS
+#endif
+
 /**
  * Libc porting layers
  */