60 files changed, 52 insertions(+), 269 deletions(-)

R keyboards/dasky/reverb/{info.json => keyboard.json}
R keyboards/dc01/arrow/{info.json => keyboard.json}
R keyboards/dc01/left/{info.json => keyboard.json}
R keyboards/dc01/numpad/{info.json => keyboard.json}
R keyboards/dc01/right/{info.json => keyboard.json}
R keyboards/dcpedit/redherring/{info.json => keyboard.json}
R keyboards/deng/thirty/{info.json => keyboard.json}
R keyboards/dichotomy/{info.json => keyboard.json}
R keyboards/dm9records/plaid/{info.json => keyboard.json}
R keyboards/dm9records/tartan/{info.json => keyboard.json}
R keyboards/doio/kb16/rev1/{info.json => keyboard.json}
R keyboards/doio/kb16/rev2/{info.json => keyboard.json}
R keyboards/doio/kb38/{info.json => keyboard.json}
R keyboards/dp60/{info.json => keyboard.json}
D keyboards/draytronics/scarlet/config.h
R keyboards/draytronics/scarlet/{info.json => keyboard.json}
R keyboards/drop/alt/v2/{info.json => keyboard.json}
R keyboards/drop/cstm65/{info.json => keyboard.json}
R keyboards/drop/cstm80/{info.json => keyboard.json}
R keyboards/drop/ctrl/v2/{info.json => keyboard.json}
R keyboards/drop/sense75/{info.json => keyboard.json}
R keyboards/drop/shift/v2/{info.json => keyboard.json}
R keyboards/duck/eagle_viper/v2/{info.json => keyboard.json}
R keyboards/duck/jetfire/{info.json => keyboard.json}
R keyboards/duck/lightsaver/{info.json => keyboard.json}
R keyboards/duck/octagon/v1/{info.json => keyboard.json}
R keyboards/duck/octagon/v2/{info.json => keyboard.json}
R keyboards/duck/orion/v3/{info.json => keyboard.json}
R keyboards/duck/tcv3/{info.json => keyboard.json}
R keyboards/ducky/one2mini/1861st/{info.json => keyboard.json}
R keyboards/ducky/one2sf/1967st/{info.json => keyboard.json}
R keyboards/durgod/k310/base/{info.json => keyboard.json}
R keyboards/dztech/dz60rgb/v2_1/{info.json => keyboard.json}
R keyboards/dztech/dz60rgb_ansi/v2_1/{info.json => keyboard.json}
R keyboards/dztech/dz60rgb_wkl/v2_1/{info.json => keyboard.json}
R keyboards/dztech/dz65rgb/v3/{info.json => keyboard.json}
D keyboards/edi/hardlight/mk1/config.h
M keyboards/edi/hardlight/mk1/keyboard.json
M keyboards/edi/hardlight/mk2/config.h
R keyboards/edi/hardlight/mk2/{info.json => keyboard.json}
R keyboards/edinburgh41/{info.json => keyboard.json}
D keyboards/efreet/config.h
R keyboards/efreet/{info.json => keyboard.json}
R keyboards/elcantorhs/{info.json => keyboard.json}
R keyboards/emery65/{info.json => keyboard.json}
R keyboards/ergodox_ez/shine/{info.json => keyboard.json}
R keyboards/ergodox_stm32/{info.json => keyboard.json}
M keyboards/ergodox_stm32/rules.mk
D keyboards/ericrlau/numdiscipline/rev1/config.h
R keyboards/ericrlau/numdiscipline/rev1/{info.json => keyboard.json}
D keyboards/evyd13/eon40/config.h
R keyboards/evyd13/eon40/{info.json => keyboard.json}
D keyboards/evyd13/nt660/config.h
R keyboards/evyd13/nt660/{info.json => keyboard.json}
D keyboards/evyd13/pockettype/config.h
R keyboards/evyd13/pockettype/{info.json => keyboard.json}
R keyboards/evyd13/wasdat/{info.json => keyboard.json}
R keyboards/evyd13/wasdat_code/{info.json => keyboard.json}
R keyboards/ez_maker/directpins/teensy_32/{info.json => keyboard.json}
R keyboards/ez_maker/directpins/teensy_lc/{info.json => keyboard.json}

@@ 1,37 0,0 @@
-/*Copyright 2020 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

@@ 20,6 20,12 @@
         "mousekey": true,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {

@@ 1,28 0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-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 3 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
-
-/*
- * Enable Audio Subsystem with two voices
- */
-// #define AUDIO_PIN C6

@@ 16,6 16,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
         "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]

@@ 17,11 17,6 @@ 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
-
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
 
 /* PWM RGB Underglow Defines */

@@ 43,6 43,12 @@
         "velocikey": true,
         "key_lock": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["ortho_4x16"],
     "layouts": {
         "LAYOUT_ortho_4x16": {

@@ 1,39 0,0 @@
-/*
-Copyright 2019 Amber Holly
-
-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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

@@ 27,6 27,12 @@
         "nkro": true,
         "backlight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["ortho_4x12", "planck_mit"],
     "layouts": {
         "LAYOUT_planck_mit": {

@@ 15,7 15,9 @@
         "nkro": true,
         "unicode": true
     },
-"layouts": {
+    "processor": "STM32F103",
+    "bootloader": "custom",
+    "layouts": {
         "LAYOUT_ergodox": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},

@@ 1,11 1,7 @@
-# MCU name
-MCU = STM32F103
+# custom bootloader
 MCU_LDSCRIPT = stm32f103_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
-# Bootloader selection
-BOOTLOADER = custom
-
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c

@@ 1,39 0,0 @@
-/*
-Copyright 2020 Eric Lau
-
-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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

@@ 21,6 21,12 @@
         "mousekey": true,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

@@ 1,38 0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

@@ 34,6 34,12 @@
     "command": true,
     "encoder": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layouts": {
     "LAYOUT_ortho_4x12": {

@@ 1,39 0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

@@ 28,6 28,12 @@
         "mousekey": false,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["66_ansi", "66_iso"],
     "layouts": {
         "LAYOUT_all": {

@@ 1,38 0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

@@ 20,6 20,12 @@
     "mousekey": false,
     "extrakey": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {