Merge branch 'master' into topic-low-hanging-fruit
This commit is contained in:
		@@ -2,7 +2,6 @@ def main():
 | 
			
		||||
    import sys
 | 
			
		||||
 | 
			
		||||
    from kmk.circuitpython.hid import HIDHelper
 | 
			
		||||
    from kmk.consts import UnicodeModes
 | 
			
		||||
    from kmk.firmware import Firmware
 | 
			
		||||
    from kmk.matrix import MatrixScanner
 | 
			
		||||
 | 
			
		||||
@@ -20,18 +19,12 @@ def main():
 | 
			
		||||
    else:
 | 
			
		||||
        from logging import ERROR as log_level
 | 
			
		||||
 | 
			
		||||
    try:
 | 
			
		||||
        from kmk_keyboard_user import unicode_mode
 | 
			
		||||
    except Exception:
 | 
			
		||||
        unicode_mode = UnicodeModes.NOOP
 | 
			
		||||
 | 
			
		||||
    try:
 | 
			
		||||
        firmware = Firmware(
 | 
			
		||||
            keymap=keymap,
 | 
			
		||||
            row_pins=rows,
 | 
			
		||||
            col_pins=cols,
 | 
			
		||||
            diode_orientation=diode_orientation,
 | 
			
		||||
            unicode_mode=unicode_mode,
 | 
			
		||||
            log_level=log_level,
 | 
			
		||||
            matrix_scanner=MatrixScanner,
 | 
			
		||||
            hid=HIDHelper,
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ from kmk.leader_mode import LeaderHelper
 | 
			
		||||
class Firmware:
 | 
			
		||||
    def __init__(
 | 
			
		||||
        self, keymap, row_pins, col_pins,
 | 
			
		||||
            diode_orientation, unicode_mode=None,
 | 
			
		||||
            diode_orientation,
 | 
			
		||||
            hid=None,
 | 
			
		||||
            log_level=logging.NOTSET,
 | 
			
		||||
            matrix_scanner=None,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user