Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xiongyihui committed Oct 28, 2020
1 parent 0da605e commit d213662
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
18 changes: 9 additions & 9 deletions keyboard/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ def __init__(self, keymap=(), verbose=True):

def on_device_changed(self, name):
print("change to {}".format(name))
if name in self.action_maps:
self.current_keymap = self.action_maps[name]
if name in self.actionmaps:
self.actionmap = self.actionmaps[name]
else:
self.current_keymap = self.actonmap
self.actionmap = self.default_actionmap

# reset `layer_mask` when keymap is changed
self.layer_mask = 1
Expand Down Expand Up @@ -144,11 +144,11 @@ def check(self):

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 = {}
self.default_actionmap = tuple(convert(layer) for layer in self.keymap)
self.actionmap = self.default_actionmap
self.actionmaps = {}
for key in self.profiles:
self.action_maps[key] = tuple(
self.actionmaps[key] = tuple(
convert(layer) for layer in self.profiles[key]
)

Expand Down Expand Up @@ -327,9 +327,9 @@ def toggle_usb(self):
def action_code(self, position):
position = COORDS[position]
layer_mask = self.layer_mask
for layer in range(len(self.current_keymap) - 1, -1, -1):
for layer in range(len(self.actionmap) - 1, -1, -1):
if (layer_mask >> layer) & 1:
code = self.current_keymap[layer][position]
code = self.actionmap[layer][position]
if code == 1: # TRANSPARENT
continue
return code
Expand Down
17 changes: 10 additions & 7 deletions keyboard/hid.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,16 @@ def move_mouse(self, x=0, y=0, wheel=0):
self.mouse.send_report(self.mouse_report)

def release_all(self):
self.send_consumer(0)
for i in range(8):
self.report[i] = 0
self.keyboard.send_report(self.report)
for i in range(4):
self.mouse_report[i] = 0
self.mouse.send_report(self.mouse_report)
try:
self.send_consumer(0)
for i in range(8):
self.report[i] = 0
self.keyboard.send_report(self.report)
for i in range(4):
self.mouse_report[i] = 0
self.mouse.send_report(self.mouse_report)
except Exception as e:
print(e)

@property
def leds(self):
Expand Down

0 comments on commit d213662

Please sign in to comment.