di0ib/kll
Archived
1
0
Fork 0
Code Releases Activity

Fixing layered assignment bug.

Browse Source 
- Layered assignments were lost due to how the cached assignments were replayed
- Replaying each assignment cache after each file is done processing
This commit is contained in:
Jacob Alexander 2014-09-16 18:14:06 -07:00
parent 59a4b27de5
commit b4e4a13811
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kll.py
View File

@ -558,8 +558,8 @@ if __name__ == '__main__':
# Default combined layer # Default combined layer
for filename in defaultFiles: for filename in defaultFiles:
processKLLFile( filename ) processKLLFile( filename )
# Apply assignment cache, see 5.1.2 USB Codes for why this is necessary # Apply assignment cache, see 5.1.2 USB Codes for why this is necessary
macros_map.replayCachedAssignments() macros_map.replayCachedAssignments()
# Iterate through additional layers # Iterate through additional layers
for partial in partialFileSets: for partial in partialFileSets:

3
kll_lib/containers.py
View File

@ -146,7 +146,8 @@ class Macros:
self.macros[ self.layer ][ trigger ] = [ result ] self.macros[ self.layer ][ trigger ] = [ result ]
# Mark layer scan code, so it won't be removed later # Mark layer scan code, so it won't be removed later
if not self.baseLayout is None: # Also check to see if it hasn't already been removed before
if not self.baseLayout is None and trigger in self.layerLayoutMarkers[ self.layer ]:
del self.layerLayoutMarkers[ self.layer ][ trigger ] del self.layerLayoutMarkers[ self.layer ][ trigger ]
# Return a list of ScanCode triggers with the given USB Code trigger # Return a list of ScanCode triggers with the given USB Code trigger