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

Author: ghent360

README.md

@@ -163,7 +163,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 
 | Status | [Midatronics](https://midatronics.com/) | Release | Comment |
 | :---: | --- | :---: | :--- |
-| :green_heart: | [SharkyMKR](https://midatronics.com/Development_Boards/MKR_Sharky_I) | *1.7.0* |  |
+| :green_heart: | [SharkyMKR](https://midatronics.com/shop/development-boards/mkr-sharky-i/) | *1.7.0* |  |
 
 ## Next release
 

cores/arduino/HardwareSerial.cpp

@@ -116,7 +116,7 @@ HardwareSerial::HardwareSerial(PinName _rx, PinName _tx)
   init(_rx, _tx);
 }
 
-HardwareSerial::HardwareSerial(void *peripheral, bool halfDuplex)
+HardwareSerial::HardwareSerial(void *peripheral, HalfDuplexMode_t halfDuplex)
 {
   // If PIN_SERIALy_RX is not defined assume half-duplex
   _serial.pin_rx = NC;
@@ -247,7 +247,7 @@ HardwareSerial::HardwareSerial(void *peripheral, bool halfDuplex)
                           _serial.pin_rx = pinmap_pin(peripheral, PinMap_UART_RX);
                           _serial.pin_tx = pinmap_pin(peripheral, PinMap_UART_TX);
                         }
-  if (halfDuplex) {
+  if (halfDuplex == HALF_DUPLEX_ENABLED) {
     _serial.pin_rx = NC;
   }
   init(_serial.pin_rx, _serial.pin_tx);

cores/arduino/HardwareSerial.h

@@ -57,6 +57,15 @@ typedef uint16_t rx_buffer_index_t;
 typedef uint8_t rx_buffer_index_t;
 #endif
 
+// A bool should be enough for this
+// But it brings an build error due to ambiguous
+// call of overloaded HardwareSerial(int, int)
+// So defining a dedicated type
+typedef enum {
+  HALF_DUPLEX_DISABLED,
+  HALF_DUPLEX_ENABLED
+} HalfDuplexMode_t;
+
 // Define config for Serial.begin(baud, config);
 // below configs are not supported by STM32
 //#define SERIAL_5N1 0x00
@@ -103,7 +112,7 @@ class HardwareSerial : public Stream {
   public:
     HardwareSerial(uint32_t _rx, uint32_t _tx);
     HardwareSerial(PinName _rx, PinName _tx);
-    HardwareSerial(void *peripheral, bool halfDuplex = false);
+    HardwareSerial(void *peripheral, HalfDuplexMode_t halfDuplex = HALF_DUPLEX_DISABLED);
     HardwareSerial(uint32_t _rxtx);
     HardwareSerial(PinName _rxtx);
     void begin(unsigned long baud)

cores/arduino/stm32/timer.h

@@ -51,8 +51,13 @@ extern "C" {
 #define TIM1_IRQn TIM1_UP_TIM16_IRQn
 #define TIM1_IRQHandler TIM1_UP_TIM16_IRQHandler
 #elif defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F7xx)
+#if !defined (TIM10_BASE)
+#define TIM1_IRQn TIM1_UP_IRQn
+#define TIM1_IRQHandler TIM1_UP_IRQHandler
+#else
 #define TIM1_IRQn TIM1_UP_TIM10_IRQn
 #define TIM1_IRQHandler TIM1_UP_TIM10_IRQHandler
+#endif
 #elif defined(STM32H7xx) || defined(STM32MP1xx)
 #define TIM1_IRQn TIM1_UP_IRQn
 #define TIM1_IRQHandler TIM1_UP_IRQHandler

cores/arduino/stm32/usb/cdc/usbd_cdc.c

@@ -190,7 +190,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x01,   /* bNumEndpoints: One endpoints used */
   0x02,   /* bInterfaceClass: Communication Interface Class */
   0x02,   /* bInterfaceSubClass: Abstract Control Model */
-  0x01,   /* bInterfaceProtocol: Common AT commands */
+  0x00,   /* bInterfaceProtocol: No specific protocol */
   0x00,   /* iInterface: */
 
   /*Header Functional Descriptor*/
@@ -285,7 +285,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x01,   /* bNumEndpoints: One endpoints used */
   0x02,   /* bInterfaceClass: Communication Interface Class */
   0x02,   /* bInterfaceSubClass: Abstract Control Model */
-  0x01,   /* bInterfaceProtocol: Common AT commands */
+  0x00,   /* bInterfaceProtocol: No specific protocol */
   0x00,   /* iInterface: */
 
   /*Header Functional Descriptor*/
@@ -375,7 +375,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   0x01,   /* bNumEndpoints: One endpoints used */
   0x02,   /* bInterfaceClass: Communication Interface Class */
   0x02,   /* bInterfaceSubClass: Abstract Control Model */
-  0x01,   /* bInterfaceProtocol: Common AT commands */
+  0x00,   /* bInterfaceProtocol: No specific protocol */
   0x00,   /* iInterface: */
 
   /*Header Functional Descriptor*/

keywords.txt

@@ -270,6 +270,8 @@ PIN_WIRE_SCL	LITERAL1
 HardwareSerial	KEYWORD2
 setRx	KEYWORD2
 setTx	KEYWORD2
+HALF_DUPLEX_DISABLED	LITERAL1
+HALF_DUPLEX_ENABLED	LITERAL1
 setHalfDuplex	KEYWORD2
 isHalfDuplex	KEYWORD2
 enableHalfDuplexRx	KEYWORD2

libraries/Servo/src/Servo.h

@@ -90,8 +90,8 @@
 #if !defined(ARDUINO_ARCH_STM32F4)
 
 typedef struct  {
-  uint8_t nbr        : 6 ;            // a pin number from 0 to 63
-  uint8_t isActive   : 1 ;            // true if this channel is enabled, pin not pulsed if false
+  uint8_t nbr;            // a pin number from 0 to 255
+  uint8_t isActive;       // true if this channel is enabled, pin not pulsed if false
 } ServoPin_t   ;
 
 typedef struct {