Cleaup and avoid soft device error 0008 on mac

Author: windoze

keyboard/__init__.py

@@ -149,6 +149,8 @@ def __init__(self, keymap=KEYMAP, pairs=(), verbose=True):
         self.usb_status = 0
         self.leds = None
 
+        self._current_conn = ""
+
         self.data = array.array('L', microcontroller.nvm[:272])
         if self.data[0] != 0x424b5950:
             self.data[0] = 0x424b5950
@@ -165,15 +167,32 @@ def __init__(self, keymap=KEYMAP, pairs=(), verbose=True):
         self.ble_hid = HID(ble_hid.devices)
         self.usb_hid = HID(usb_hid.devices)
 
+    def update_current_conn(self):
+        if usb_is_connected() and self.usb_status == 3:
+            conn = "USB"
+        elif self.ble.connected:
+            conn = "BT%d" % self.ble_id
+        else:
+            conn = ""
+        if conn != self._current_conn:
+            self._current_conn = conn
+            if conn in self.action_maps:
+                self.current_keymap = self.action_maps[self._current_conn]
+            else:
+                self.current_keymap = self.actonmap
+            print("Current connection changed to %s" % self._current_conn)
+
     def check(self):
         if  self.adv_timeout:
             if self.ble.connected:
                 self.adv_timeout = 0
                 self.backlight.set_bt_led(None)
-
                 for c in self.ble.connections:
-                    if c.connection_interval > 11.25:
-                        c.connection_interval = 11.25
+                    try:
+                        if c.connection_interval > 11.25:
+                            c.connection_interval = 11.25
+                    except _bleio.BluetoothError:
+                        self.log("failed to set ble connection interval")
                     self.log('ble connection interval {}'.format(c.connection_interval))
             elif time.time() > self.adv_timeout:
                 self.stop_advertising()
@@ -195,22 +214,20 @@ def check(self):
             self.leds = leds
             self.backlight.set_hid_leds(leds)
             self.log('keyboard leds {}'.format(bin(leds)))
+        self.update_current_conn()
 
     def setup(self):
         convert = lambda a: array.array('H', (get_action_code(k) for k in a))
         self.actonmap = tuple(convert(layer) for layer in self.keymap)
+
         self.action_maps = {}
         for key in self.profiles:
             self.action_maps[key] = tuple(convert(layer) for layer in self.profiles[key])
 
         for pair in self.pairs:
             for key in pair:
                 self.pair_keys.add(key)
-
-    def get_actionmap(self):
-        if self.current_channel() in self.action_maps:
-            return self.action_maps[self.current_channel()]
-        return self.actonmap
+        self.update_current_conn()
 
     def start_advertising(self):
         self.ble.start_advertising(self.advertisement)
@@ -234,7 +251,7 @@ def change_bt(self, n):
 
         if 0 > n or n > 9:
             return
-        
+
         uid = self.uid[n:n+6]
         uid[-1] = uid[-1] | 0xC0
         address = _bleio.Address(uid, _bleio.Address.RANDOM_STATIC)
@@ -251,7 +268,6 @@ def change_bt(self, n):
             print(e)
         self.log(self.ble._adapter.address)
         self.start_advertising()
-        print(self.current_channel())
 
     def toggle_bt(self):
         if self.ble.connected:
@@ -261,24 +277,22 @@ def toggle_bt(self):
             self.stop_advertising()
         else:
             self.start_advertising()
-        print(self.current_channel())
-
-    def current_channel(self):
-        if self.ble.connected:
-            return "BT%d" % self.ble_id
-        return "USB"
+        self.update_current_conn()
 
     def toggle_usb(self):
         if usb_is_connected():
-            self.usb_status = 1 if self.usb_status == 3 else 3
-        print(self.current_channel())
+            if self.usb_status == 1:
+                self.usb_status = 3
+            else:
+                self.usb_status = 1
+        self.update_current_conn()
 
     def action_code(self, position):
         position = COORDS[position]
         layer_mask = self.layer_mask
-        for layer in range(len(self.get_actionmap()) - 1, -1, -1):
+        for layer in range(len(self.current_keymap) - 1, -1, -1):
             if (layer_mask >> layer) & 1:
-                code = self.get_actionmap()[layer][position]
+                code = self.current_keymap[layer][position]
                 if code == 1:   # TRANSPARENT
                     continue
                 return code