|
6 | 6 | import microcontroller |
7 | 7 | import usb_hid |
8 | 8 |
|
9 | | -import adafruit_ble |
| 9 | +from adafruit_ble import BLERadio |
10 | 10 | from adafruit_ble.advertising import Advertisement |
11 | 11 | from adafruit_ble.advertising.standard import ProvideServicesAdvertisement |
12 | 12 | from adafruit_ble.services.standard import BatteryService |
13 | 13 | from adafruit_ble.services.standard.hid import HIDService |
14 | 14 |
|
| 15 | +from .action_code import * |
15 | 16 | from .hid import HID |
16 | 17 | from .model import Matrix, COORDS, Backlight, battery_level, key_name |
17 | | -from .action_code import * |
18 | 18 | from .util import usb_is_connected, do_nothing |
19 | 19 |
|
20 | 20 |
|
21 | | -def reset_into_bootloader(): |
22 | | - microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER) |
23 | | - microcontroller.reset() |
24 | | - |
25 | | - |
26 | 21 | class Device: |
27 | 22 | def __init__(self, kbd): |
28 | 23 | self.kbd = kbd |
@@ -98,7 +93,7 @@ def __init__(self, keymap=(), verbose=True): |
98 | 93 | self.battery_update_time = time.time() + 360 |
99 | 94 | self.advertisement = ProvideServicesAdvertisement(ble_hid, self.battery) |
100 | 95 | self.advertisement.appearance = 961 |
101 | | - self.ble = adafruit_ble.BLERadio() |
| 96 | + self.ble = BLERadio() |
102 | 97 | self.set_bt_id(self.ble_id) |
103 | 98 | self.ble_hid = HID(ble_hid.devices) |
104 | 99 | self.usb_hid = HID(usb_hid.devices) |
@@ -537,7 +532,8 @@ def run(self): |
537 | 532 | self.backlight.val -= 8 |
538 | 533 | elif kind == ACT_COMMAND: |
539 | 534 | if action_code == BOOTLOADER: |
540 | | - reset_into_bootloader() |
| 535 | + microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER) |
| 536 | + microcontroller.reset() |
541 | 537 | elif action_code == SUSPEND: |
542 | 538 | matrix.suspend() |
543 | 539 | elif action_code == SHUTDOWN: |
|
0 commit comments