소스 검색

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 processing
simple
Jacob Alexander 9 년 전
부모
커밋
b4e4a13811
2개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 2
    2
      kll.py
  2. 2
    1
      kll_lib/containers.py

+ 2
- 2
kll.py 파일 보기

@@ -558,8 +558,8 @@ if __name__ == '__main__':
# Default combined layer
for filename in defaultFiles:
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
for partial in partialFileSets:

+ 2
- 1
kll_lib/containers.py 파일 보기

@@ -146,7 +146,8 @@ class Macros:
self.macros[ self.layer ][ trigger ] = [ result ]

# 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 ]

# Return a list of ScanCode triggers with the given USB Code trigger