@@ -105,10 +105,10 @@ def __init__(self, keymap=(), verbose=True):
105105
106106 def on_device_changed (self , name ):
107107 print ("change to {}" .format (name ))
108- if name in self .action_maps :
109- self .current_keymap = self .action_maps [name ]
108+ if name in self .actionmaps :
109+ self .actionmap = self .actionmaps [name ]
110110 else :
111- self .current_keymap = self .actonmap
111+ self .actionmap = self .default_actionmap
112112
113113 # reset `layer_mask` when keymap is changed
114114 self .layer_mask = 1
@@ -144,11 +144,11 @@ def check(self):
144144
145145 def setup (self ):
146146 convert = lambda a : array .array ("H" , (get_action_code (k ) for k in a ))
147- self .actonmap = tuple (convert (layer ) for layer in self .keymap )
148-
149- self .action_maps = {}
147+ self .default_actionmap = tuple (convert (layer ) for layer in self .keymap )
148+ self . actionmap = self . default_actionmap
149+ self .actionmaps = {}
150150 for key in self .profiles :
151- self .action_maps [key ] = tuple (
151+ self .actionmaps [key ] = tuple (
152152 convert (layer ) for layer in self .profiles [key ]
153153 )
154154
@@ -327,9 +327,9 @@ def toggle_usb(self):
327327 def action_code (self , position ):
328328 position = COORDS [position ]
329329 layer_mask = self .layer_mask
330- for layer in range (len (self .current_keymap ) - 1 , - 1 , - 1 ):
330+ for layer in range (len (self .actionmap ) - 1 , - 1 , - 1 ):
331331 if (layer_mask >> layer ) & 1 :
332- code = self .current_keymap [layer ][position ]
332+ code = self .actionmap [layer ][position ]
333333 if code == 1 : # TRANSPARENT
334334 continue
335335 return code
0 commit comments