Merge branch 'main' of https://github.com/warmonkey/Arduino_Core_STM32

Author: warmonkey

.github/workflows/MarkdwonLinksCheck.yml

@@ -20,4 +20,4 @@ jobs:
         with:
           paths: '*.md ./CI/**/*.md, ./variants/**/*.md, ./libraries/**/*.md'
           verbosity: 'INFO'
-          linksToSkip: 'www.st.com, de.elv.com/lorawan'
+          linksToSkip: 'www.st.com, blues.com'

README.md

@@ -789,7 +789,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart:  | STM32F765VI | [RemRam v1](https://github.com/hasenbanck/remram) | *1.4.0* |  |
 | :green_heart:  | STM32F446VE | [RUMBA32](https://github.com/Aus3D/RUMBA32) | *1.5.0* |  |
 | :green_heart:  | STM32F401VE | [STEVAL-3DP001V1](https://www.st.com/en/evaluation-tools/steval-3dp001v1.html) | *1.6.0* |  |
-| :green_heart:  | STM32F446RE | [VAkE v1.0](https://www.facebook.com/pages/category/Product-Service/VAkE-Board-2290066274575218/) | *1.6.0* |  |
+| :green_heart:  | STM32F446RE | VAkE v1.0 | *1.6.0* |  |
 | :green_heart:  | STM32F446VE | [FYSETC_S6](https://wiki.fysetc.com/FYSETC_S6/) | *1.9.0* | |
 | :green_heart:  | STM32G0B1CB | [BTT EBB42 CAN V1.1](https://github.com/bigtreetech/EBB/tree/master) | *2.4.0* |  |
 
@@ -860,7 +860,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart: | STM32F405RG | [SparkFun MicroMod Processor Board - STM32F405](https://www.sparkfun.com/products/21326) | *2.6.0* |  |
 | :green_heart: | STM32WB5MMG | [SparkFun MicroMod Processor Board - STM32WB5MMG](https://www.sparkfun.com/products/21438) | *2.6.0* |  |
 
-### [ELV Boards](https://de.elv.com/lorawan)
+### [ELV Boards](https://de.elv.com/)
 
 | Status | Device(s) | Name | Release | Notes |
 | :----: | :-------: | ---- | :-----: | :---- |

cores/arduino/Print.cpp

@@ -374,52 +374,52 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)
   char buf[64];
   uint8_t i = 0;
   uint8_t innerLoops = 0;
+  size_t bytes = 0;
 
   // Special case workaround https://github.com/arduino/ArduinoCore-API/issues/178
   if (n64 == 0) {
     write('0');
-    return 1;
-  }
-
-  // prevent crash if called with base == 1
-  if (base < 2) {
-    base = 10;
-  }
-
-  // process chunks that fit in "16 bit math".
-  uint16_t top = 0xFFFF / base;
-  uint16_t th16 = 1;
-  while (th16 < top) {
-    th16 *= base;
-    innerLoops++;
-  }
+    bytes = 1;
+  } else {
+    // prevent crash if called with base == 1
+    if (base < 2) {
+      base = 10;
+    }
 
-  while (n64 > th16) {
-    // 64 bit math part
-    uint64_t q = n64 / th16;
-    uint16_t r = n64 - q * th16;
-    n64 = q;
-
-    // 16 bit math loop to do remainder. (note buffer is filled reverse)
-    for (uint8_t j = 0; j < innerLoops; j++) {
-      uint16_t qq = r / base;
-      buf[i++] = r - qq * base;
-      r = qq;
+    // process chunks that fit in "16 bit math".
+    uint16_t top = 0xFFFF / base;
+    uint16_t th16 = 1;
+    while (th16 < top) {
+      th16 *= base;
+      innerLoops++;
     }
-  }
 
-  uint16_t n16 = n64;
-  while (n16 > 0) {
-    uint16_t qq = n16 / base;
-    buf[i++] = n16 - qq * base;
-    n16 = qq;
-  }
+    while (n64 > th16) {
+      // 64 bit math part
+      uint64_t q = n64 / th16;
+      uint16_t r = n64 - q * th16;
+      n64 = q;
+
+      // 16 bit math loop to do remainder. (note buffer is filled reverse)
+      for (uint8_t j = 0; j < innerLoops; j++) {
+        uint16_t qq = r / base;
+        buf[i++] = r - qq * base;
+        r = qq;
+      }
+    }
 
-  size_t bytes = i;
-  for (; i > 0; i--) {
-    write((char)(buf[i - 1] < 10 ?
-                 '0' + buf[i - 1] :
-                 'A' + buf[i - 1] - 10));
+    uint16_t n16 = n64;
+    while (n16 > 0) {
+      uint16_t qq = n16 / base;
+      buf[i++] = n16 - qq * base;
+      n16 = qq;
+    }
+    bytes = i;
+    for (; i > 0; i--) {
+      write((char)(buf[i - 1] < 10 ?
+                   '0' + buf[i - 1] :
+                   'A' + buf[i - 1] - 10));
+    }
   }
   return bytes;
 }

libraries/SPI/README.md

@@ -1,7 +1,7 @@
 ## SPI
 
 STM32 SPI library has been modified with the possibility to manage hardware CS pin linked to the SPI peripheral.
-_We do not describe here the [SPI Arduino API](https://www.arduino.cc/en/Reference/SPI) but the functionalities added._
+_We do not describe here the [SPI Arduino API](https://docs.arduino.cc/language-reference/en/functions/communication/SPI/) but the functionalities added._
 
 User have 2 possibilities about the management of the CS pin:
 * the CS pin is managed directly by the user code before to transfer the data (like the Arduino SPI library)

libraries/USBDevice/inc/cdc_queue.h

@@ -54,6 +54,7 @@ extern "C" {
 #define CDC_QUEUE_MAX_PACKET_SIZE USB_FS_MAX_PACKET_SIZE
 #endif
 
+#define CDC_TRANSMIT_MAX_BUFFER_SIZE    65472       //STM32 USB OTG DIEPTSIZ PKTCNT maximum 0x3ff
 #define CDC_RECEIVE_MAX_BUFFER_SIZE     CDC_QUEUE_MAX_PACKET_SIZE
 
 #ifndef CDC_TRANSMIT_QUEUE_BUFFER_PACKET_NUMBER
@@ -83,7 +84,7 @@ void CDC_TransmitQueue_Init(CDC_TransmitQueue_TypeDef *queue);
 int CDC_TransmitQueue_WriteSize(CDC_TransmitQueue_TypeDef *queue);
 int CDC_TransmitQueue_ReadSize(CDC_TransmitQueue_TypeDef *queue);
 void CDC_TransmitQueue_Enqueue(CDC_TransmitQueue_TypeDef *queue, const uint8_t *buffer, uint32_t size);
-uint8_t *CDC_TransmitQueue_ReadBlock(CDC_TransmitQueue_TypeDef *queue, uint32_t *size, uint32_t maxsize);
+uint8_t *CDC_TransmitQueue_ReadBlock(CDC_TransmitQueue_TypeDef *queue, uint32_t *size);
 void CDC_TransmitQueue_CommitRead(CDC_TransmitQueue_TypeDef *queue);
 
 void CDC_ReceiveQueue_Init(CDC_ReceiveQueue_TypeDef *queue);

libraries/USBDevice/src/USBSerial.cpp

@@ -124,7 +124,7 @@ size_t USBSerial::readBytes(char *buffer, size_t length)
 
 size_t USBSerial::readBytesUntil(char terminator, char *buffer, size_t length)
 {
-  size_t read;
+  uint32_t read;
   size_t rest = length;
   _startMillis = millis();
   do {

libraries/USBDevice/src/cdc/cdc_queue.c

@@ -77,15 +77,16 @@ void CDC_TransmitQueue_Enqueue(CDC_TransmitQueue_TypeDef *queue,
 
 // Read flat block from queue biggest as possible, but max QUEUE_MAX_PACKET_SIZE
 uint8_t *CDC_TransmitQueue_ReadBlock(CDC_TransmitQueue_TypeDef *queue,
-                                     uint32_t *size,
-                                     uint32_t maxsize)
+                                     uint32_t *size)
 {
   if (queue->write >= queue->read) {
     *size = queue->write - queue->read;
   } else {
     *size = CDC_TRANSMIT_QUEUE_BUFFER_SIZE - queue->read;
   }
-  if(*size > maxsize) *size = maxsize;
+  if (*size > CDC_TRANSMIT_MAX_BUFFER_SIZE) {
+    *size = CDC_TRANSMIT_MAX_BUFFER_SIZE;
+  }
 
   queue->reserved = *size;
   return &queue->buffer[queue->read];