diff --git a/firmware/circuitpython-6.0.0-alpha.1-m60-20210117.uf2 b/firmware/circuitpython-6.0.0-alpha.1-m60-20210117.uf2 new file mode 100644 index 0000000..7f11015 Binary files /dev/null and b/firmware/circuitpython-6.0.0-alpha.1-m60-20210117.uf2 differ diff --git a/keyboard/__init__.py b/keyboard/__init__.py index 847124f..91088eb 100644 --- a/keyboard/__init__.py +++ b/keyboard/__init__.py @@ -6,23 +6,18 @@ import microcontroller import usb_hid -import adafruit_ble +from adafruit_ble import BLERadio from adafruit_ble.advertising import Advertisement from adafruit_ble.advertising.standard import ProvideServicesAdvertisement from adafruit_ble.services.standard import BatteryService from adafruit_ble.services.standard.hid import HIDService +from .action_code import * from .hid import HID from .model import Matrix, COORDS, Backlight, battery_level, key_name -from .action_code import * from .util import usb_is_connected, do_nothing -def reset_into_bootloader(): - microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER) - microcontroller.reset() - - class Device: def __init__(self, kbd): self.kbd = kbd @@ -98,7 +93,7 @@ def __init__(self, keymap=(), verbose=True): self.battery_update_time = time.time() + 360 self.advertisement = ProvideServicesAdvertisement(ble_hid, self.battery) self.advertisement.appearance = 961 - self.ble = adafruit_ble.BLERadio() + self.ble = BLERadio() self.set_bt_id(self.ble_id) self.ble_hid = HID(ble_hid.devices) self.usb_hid = HID(usb_hid.devices) @@ -537,7 +532,8 @@ def run(self): self.backlight.val -= 8 elif kind == ACT_COMMAND: if action_code == BOOTLOADER: - reset_into_bootloader() + microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER) + microcontroller.reset() elif action_code == SUSPEND: matrix.suspend() elif action_code == SHUTDOWN: