Merge branch 'adafruit:main' into fix-samd-pwm

timchinowsky · web-flow · commit 9bfcba36875c · 2024-06-20T09:05:20.000-07:00
diff --git a/locale/de_DE.po b/locale/de_DE.po
@@ -6,14 +6,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2024-03-11 09:56+0000\n"
-"Last-Translator: Sokromatrix <kroschewski1971@gmail.com>\n"
+"PO-Revision-Date: 2024-06-18 19:09+0000\n"
+"Last-Translator: Xfox20 <136956349+Xfox20@users.noreply.github.com>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: main.c
 msgid ""
@@ -2365,7 +2365,7 @@ msgstr "Der BOOT-Knopf wurde beim Starten gedrückt"
 #: ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/mpconfigboard.h
 #: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
 msgid "You pressed the BOOT button at start up."
-msgstr ""
+msgstr "Der BOOT-Knopf wurde beim Starten gedrückt."
 
 #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
 msgid "You pressed the GPIO0 button at start up."
@@ -4350,7 +4350,7 @@ msgstr ""
 
 #: shared-bindings/bitmapfilter/__init__.c
 msgid "weights must be an object of type %q, %q, %q, or %q, not %q "
-msgstr ""
+msgstr "Gewichte müssen ein Objekt des Typs %q, %q, %q, or %q, not %q sein "
 
 #: shared-bindings/is31fl3741/FrameBuffer.c
 msgid "width must be greater than zero"
diff --git a/locale/en_GB.po b/locale/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-04-18 21:03+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"PO-Revision-Date: 2024-06-18 19:09+0000\n"
+"Last-Translator: johnnohj <j.edward.fletcher@gmail.com>\n"
 "Language-Team: none\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: main.c
 msgid ""
@@ -1309,7 +1309,7 @@ msgstr "MAC address was invalid"
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 msgid "MITM security not supported"
-msgstr ""
+msgstr "MITM security is not supported"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
 msgid "Mapping must be a tuple"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
@@ -6,15 +6,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2024-04-07 02:02+0000\n"
+"PO-Revision-Date: 2024-06-18 19:09+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: main.c
 msgid ""
@@ -1325,7 +1325,7 @@ msgstr "O endereço MAC era inválido"
 
 #: ports/espressif/common-hal/_bleio/Characteristic.c
 msgid "MITM security not supported"
-msgstr ""
+msgstr "Não há suporte para segurança MITM"
 
 #: shared-bindings/is31fl3741/IS31FL3741.c
 msgid "Mapping must be a tuple"
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
@@ -101,10 +101,10 @@ void board_init(void) {
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
-    if (pin_number == 21) {
+    if (pin_number == 7) {
         // Turn on TFT and I2C
-        gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(21, true);
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, true);
         return true;
     }
     return false;
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/board.c
@@ -101,10 +101,10 @@ void board_init(void) {
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
-    if (pin_number == 21) {
+    if (pin_number == 7) {
         // Turn on TFT and I2C
-        gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(21, true);
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, true);
         return true;
     }
     return false;
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/board.c
@@ -103,8 +103,8 @@ bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     // Override the I2C/TFT power pin reset to prevent resetting the display.
     if (pin_number == 21) {
         // Turn on TFT and I2C
-        gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
-        gpio_set_level(21, true);
+        gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
+        gpio_set_level(pin_number, true);
         return true;
     }
     return false;
diff --git a/ports/nordic/boards/arduino_nano_33_ble/README.md b/ports/nordic/boards/arduino_nano_33_ble/README.md
@@ -1,11 +1,11 @@
 # Arduino Nano 33 BLE and Nano 33 BLE Sense
 
-The [Arduino Nano 33 BLE](https://store.arduino.cc/usa/nano-33-ble-with-headers) and
-[Arduino Nano 33 BLE Sense](https://store.arduino.cc/usa/nano-33-ble-sense) and
-are built around the NINA B306 module, based on Nordic nRF 52840 and containing
-a powerful Cortex M4F. Both include an onboard 9 axis Inertial Measurement Unit (IMU), the LSM9DS1.
-The Nano 33 BLE Sense adds an LPS22HB barometric pressure and temperature sensor,
-an ADPS-9960 digital proximity, ambient light, RGB, and gensture sensor,
+The [Arduino Nano 33 BLE](https://store.arduino.cc/usa/nano-33-ble) and
+[Arduino Nano 33 BLE Sense](https://store.arduino.cc/usa/nano-33-ble-sense)
+are built around the NINA-B306 module, based on the Nordic nRF52840 and containing
+a powerful Cortex-M4F. Both include an onboard 9-axis Inertial Measurement Unit (IMU), the LSM9DS1.
+The Nano 33 BLE Sense adds an LPS22HB barometric pressure and temperature sensor, an HTS221 humidity sensor,
+an APDS-9960 digital proximity, ambient light, RGB, and gesture sensor,
 and an MP34DT05 digital microphone.
 
 Note: the Arduino Nano 33 BLE and BLE Sense do not include a QSPI external
@@ -15,11 +15,11 @@ filesystem.
 I2C pins `board.SCL1` and `board.SDA1` are not exposed and are used for onboard peripherals.
 Pin `board.R_PULLUP` must be set to high to enable the `SCL1` and `SDA1` pullups for proper operation.
 
-Pin `board.VDD_ENV` applies power to the LSM9DS1, and must be high for it to be operational.
+Pin `board.VDD_ENV` applies power to the LSM9DS1, the LPS22HB, and the HTS221, and must be high for them to be operational.
 
 Pins `board.MIC_PWR`, `board.PDMDIN`, and `board.PDMCLK` are for the Nano 33 BLE Sense onboard microphone.
 
-Pin `board.INT_ADPS` is the interrupt pin from the ADPS-9960.
+Pin `board.INT_APDS` is the interrupt pin from the APDS-9960.
 
 Pins `board.RGB_LED_R`, `board.RGB_LED_G`, and `board.RGB_LED_B`
 are the red, green and blue LEDS in the onboard RGB LED.
diff --git a/ports/nordic/boards/arduino_nano_33_ble/pins.c b/ports/nordic/boards/arduino_nano_33_ble/pins.c
@@ -48,7 +48,7 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_RGB_LED_G), MP_ROM_PTR(&pin_P0_16)  },
     { MP_ROM_QSTR(MP_QSTR_RGB_LED_B), MP_ROM_PTR(&pin_P0_06)  },
 
-    // Power line to LSM9DS1.
+    // Power line to LSM9DS1, LPS22 and HTS221.
     { MP_ROM_QSTR(MP_QSTR_VDD_ENV), MP_ROM_PTR(&pin_P0_22)  },
 
     // Pullup voltage for SDA1 and SCL1
diff --git a/ports/nordic/boards/arduino_nano_33_ble_rev2/README.md b/ports/nordic/boards/arduino_nano_33_ble_rev2/README.md
@@ -0,0 +1,31 @@
+# Arduino Nano 33 BLE Rev2 and Nano 33 BLE Sense Rev2
+
+The [Arduino Nano 33 BLE Rev2](https://store.arduino.cc/usa/nano-33-ble-rev2) and
+[Arduino Nano 33 BLE Sense Rev2](https://store.arduino.cc/usa/nano-33-ble-sense-rev2)
+are built around the NINA-B306 module, based on the Nordic nRF52840 and containing
+a powerful Cortex-M4F. Both include an onboard 9-axis Inertial Measurement Unit (IMU), made up of the BMI270 6-axis IMU and the BMM150 3-axis magnetometer.
+The Nano 33 BLE Sense Rev2 adds an LPS22HB barometric pressure and temperature sensor, an HS3003 humidity sensor,
+an APDS-9960 digital proximity, ambient light, RGB, and gesture sensor,
+and an MP34DT06JTR digital microphone.
+
+Note: the Arduino Nano 33 BLE Rev2 and BLE Sense Rev2 do not include a QSPI external
+flash. Any Python code will need to be stored on the internal flash
+filesystem.
+
+I2C pins `board.SCL1` and `board.SDA1` are not exposed and are used for onboard peripherals.
+Pin `board.R_PULLUP` must be set to high to enable the `SCL1` and `SDA1` pullups for proper operation.
+
+Pin `board.VDD_ENV` applies power to the BMI270, the BMM150, the LPS22HB and the HS3003, and must be high for them to be operational.
+
+Pins `board.MIC_PWR`, `board.PDMDIN`, and `board.PDMCLK` are for the Nano 33 BLE Sense onboard microphone.
+
+Pin `board.INT_APDS` is the interrupt pin from the APDS-9960.
+
+Pins `board.INT_BMI_1` and `board.INT_BMI_2` are the two interrupt pins from the BMI270.
+
+Pin `board.INT_LPS` is the interrupt pin from the LPS22.
+
+Pins `board.RGB_LED_R`, `board.RGB_LED_G`, and `board.RGB_LED_B`
+are the red, green and blue LEDS in the onboard RGB LED.
+
+Pins `board.LED_G` and `board.LED_Y` are onboard green and red LEDs. `board.LED_Y` is also `board.SCK`.
diff --git a/ports/nordic/boards/arduino_nano_33_ble_rev2/board.c b/ports/nordic/boards/arduino_nano_33_ble_rev2/board.c
@@ -0,0 +1,35 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include "supervisor/board.h"
+#include "nrf.h"
+#include "nrf_rtc.h"
+
+void board_init(void) {
+    // Initializations below from Arduino variant.cpp.
+
+    // // turn power LED on
+    // pinMode(LED_PWR, OUTPUT);
+    // digitalWrite(LED_PWR, HIGH);
+
+    // Errata Nano33BLE - I2C pullup is on SWO line, need to disable TRACE
+    // was being enabled by nrfx_clock_anomaly_132
+    CoreDebug->DEMCR = 0;
+    NRF_CLOCK->TRACECONFIG = 0;
+
+    // FIXME: bootloader enables interrupt on COMPARE[0], which we don't handle
+    // Disable it here to avoid getting stuck when OVERFLOW irq is triggered
+    nrf_rtc_event_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+    nrf_rtc_int_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+
+    // // FIXME: always enable I2C pullup and power @startup
+    // // Change for maximum powersave
+    // pinMode(PIN_ENABLE_SENSORS_3V3, OUTPUT);
+    // pinMode(PIN_ENABLE_I2C_PULLUP, OUTPUT);
+
+    // digitalWrite(PIN_ENABLE_SENSORS_3V3, HIGH);
+    // digitalWrite(PIN_ENABLE_I2C_PULLUP, HIGH);
+}
diff --git a/ports/nordic/boards/arduino_nano_33_ble_rev2/mpconfigboard.h b/ports/nordic/boards/arduino_nano_33_ble_rev2/mpconfigboard.h
@@ -0,0 +1,22 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "nrfx/hal/nrf_gpio.h"
+
+#define MICROPY_HW_BOARD_NAME       "Arduino Nano 33 BLE Rev2"
+#define MICROPY_HW_MCU_NAME         "nRF52840"
+
+#define DEFAULT_I2C_BUS_SCL         (&pin_P0_02)
+#define DEFAULT_I2C_BUS_SDA         (&pin_P0_31)
+
+#define DEFAULT_SPI_BUS_SCK         (&pin_P0_13)
+#define DEFAULT_SPI_BUS_MOSI        (&pin_P0_01)
+#define DEFAULT_SPI_BUS_MISO        (&pin_P1_08)
+
+#define DEFAULT_UART_BUS_RX         (&pin_P1_10)
+#define DEFAULT_UART_BUS_TX         (&pin_P1_03)
diff --git a/ports/nordic/boards/arduino_nano_33_ble_rev2/mpconfigboard.mk b/ports/nordic/boards/arduino_nano_33_ble_rev2/mpconfigboard.mk
@@ -0,0 +1,9 @@
+USB_VID = 0x2341
+USB_PID = 0x805A
+USB_PRODUCT = "Arduino_Nano_33_BLE"
+USB_MANUFACTURER = "Arduino"
+
+MCU_CHIP = nrf52840
+
+INTERNAL_FLASH_FILESYSTEM = 1
+CIRCUITPY_ULAB = 0
diff --git a/ports/nordic/boards/arduino_nano_33_ble_rev2/pins.c b/ports/nordic/boards/arduino_nano_33_ble_rev2/pins.c
@@ -0,0 +1,74 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include "shared-bindings/board/__init__.h"
+
+static const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P1_11) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P1_12) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P1_15) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_13) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P1_14) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_P0_23) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_P0_21) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_27) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P1_02) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_05) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_30) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_29) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_31) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_31) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_02) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_02) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_P0_28) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_P0_03) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_P0_14) },
+    { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_P0_15) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P1_01) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P1_08) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_13) },
+    { MP_ROM_QSTR(MP_QSTR_LED_Y), MP_ROM_PTR(&pin_P0_13)  },
+
+    { MP_ROM_QSTR(MP_QSTR_LED_G), MP_ROM_PTR(&pin_P1_09)  },
+
+    { MP_ROM_QSTR(MP_QSTR_RGB_LED_R), MP_ROM_PTR(&pin_P0_24)  },
+    { MP_ROM_QSTR(MP_QSTR_RGB_LED_G), MP_ROM_PTR(&pin_P0_16)  },
+    { MP_ROM_QSTR(MP_QSTR_RGB_LED_B), MP_ROM_PTR(&pin_P0_06)  },
+
+    // Power line to IMU, pressure, temperature and humidity sensors.
+    { MP_ROM_QSTR(MP_QSTR_VDD_ENV), MP_ROM_PTR(&pin_P0_22)  },
+
+    // Pullup voltage for SDA1 and SCL1
+    { MP_ROM_QSTR(MP_QSTR_R_PULLUP), MP_ROM_PTR(&pin_P1_00)  },
+
+    { MP_ROM_QSTR(MP_QSTR_MIC_PWR), MP_ROM_PTR(&pin_P0_17)  },
+    { MP_ROM_QSTR(MP_QSTR_PDMCLK), MP_ROM_PTR(&pin_P0_26)  },
+    { MP_ROM_QSTR(MP_QSTR_PDMDIN), MP_ROM_PTR(&pin_P0_25)  },
+
+    { MP_ROM_QSTR(MP_QSTR_INT_APDS), MP_ROM_PTR(&pin_P0_19)  },
+    { MP_ROM_QSTR(MP_QSTR_INT_BMI_1), MP_ROM_PTR(&pin_P0_11)  },
+    { MP_ROM_QSTR(MP_QSTR_INT_BMI_2), MP_ROM_PTR(&pin_P0_20)  },
+    { MP_ROM_QSTR(MP_QSTR_INT_LPS), MP_ROM_PTR(&pin_P0_12)  },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P1_03) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P1_10) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c
@@ -212,11 +212,11 @@ void supervisor_bluetooth_init(void) {
         boot_in_discovery_mode = true;
         reset_state = 0x0;
     }
+    bool bonded = common_hal_bleio_adapter_is_bonded_to_central(&common_hal_bleio_adapter_obj);
     #if !CIRCUITPY_USB_DEVICE
     // Boot into discovery if USB isn't available and we aren't bonded already.
     // Checking here allows us to have the status LED solidly on even if no button was
     // pressed.
-    bool bonded = common_hal_bleio_adapter_is_bonded_to_central(&common_hal_bleio_adapter_obj);
     bool wifi_workflow_active = false;
     #if CIRCUITPY_WEB_WORKFLOW && CIRCUITPY_WIFI && CIRCUITPY_OS_GETENV
     char _api_password[64];
@@ -255,6 +255,11 @@ void supervisor_bluetooth_init(void) {
     if (boot_in_discovery_mode) {
         common_hal_bleio_adapter_erase_bonding(&common_hal_bleio_adapter_obj);
     }
+    if (boot_in_discovery_mode || bonded) {
+        workflow_state = WORKFLOW_ENABLED;
+    } else {
+        workflow_state = WORKFLOW_DISABLED;
+    }
     #if CIRCUITPY_STATUS_LED
     new_status_color(BLACK);
     status_led_deinit();
@@ -358,7 +363,7 @@ void supervisor_bluetooth_disable_workflow(void) {
 
 bool supervisor_bluetooth_workflow_is_enabled(void) {
     #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE
-    if (workflow_state == 1) {
+    if (workflow_state == WORKFLOW_ENABLED) {
         return true;
     }
     #endif
diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c
@@ -100,7 +100,6 @@ void supervisor_workflow_start(void) {
 
     #if CIRCUITPY_BLEIO
     bleio_reset();
-    supervisor_bluetooth_enable_workflow();
     supervisor_start_bluetooth();
     #endif
 
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -66,6 +66,7 @@
     "0x303A:0x8166": ["yd_esp32_s3_n8r8", "yd_esp32_s3_n16r8"],
     "0x2341:0x056B": ["arduino_nano_esp32s3", "arduino_nano_esp32s3_inverted_statusled"],
     "0x2E8A:0x1020": ["waveshare_rp2040_plus_4mb", "waveshare_rp2040_plus_16mb"],
+    "0x2341:0x805A": ["arduino_nano_33_ble", "arduino_nano_33_ble_rev2"],
 }
 
 cli_parser = argparse.ArgumentParser(
