aboutsummaryrefslogtreecommitdiff
path: root/keyboards/melgeek
diff options
context:
space:
mode:
authorJames Young <[email protected]>2024-05-22 13:49:15 -0700
committerGitHub <[email protected]>2024-05-22 21:49:15 +0100
commit199f01cc5760055dfbdc89f426bf5a8f9b49bfb7 (patch)
tree21509be9a7885a7cb7707e241b5577e3b9e1f6d9 /keyboards/melgeek
parent7baaac9531c2806e38d8c9e2e0357b3eadbf2a7f (diff)
downloadqmk_firmware-199f01cc5760055dfbdc89f426bf5a8f9b49bfb7.tar.gz
qmk_firmware-199f01cc5760055dfbdc89f426bf5a8f9b49bfb7.zip
Migrate `LOCKING_*_ENABLE` to Data-Driven: M, Part 1 (#23772)
Affects: - `m10a` - `machine_industries/m4_a` - `magic_force/mf34` - `majistic` - `makenova/omega/omega4` - `makrosu` - `manta60` - `maple_computing/christmas_tree/v2017` - `maple_computing/ivy/rev1` - `maple_computing/launchpad/rev1` - `maple_computing/minidox/rev1` - `maple_computing/the_ruler` - `marksard/leftover30` - `marksard/treadstone48/rev1` - `marksard/treadstone48/rev2` - `masterworks/classy_tkl/rev_a` - `maxipad` - `maxr1998/phoebe` - `mc_76k` - `mechkeys/acr60` - `mechkeys/alu84` - `mechkeys/espectro` - `mechkeys/mechmini/v2` - `mechkeys/mk60` - `mechlovin/hannah910/rev1` - `mechlovin/hannah910/rev2` - `mechlovin/hannah910/rev3` - `mechlovin/jay60` - `mechlovin/tmkl` - `mechwild/bde/lefty` - `mechwild/bde/rev2` - `mechwild/bde/righty` - `mechwild/mercutio` - `mechwild/mokulua/mirrored` - `mechwild/mokulua/standard` - `mechwild/murphpad` - `mechwild/obe` - `mechwild/puckbuddy` - `meletrix/zoom98` - `melgeek/mj6xy/rev3` - `meme` - `meow65` - `mesa/mesa_tkl` - `meson` - `mikeneko65` - `millipad` - `mini_elixivy` - `mini_ten_key_plus` - `minimon/index_tab` - `mint60` - `misonoworks/karina` - `miuni32` - `mixi`
Diffstat (limited to 'keyboards/melgeek')
-rwxr-xr-xkeyboards/melgeek/mj6xy/config.h22
-rw-r--r--keyboards/melgeek/mj6xy/rev3/keyboard.json6
2 files changed, 6 insertions, 22 deletions
diff --git a/keyboards/melgeek/mj6xy/config.h b/keyboards/melgeek/mj6xy/config.h
deleted file mode 100755
index 79f977638b..0000000000
--- a/keyboards/melgeek/mj6xy/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 MelGeek <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* 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/melgeek/mj6xy/rev3/keyboard.json b/keyboards/melgeek/mj6xy/rev3/keyboard.json
index 8888b78c2d..ae44451236 100644
--- a/keyboards/melgeek/mj6xy/rev3/keyboard.json
+++ b/keyboards/melgeek/mj6xy/rev3/keyboard.json
@@ -9,6 +9,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F7", "D2", "D1", "D0"],
"rows": ["F0", "F1", "F4", "F5", "F6"]