Merge branch 'master' into capture_acheived_baud

Author: earlephilhower

cores/rp2040/RP2040Version.h

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 5
 #define ARDUINO_PICO_MINOR 4
-#define ARDUINO_PICO_REVISION 1
-#define ARDUINO_PICO_VERSION_STR "5.4.1"
+#define ARDUINO_PICO_REVISION 2
+#define ARDUINO_PICO_VERSION_STR "5.4.2"

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'5.4.1'
+version = u'5.4.2'
 # The full version, including alpha/beta/rc tags.
-release = u'5.4.1'
+release = u'5.4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

libraries/BluetoothHCI/src/BluetoothHCI.h

@@ -49,6 +49,10 @@ class BluetoothHCI {
 
     void scanFree(); // Free allocated scan buffers
 
+    bool connected() {
+        return _hciConn != HCI_CON_HANDLE_INVALID;
+    }
+
     friend class BluetoothHIDMaster;
 
 protected:

libraries/BluetoothHIDMaster/src/BluetoothHIDMaster.cpp

@@ -225,7 +225,22 @@ bool BluetoothHIDMaster::connectBLE(const uint8_t *addr, int addrType) {
     }
     uint8_t a[6];
     memcpy(a, addr, sizeof(a));
-    return ERROR_CODE_SUCCESS == gap_connect(a, (bd_addr_type_t)addrType);
+    if (ERROR_CODE_SUCCESS != gap_connect(a, (bd_addr_type_t)addrType)) {
+        return false;
+    }
+    // GAP connection running async.  Wait for HCI connect
+    uint32_t now = millis();
+    while (millis() - now < 5000) {
+        if (_hci.connected()) {
+            break;
+        }
+        delay(25);
+    }
+    if (!_hci.connected()) {
+        gap_connect_cancel();
+        return false;
+    }
+    return _hci.connected();
 }
 
 bool BluetoothHIDMaster::connectBLE() {

libraries/lwIP_Ethernet/src/LwipIntfDev.h

@@ -349,8 +349,6 @@ bool LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu) {
     lwip_init();
     __startEthernetContext();
 
-    memset(&_netif, 0, sizeof(_netif));
-
     if (RawDev::needsSPI()) {
         _spiUnit.begin();
         // Set SPI clocks/etc. per request, doesn't seem to be direct way other than a fake transaction

package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.50401.0",
+  "version": "1.50402.0",
   "description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",
   "keywords": [
     "framework",

platform.txt

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Raspberry Pi RP2040/RP2350 Boards
-version=5.4.1
+version=5.4.2
 
 # Required discoveries and monitors
 # ---------------------------------