Fix connection timeout and packetbuffer error

Author: tannewt

ports/espressif/common-hal/_bleio/Adapter.c

@@ -408,7 +408,8 @@ mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_addre
             _connect_event, self));
 
     int error_code;
-    CHECK_NOTIFY(xTaskNotifyWait(0, 0, (uint32_t *)&error_code, 200));
+    // Wait an extra 50 ms to give the connect method the opportunity to time out.
+    CHECK_NOTIFY(xTaskNotifyWait(0, 0, (uint32_t *)&error_code, pdMS_TO_TICKS(timeout * 1000 + 50)));
     // Negative values are error codes, connection handle otherwise.
     if (error_code < 0) {
         CHECK_BLE_ERROR(-error_code);

ports/espressif/common-hal/_bleio/PacketBuffer.c

@@ -92,6 +92,8 @@ static int queue_next_write(bleio_packet_buffer_obj_t *self) {
             // Allocate an mbuf because the functions below consume it.
             struct os_mbuf *om = ble_hs_mbuf_from_flat(self->outgoing[self->pending_index], self->pending_size);
             if (om == NULL) {
+                // We may not have any more mbufs if BLE busy. It isn't a problem (yet) so we'll
+                // just skip queueing for now.
                 return BLE_HS_ENOMEM;
             }
             size_t pending_size = self->pending_size;
@@ -331,7 +333,8 @@ mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, c
 
     // If no writes are queued then sneak in this data.
     if (!self->packet_queued) {
-        CHECK_NIMBLE_ERROR(queue_next_write(self));
+        // This will queue up the packet even if it can't send immediately.
+        queue_next_write(self);
     }
     return num_bytes_written;
 }

ports/espressif/common-hal/_bleio/__init__.c

@@ -99,7 +99,7 @@ void check_nimble_error(int rc, const char *file, size_t line) {
             mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));
             return;
         default:
-            #if CIRCUITPY_VERBOSE_BLE
+            #if CIRCUITPY_VERBOSE_BLE || CIRCUITPY_DEBUG
             if (file) {
                 mp_raise_bleio_BluetoothError(MP_ERROR_TEXT("Unknown system firmware error at %s:%d: %d"), file, line, rc);
             }
@@ -126,7 +126,7 @@ void check_ble_error(int error_code, const char *file, size_t line) {
             mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Insufficient encryption"));
             return;
         default:
-            #if CIRCUITPY_VERBOSE_BLE
+            #if CIRCUITPY_VERBOSE_BLE || CIRCUITPY_DEBUG
             if (file) {
                 mp_raise_bleio_BluetoothError(MP_ERROR_TEXT("Unknown BLE error at %s:%d: %d"), file, line, error_code);
             }