Merge remote-tracking branch 'upstream/develop'

5 files changed, 22 insertions, 79 deletions

diff --git a/keyboards/leafcutterlabs/bigknob/bigknob.c b/keyboards/leafcutterlabs/bigknob/bigknob.c
deleted file mode 100644
index 4fcb70e748..0000000000
--- a/keyboards/leafcutterlabs/bigknob/bigknob.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Craig Gardner 
-  * 
-  * 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 "bigknob.h"
\ No newline at end of file
diff --git a/keyboards/leafcutterlabs/bigknob/bigknob.h b/keyboards/leafcutterlabs/bigknob/bigknob.h
deleted file mode 100644
index bb8e3fcaaf..0000000000
--- a/keyboards/leafcutterlabs/bigknob/bigknob.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Craig Gardner
- *
- * 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 LAYOUT_ortho_1x5( \
-    k01, k02, k03, k04, k05\
-  ) { \
-    { k01, k02, k03, k04, k05 } \
-}
-
-#define LAYOUT LAYOUT_ortho_1x5 
\ No newline at end of file
diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h
index 961a477bfb..3c6bf4e8a9 100644
--- a/keyboards/leafcutterlabs/bigknob/config.h
+++ b/keyboards/leafcutterlabs/bigknob/config.h
@@ -17,34 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 5
-
-/*
- * 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
- *
-*/
-
-// Srating with closest to USB port
-#define DIRECT_PINS {   \
-    { B7, D4, D6, F6, F7} \
-}
-
-/* rotary encoder 1,2,3 closest to usb port is 0*/
-#define ENCODERS_PAD_A { D0}
-#define ENCODERS_PAD_B { D2}
-#define ENCODER_RESOLUTION 4 //default/suggested
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN C7 //D3 - underglow C7 - backlight
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json
index 39ace77b12..55d5fe13ee 100644
--- a/keyboards/leafcutterlabs/bigknob/info.json
+++ b/keyboards/leafcutterlabs/bigknob/info.json
@@ -8,9 +8,30 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D0", "pin_b": "D2"}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["B7", "D4", "D6", "F6", "F7"]
+    ]
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_1x5"
+  },
   "layouts": {
     "LAYOUT_ortho_1x5": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}]
+      "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":4, "y":0, "matrix": [0, 4]}
+      ]
     }
   }
 }
diff --git a/keyboards/leafcutterlabs/bigknob/rules.mk b/keyboards/leafcutterlabs/bigknob/rules.mk
index c4c90ab7b2..5a3a85a3eb 100644
--- a/keyboards/leafcutterlabs/bigknob/rules.mk
+++ b/keyboards/leafcutterlabs/bigknob/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #