Merge remote-tracking branch 'upstream/develop'

19 files changed, 60 insertions, 167 deletions

diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h
index 16b069dae0..af85027e64 100644
--- a/keyboards/nullbitsco/nibble/config.h
+++ b/keyboards/nullbitsco/nibble/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* Used to set host for remote KB if VUSB detect doesn't work. */
 // #define KEYBOARD_HOST // Force host mode
@@ -29,9 +28,6 @@
 #define MATRIX_COLS 16
 #define MATRIX_MUX_COLS 4
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 10
-
 /*
  * Keyboard Matrix Assignments
  * The nibble uses a demultiplexer for the cols.
@@ -56,7 +52,3 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_SLEEP
-
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B4 }
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index 33ae369936..5c69cb0e7e 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -7,6 +7,14 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 10,
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
index 631f28171a..33652005cb 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 #define KC_DISC_DEAF KC_F24
 
 enum custom_keycodes {
-  PROG = USER00,
+  PROG = QK_KB_0,
   DISC_MUTE,
   DISC_DEAF,
   SUPER_ALT_TAB,
diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index aab6a41af3..b71f9119ef 100644
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -24,11 +24,9 @@ enum layer_names {
 
 #define KC_DISC_MUTE KC_F23
 #define KC_DISC_DEAF KC_F24
-#define NUM_CUST_KEYCODES (_NUM_CUST_KCS - SAFE_RANGE)
-#define VIA_KEYCODE_RANGE USER00
 
 enum custom_keycodes {
-  PROG = SAFE_RANGE,
+  PROG = QK_KB_0,
   DISC_MUTE,
   DISC_DEAF,
   SUPER_ALT_TAB,
@@ -76,17 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void map_via_keycode(uint16_t * keycode) {
-  if (abs(*keycode - VIA_KEYCODE_RANGE) < NUM_CUST_KEYCODES) { //make into macro?
-    dprintf("VIA custom keycode found, mapping to QMK keycode.\n");
-    uint16_t new_keycode = (*keycode - VIA_KEYCODE_RANGE) + SAFE_RANGE;
-    dprintf("VIA KC: %u QMK KC: %u\n", *keycode, new_keycode);
-    *keycode = new_keycode;
-  }
-}
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  map_via_keycode(&keycode);
   // Send keystrokes to host keyboard, if connected (see readme)
   process_record_remote_kb(keycode, record);
   switch(keycode) {
diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk
index f33bfbb9b8..0d5d3e2aac 100644
--- a/keyboards/nullbitsco/nibble/rules.mk
+++ b/keyboards/nullbitsco/nibble/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/nullbitsco/scramble/info.json b/keyboards/nullbitsco/scramble/info.json
index cc5fd28d76..32bb6f299e 100644
--- a/keyboards/nullbitsco/scramble/info.json
+++ b/keyboards/nullbitsco/scramble/info.json
@@ -8,34 +8,16 @@
         "pid": "0x6062",
         "device_version": "0.0.1"
     },
+    "debounce": 10,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "n",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                }
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }
diff --git a/keyboards/nullbitsco/scramble/scramble.c b/keyboards/nullbitsco/scramble/scramble.c
deleted file mode 100644
index c8a55e0d48..0000000000
--- a/keyboards/nullbitsco/scramble/scramble.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Jay Greco
-
-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/>.
-*/
-
-#include QMK_KEYBOARD_H
diff --git a/keyboards/nullbitsco/scramble/scramble.h b/keyboards/nullbitsco/scramble/scramble.h
deleted file mode 100644
index 22c112040b..0000000000
--- a/keyboards/nullbitsco/scramble/scramble.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Jay Greco
- *
- * 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
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_nullbitsco_scramble_v1)
-  #include "v1.h"
-#elif defined(KEYBOARD_nullbitsco_scramble_v2)
-  #include "v2.h"
-#endif
-
-// Layout is the same in all revisions
-#define LAYOUT( \
-    K01, K02, K03, \
-    K11, K12, K13  \
-) { \
-   {K01, K02, K03}, \
-   {K11, K12, K13}, \
-}
diff --git a/keyboards/nullbitsco/scramble/v1/config.h b/keyboards/nullbitsco/scramble/v1/config.h
index b249b99851..bb0ee7d785 100644
--- a/keyboards/nullbitsco/scramble/v1/config.h
+++ b/keyboards/nullbitsco/scramble/v1/config.h
@@ -19,18 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-#define DIRECT_PINS {{D4,D5,B1}, {C3,C2,C1}}
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 10
-
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { D6 }
-#define ENCODERS_PAD_B { D7 }
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json
new file mode 100644
index 0000000000..77a00d91f4
--- /dev/null
+++ b/keyboards/nullbitsco/scramble/v1/info.json
@@ -0,0 +1,15 @@
+{
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D6", "pin_b": "D7"}
+        ]
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "D5", "B1"],
+            ["C3", "C2", "C1"]
+        ]
+    }
+}
diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk
index c1cf175c64..f917d68f4e 100644
--- a/keyboards/nullbitsco/scramble/v1/rules.mk
+++ b/keyboards/nullbitsco/scramble/v1/rules.mk
@@ -1,11 +1,3 @@
-# NOTE: This file is specific to AVR builds.
-
-# MCU name
-MCU = atmega328p
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/nullbitsco/scramble/v1/v1.h b/keyboards/nullbitsco/scramble/v1/v1.h
index 5dc6d4a0e8..5c0b62357f 100644
--- a/keyboards/nullbitsco/scramble/v1/v1.h
+++ b/keyboards/nullbitsco/scramble/v1/v1.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "scramble.h"
+#include "quantum.h"
 
 // Indication LED settings
 #define LED_ON          2
diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h
index a2eb9712f9..d3b3c44222 100644
--- a/keyboards/nullbitsco/scramble/v2/config.h
+++ b/keyboards/nullbitsco/scramble/v2/config.h
@@ -19,24 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-#define DIRECT_PINS {{GP6,GP8,GP10}, {GP29,GP28,GP22}}
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 10
-
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { GP24 }
-#define ENCODERS_PAD_B { GP25 }
 #define TAP_CODE_DELAY 10
 
 /* RP2040-specific defines*/
 #define RP2040_FLASH_GENERIC_03H
 #define I2C1_SDA_PIN GP26
 #define I2C1_SCL_PIN GP27
-#define I2C_DRIVER I2CD2
+#define I2C_DRIVER I2CD1
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json
new file mode 100644
index 0000000000..5255c32205
--- /dev/null
+++ b/keyboards/nullbitsco/scramble/v2/info.json
@@ -0,0 +1,15 @@
+{
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP24", "pin_b": "GP25"}
+        ]
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP8", "GP10"],
+            ["GP29", "GP28", "GP22"]
+        ]
+    }
+}
diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk
index f93963285b..f917d68f4e 100644
--- a/keyboards/nullbitsco/scramble/v2/rules.mk
+++ b/keyboards/nullbitsco/scramble/v2/rules.mk
@@ -1,11 +1,3 @@
-# NOTE: This file is is specific to RP2040 builds.
-
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/nullbitsco/scramble/v2/v2.h b/keyboards/nullbitsco/scramble/v2/v2.h
index d278c0a86a..c86282f658 100644
--- a/keyboards/nullbitsco/scramble/v2/v2.h
+++ b/keyboards/nullbitsco/scramble/v2/v2.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "scramble.h"
+#include "quantum.h"
 #include <hal.h>
 
 enum led_mode {
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 5e3d640dbd..23b2f5f1a4 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
 
 /* Used to set remote for remote KB if VUSB detect doesn't work. */
 // #define KEYBOARD_REMOTE
@@ -23,10 +22,6 @@
 // Workaround for freezing after MacOS sleep
 #define USB_SUSPEND_WAKEUP_DELAY 200
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 6
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B1, E6, D7, C6, D4 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, F4, F5, F6, F7 }
@@ -47,8 +42,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* Optional encoder pins */
-// Encoders are defined in order. 1: B2 & B3, 2: B4 & B5, 3: D0 & D1, 4: D2 & D3
-#define ENCODERS_PAD_A { B2, B4, D0, D3 }
-#define ENCODERS_PAD_B { B3, B5, D1, D2 }
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index 7b9c4eb8ae..cce2a2902c 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -7,6 +7,16 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"},
+            {"pin_a": "B4", "pin_b": "B5"},
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "D3", "pin_b": "D2"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk
index 13893a69e2..3b7ff078bb 100644
--- a/keyboards/nullbitsco/tidbit/rules.mk
+++ b/keyboards/nullbitsco/tidbit/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #