aboutsummaryrefslogtreecommitdiff
path: root/keyboards/cipulot/ec_prox
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-04-30 17:35:07 +0000
committerQMK Bot <[email protected]>2024-04-30 17:35:07 +0000
commit7a28c6ede32bf77e8429c65899fc1fb1a6505c10 (patch)
treeee1f679663c01873699d49770b6dc5ada849e5a9 /keyboards/cipulot/ec_prox
parent0debba36816e6a748b84c9194b9e6b6b3dd697a3 (diff)
parent636c96ad256b1b2f21c4c810d195c78402e060a0 (diff)
downloadqmk_firmware-7a28c6ede32bf77e8429c65899fc1fb1a6505c10.tar.gz
qmk_firmware-7a28c6ede32bf77e8429c65899fc1fb1a6505c10.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cipulot/ec_prox')
-rw-r--r--keyboards/cipulot/ec_prox/ansi_iso/config.h6
-rw-r--r--keyboards/cipulot/ec_prox/ansi_iso/keyboard.json6
-rw-r--r--keyboards/cipulot/ec_prox/ansi_iso/rules.mk3
-rw-r--r--keyboards/cipulot/ec_prox/jis/config.h6
-rw-r--r--keyboards/cipulot/ec_prox/jis/keyboard.json6
-rw-r--r--keyboards/cipulot/ec_prox/jis/rules.mk3
6 files changed, 16 insertions, 14 deletions
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/config.h b/keyboards/cipulot/ec_prox/ansi_iso/config.h
index 6a165cf3ab..bf25d0b712 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/config.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/config.h
@@ -64,9 +64,3 @@
// #define DEBUG_MATRIX_SCAN_RATE
#define EECONFIG_KB_DATA_SIZE 159
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
index 3f390d0bc6..9a68d8b0bf 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
@@ -6,6 +6,12 @@
"build": {
"lto": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"features": {
"bootmagic": false,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
index ab6c37cad4..318e0215ce 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
+++ b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
@@ -1,4 +1,5 @@
CUSTOM_MATRIX = lite
ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
OPT = 2
diff --git a/keyboards/cipulot/ec_prox/jis/config.h b/keyboards/cipulot/ec_prox/jis/config.h
index 6a686d7404..fd3c048bc3 100644
--- a/keyboards/cipulot/ec_prox/jis/config.h
+++ b/keyboards/cipulot/ec_prox/jis/config.h
@@ -64,9 +64,3 @@
// #define DEBUG_MATRIX_SCAN_RATE
#define EECONFIG_KB_DATA_SIZE 149
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/cipulot/ec_prox/jis/keyboard.json b/keyboards/cipulot/ec_prox/jis/keyboard.json
index 88067f9305..4c92f8c673 100644
--- a/keyboards/cipulot/ec_prox/jis/keyboard.json
+++ b/keyboards/cipulot/ec_prox/jis/keyboard.json
@@ -6,6 +6,12 @@
"build": {
"lto": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"features": {
"bootmagic": false,
diff --git a/keyboards/cipulot/ec_prox/jis/rules.mk b/keyboards/cipulot/ec_prox/jis/rules.mk
index ab6c37cad4..318e0215ce 100644
--- a/keyboards/cipulot/ec_prox/jis/rules.mk
+++ b/keyboards/cipulot/ec_prox/jis/rules.mk
@@ -1,4 +1,5 @@
CUSTOM_MATRIX = lite
ANALOG_DRIVER_REQUIRED = yes
-SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
OPT = 2