diff options
author | QMK Bot <[email protected]> | 2024-04-30 17:35:07 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2024-04-30 17:35:07 +0000 |
commit | 7a28c6ede32bf77e8429c65899fc1fb1a6505c10 (patch) | |
tree | ee1f679663c01873699d49770b6dc5ada849e5a9 /keyboards/cipulot/ec_pro2 | |
parent | 0debba36816e6a748b84c9194b9e6b6b3dd697a3 (diff) | |
parent | 636c96ad256b1b2f21c4c810d195c78402e060a0 (diff) | |
download | qmk_firmware-7a28c6ede32bf77e8429c65899fc1fb1a6505c10.tar.gz qmk_firmware-7a28c6ede32bf77e8429c65899fc1fb1a6505c10.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cipulot/ec_pro2')
-rw-r--r-- | keyboards/cipulot/ec_pro2/config.h | 5 | ||||
-rw-r--r-- | keyboards/cipulot/ec_pro2/keyboard.json | 6 | ||||
-rw-r--r-- | keyboards/cipulot/ec_pro2/rules.mk | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index c936b248c4..a05e716823 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -65,8 +65,3 @@ #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_pro2/keyboard.json b/keyboards/cipulot/ec_pro2/keyboard.json index 2929edfb19..2e05cff3c1 100644 --- a/keyboards/cipulot/ec_pro2/keyboard.json +++ b/keyboards/cipulot/ec_pro2/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_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk index ab6c37cad4..318e0215ce 100644 --- a/keyboards/cipulot/ec_pro2/rules.mk +++ b/keyboards/cipulot/ec_pro2/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 |