62 files changed, 57 insertions(+), 185 deletions(-)

R keyboards/canary/canary60rgb/{info.json => v1/keyboard.json}
D keyboards/canary/canary60rgb/v1/rules.mk
R keyboards/canary/canary60rgb/{canary60rgb.c => v1/v1.c}
R keyboards/handwired/qc60/{info.json => proto/keyboard.json}
D keyboards/handwired/qc60/proto/rules.mk
R keyboards/handwired/stef9998/split_5x7/{info.json => rev1/keyboard.json}
R keyboards/handwired/stef9998/split_5x7/{split_5x7.c => rev1/rev1.c}
R keyboards/junco/{info.json => rev1/keyboard.json}
M keyboards/junco/rev1/rules.mk
M keyboards/junco/rules.mk
R keyboards/keaboard/{info.json => rev1/keyboard.json}
D keyboards/keaboard/rev1/rules.mk
R keyboards/melgeek/mj65/{config.h => rev3/config.h}
R keyboards/melgeek/mj65/{info.json => rev3/keyboard.json}
M keyboards/melgeek/mj65/rev3/rules.mk
M keyboards/melgeek/mojo68/rev1/config.h
R keyboards/melgeek/mojo68/{info.json => rev1/keyboard.json}
D keyboards/melgeek/mojo68/rev1/rules.mk
R keyboards/melgeek/mojo75/{config.h => rev1/config.h}
R keyboards/melgeek/mojo75/{info.json => rev1/keyboard.json}
D keyboards/melgeek/mojo75/rev1/rules.mk
D keyboards/melgeek/tegic/config.h
R keyboards/melgeek/{mojo68/config.h => tegic/rev1/config.h}
R keyboards/melgeek/tegic/{info.json => rev1/keyboard.json}
D keyboards/melgeek/tegic/rev1/rules.mk
R keyboards/melgeek/z70ultra/{config.h => rev1/config.h}
R keyboards/melgeek/z70ultra/{info.json => rev1/keyboard.json}
R keyboards/melgeek/z70ultra/{z70ultra.c => rev1/rev1.c}
D keyboards/melgeek/z70ultra/rev1/rules.mk
D keyboards/miiiw/blackio83/config.h
M keyboards/miiiw/blackio83/rev_0100/config.h
R keyboards/miiiw/blackio83/{halconf.h => rev_0100/halconf.h}
R keyboards/miiiw/blackio83/{info.json => rev_0100/keyboard.json}
R keyboards/miiiw/blackio83/{matrix.c => rev_0100/matrix.c}
R keyboards/miiiw/blackio83/{mcuconf.h => rev_0100/mcuconf.h}
R keyboards/miiiw/blackio83/{blackio83.c => rev_0100/rev_0100.c}
R keyboards/miiiw/blackio83/{blackio83.h => rev_0100/rev_0100.h}
M keyboards/miiiw/blackio83/rev_0100/rules.mk
R keyboards/murcielago/{info.json => rev1/keyboard.json}
D keyboards/murcielago/rev1/rules.mk
R keyboards/polilla/{chconf.h => rev1/chconf.h}
M keyboards/polilla/rev1/config.h
R keyboards/polilla/{halconf.h => rev1/halconf.h}
R keyboards/polilla/{info.json => rev1/keyboard.json}
R keyboards/polilla/{mcuconf.h => rev1/mcuconf.h}
D keyboards/polilla/rev1/rules.mk
R keyboards/qwertyydox/{config.h => rev1/config.h}
R keyboards/qwertyydox/{info.json => rev1/keyboard.json}
D keyboards/qwertyydox/rev1/rules.mk
M keyboards/qwertyydox/rules.mk
D keyboards/spacetime/config.h
M keyboards/spacetime/info.json
A keyboards/spacetime/rev1/keyboard.json
D keyboards/spacetime/rev1/rules.mk
R keyboards/splitty/{config.h => rev1/config.h}
R keyboards/splitty/{info.json => rev1/keyboard.json}
D keyboards/splitty/rev1/rules.mk
M keyboards/splitty/rules.mk
R keyboards/woodkeys/meira/featherble/{info.json => keyboard.json}
M keyboards/woodkeys/meira/info.json
A keyboards/woodkeys/meira/promicro/keyboard.json
M keyboards/woodkeys/meira/rules.mk

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 8,6 8,9 @@
         "pid": "0x4A13",
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true
+    },
     "matrix_pins": {
         "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
         "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]


@@ 28,6 31,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "encoder": {
             "right": {
                 "rotary": [

@@ 0,0 1,1 @@
+SERIAL_DRIVER = vendor

@@ 1,9 1,1 @@
-# Split Keyboard Stuff
-SPLIT_KEYBOARD = yes
-SERIAL_DRIVER = vendor
-
-# Enable Bootmagic Lite
-BOOTMAGIC_ENABLE = yes
-
-# Default Folder
 DEFAULT_FOLDER = junco/rev1

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 8,6 8,13 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,

@@ 1,16 1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
 BACKLIGHT_SUPPORTED  = no

@@ 16,4 16,7 @@
 
 #pragma once
 
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN B7
+
 #define DRIVER_INDICATOR_LED_TOTAL 3

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 1,20 0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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
-
-#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define IS31FL3741_SDB_PIN B7

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 1,20 0,0 @@
-/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
- *
- * 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
-
-// EEPROM i2c chip
-#define EEPROM_I2C_24LC256

@@ 16,6 16,9 @@
 
 #pragma once
 
+// EEPROM i2c chip
+#define EEPROM_I2C_24LC256
+
 #define POWER_SWITCH_PIN B0
 
 /* 16 with dummy columns for shift registers */

@@ 14,7 14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "blackio83.h"
+#include "rev_0100.h"
 #include "usb_main.h"
 #include "usb_util.h"
 

@@ 1,7 1,5 @@
 CUSTOM_MATRIX = lite
 
-WS2812_DRIVER_REQUIRED := yes
-
 # Project specific files
 SRC += matrix.c \
 	   common/shift_register.c

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 16,26 16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* 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

@@ 23,6 23,12 @@
     "diode_direction": "ROW2COL",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 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 MOUSEKEY_DELAY             150
 #define MOUSEKEY_INTERVAL          20
 #define MOUSEKEY_MAX_SPEED         10

@@ 9,6 9,9 @@
     "pid": "0x1256",
     "device_version": "1.0.0"
   },
+  "features": {
+    "mousekey": true
+  },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
     "rows": ["B6", "B2", "B3", "B1"]


@@ 36,8 39,15 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0"
   },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
   "bootloader": "caterina",
   "processor": "atmega32u4",
   "layouts": {

@@ 1,16 1,1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = qwertyydox/rev1

@@ 1,39 0,0 @@
-/*
-Copyright 2019 Kyle Terry
-
-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

@@ 16,6 16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
     "rows": ["D4", "C6", "D7", "E6"]

@@ 0,0 1,1 @@
+{}

@@ 1,1 0,0 @@
-# This file intentionally left blank

@@ 8,6 8,13 @@
     "pid": "0x6052",
     "device_version": "0.0.1"
   },
+  "features": {
+    "mousekey": true,
+    "extrakey": true
+  },
+  "split": {
+    "enabled": true
+  },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
     "rows": ["F0", "F1", "D4", "D5", "D6"]

@@ 1,16 1,1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = splitty/rev1

@@ 1,4 1,6 @@
 {
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "bluetooth": {
         "driver": "bluefruit_le"
     }

@@ 8,8 8,9 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "features": {
+        "extrakey": true
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"
     },

@@ 0,0 1,3 @@
+{
+    "development_board": "promicro"
+}

@@ 1,16 1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c