sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated to fix linter

Browse Source
This commit is contained in:
Pierre Constantineau 2021-10-22 13:13:09 -06:00 committed by Kyle Brown
parent 3bbadece8d
commit d8445c1262
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/jpconstantineau/Batreus44/kb_BlueMicro840.py
View File

@ -6,7 +6,6 @@ from kmk.matrix import DiodeOrientation
class KMKKeyboard(_KMKKeyboard): class KMKKeyboard(_KMKKeyboard):
col_pins = ( col_pins = (
<<<<<<< HEAD
board.P0_15, board.P0_15,
board.P0_17, board.P0_17,
board.P0_20, board.P0_20,
@ -22,11 +21,4 @@ class KMKKeyboard(_KMKKeyboard):
) )
row_pins = (board.P0_28, board.P1_11, board.P0_10, board.P1_06) row_pins = (board.P0_28, board.P1_11, board.P0_10, board.P1_06)
diode_orientation = DiodeOrientation.COL2ROW diode_orientation = DiodeOrientation.COL2ROW
=======
board.P0_15, board.P0_17, board.P0_20, board.P0_13, board.P0_24,
board.P0_09, board.P0_03, board.P1_13, board.P0_02, board.P0_29, board.P0_26, board.P0_30
)
row_pins = (board.P0_28, board.P1_11, board.P0_10, board.P1_06)
diode_orientation = DiodeOrientation.COL2ROW
>>>>>>> d870865 (minor updates/comments)