Browse Source
Fixing layered assignment bug.
- Layered assignments were lost due to how the cached assignments were replayed - Replaying each assignment cache after each file is done processingsimple
Jacob Alexander
9 years ago
2 changed files with 4 additions and 3 deletions
+ 2
- 2
kll.py
View File
| # 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 | |||||
| macros_map.replayCachedAssignments() | |||||
| # Apply assignment cache, see 5.1.2 USB Codes for why this is necessary | |||||
| macros_map.replayCachedAssignments() | |||||
| # Iterate through additional layers | # Iterate through additional layers | ||||
| for partial in partialFileSets: | for partial in partialFileSets: |
+ 2
- 1
kll_lib/containers.py
View File
| 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 |