Skip to content

Commit

Permalink
Solves conflicts from qmk#22448 in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Cipulot committed Feb 25, 2024
1 parent c900c87 commit 1f9c916
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_23u/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += matrix.c ec_switch_matrix.c
OPT = 2
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_60/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 3
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_alveus/1_0_0/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 3
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_alveus/1_2_0/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 3
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_pro2/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 2
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_prox/ansi_iso/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 2
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_prox/jis/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 2
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_theca/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 3
2 changes: 1 addition & 1 deletion keyboards/cipulot/rf_r1_8_9xu/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_LIB_SRC += analog.c
ANALOG_DRIVER_REQUIRED = yes
SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_switch_matrix.c
OPT = 2

0 comments on commit 1f9c916

Please sign in to comment.