10 files changed, 26 insertions, 89 deletions
diff --git a/keyboards/anavi/knob1/config.h b/keyboards/anavi/knob1/config.h
index f677aa9b23..338f5d8dbe 100644
--- a/keyboards/anavi/knob1/config.h
+++ b/keyboards/anavi/knob1/config.h
@@ -3,18 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Keyboard Matrix Assignments */
-// clang-format off
-#define DIRECT_PINS { \
-    { GP26 }  \
-}
-
 #define RGBLIGHT_DEFAULT_MODE 9
 
 /* Double tap reset button to enter bootloader */
@@ -23,7 +11,7 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
 
-#define I2C_DRIVER I2CD2
+#define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP6
 #define I2C1_SCL_PIN GP7
 
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
index 7ed1767a24..cb85035a22 100644
--- a/keyboards/anavi/knob1/info.json
+++ b/keyboards/anavi/knob1/info.json
@@ -5,7 +5,6 @@
     "maintainer": "leon-anavi",
     "processor": "RP2040",
     "bootloader": "rp2040",
-    "debounce": 5,
     "features": {
         "bootmagic": false,
         "command": false,
@@ -45,10 +44,15 @@
 	    }
         ]
     },
+    "matrix_pins": {
+        "direct": [
+            ["GP26"]
+        ]
+    },
     "layouts": {
         "LAYOUT_k1": {
             "layout": [
-                { "label":"Mute", "x": 0, "y": 0 }
+                { "x": 0, "y": 0, "matrix": [0, 0] }
             ]
         }
     },
diff --git a/keyboards/anavi/knob1/knob1.c b/keyboards/anavi/knob1/knob1.c
index cfc3ac8a65..c1ed7b7726 100644
--- a/keyboards/anavi/knob1/knob1.c
+++ b/keyboards/anavi/knob1/knob1.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Leon Anavi <leon@anavi.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "encoder.h"
+#include "quantum.h"
 #include <stdio.h>
 
 void keyboard_post_init_kb(void) {
diff --git a/keyboards/anavi/knob1/knob1.h b/keyboards/anavi/knob1/knob1.h
deleted file mode 100644
index c48170928c..0000000000
--- a/keyboards/anavi/knob1/knob1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2022 Leon Anavi <leon@anavi.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 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"
-
-#define ___ KC_NO
-
-// clang-format off
- #define LAYOUT_k1(  \
-   K02 \
- ) \
- { \
-   { K02 } \
- }
-// clang-format on
diff --git a/keyboards/anavi/macropad10/config.h b/keyboards/anavi/macropad10/config.h
index 8d81cf3675..e6f0591082 100644
--- a/keyboards/anavi/macropad10/config.h
+++ b/keyboards/anavi/macropad10/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index 92453494d5..526f673ab9 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -17,31 +17,8 @@ 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 4
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-#define DIRECT_PINS {   \
-    { D4, F6, B5, E6 }, \
-    { F5, F7, B4, C6 } \
-}
-
 #define BACKLIGHT_PIN D7
 #define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
 #define RGBLIGHT_SLEEP
 
 
diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json
index fd6d3bd0a1..b152a7c1f1 100644
--- a/keyboards/anavi/macropad8/info.json
+++ b/keyboards/anavi/macropad8/info.json
@@ -8,9 +8,26 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["D4", "F6", "B5", "E6"],
+      ["F5", "F7", "B4", "C6"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_2x4": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
+      "layout": [
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":3, "y":0, "matrix": [0, 3]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]},
+        {"x":3, "y":1, "matrix": [1, 3]}
+      ]
     }
   }
 }
diff --git a/keyboards/anavi/macropad8/macropad8.c b/keyboards/anavi/macropad8/macropad8.c
deleted file mode 100644
index 2859cd042d..0000000000
--- a/keyboards/anavi/macropad8/macropad8.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "macropad8.h"
diff --git a/keyboards/anavi/macropad8/macropad8.h b/keyboards/anavi/macropad8/macropad8.h
deleted file mode 100644
index 3ebee830d3..0000000000
--- a/keyboards/anavi/macropad8/macropad8.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
-    k01, k02, k03, k04, \
-    k05, k06, k07, k08  \
-  ) { \
-    { k01, k02, k03, k04 }, \
-    { k05, k06, k07, k08 } \
-}
diff --git a/keyboards/anavi/macropad8/rules.mk b/keyboards/anavi/macropad8/rules.mk
index c0f0e7f857..f5e38fc8cb 100644
--- a/keyboards/anavi/macropad8/rules.mk
+++ b/keyboards/anavi/macropad8/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #