Merge remote-tracking branch 'upstream/develop'

5 files changed, 28 insertions, 86 deletions

diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index 35782781c1..c06c192e0d 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -17,29 +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  4
-#define MATRIX_COLS  3
-
-/*
- * Keyboard Matrix Assignments
- */
-#define DIRECT_PINS { \
-    { C6, D6, D5 }, \
-    { C7, F7, D4 }, \
-    { E6, F5, F6 }, \
-    { F0, F1, F4 }, \
-}
-
-#define ENCODERS_PAD_A { B4 }
-#define ENCODERS_PAD_B { D7 }
-
-// #define QMK_ESC_OUTPUT B7
-// #define QMK_ESC_INPUT C6
-// #define QMK_SPEAKER B6
-
 #define AUDIO_PIN B6
 #define AUDIO_CLICKY
 #define NO_MUSIC_MODE
@@ -57,17 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_TWINKLE
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE           5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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 FB_ERM_LRA         0
 #define FB_BRAKEFACTOR     3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
 #define FB_LOOPGAIN        1 /* For  Low:0, Medium:1, High:2, Very High:3 */
@@ -78,7 +44,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DRV_GREETING       alert_750ms
 #define DRV_MODE_DEFAULT   buzz
-// EC11K encoders have a different resolution than other EC11 encoders.
-// When using the default resolution of 4, if you notice your encoder skipping
-// every other tick, lower the resolution to 2.
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 0afcbe5b6e..077421904c 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -8,21 +8,36 @@
         "pid": "0xF75B",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D6", "D5"],
+            ["C7", "F7", "D4"],
+            ["E6", "F5", "F6"],
+            ["F0", "F1", "F4"]
+        ]
+    },
     "layouts": {
         "LAYOUT_ortho_4x3": {
             "layout": [
-                {"label":"K00 (B0,B4)", "x":0, "y":1},
-                {"label":"K01 (B0,B5)", "x":1, "y":1},
-                {"label":"K02 (B0,B6)", "x":2, "y":1},
-                {"label":"K10 (B1,B4)", "x":0, "y":2},
-                {"label":"K11 (B1,B5)", "x":1, "y":2},
-                {"label":"K12 (B1,B6)", "x":2, "y":2},
-                {"label":"K20 (B2,B4)", "x":0, "y":3},
-                {"label":"K21 (B2,B5)", "x":1, "y":3},
-                {"label":"K22 (B2,B6)", "x":2, "y":3},
-                {"label":"K30 (B3,B4)", "x":0, "y":4},
-                {"label":"K31 (B3,B5)", "x":1, "y":4},
-                {"label":"K32 (B3,B6)", "x":2, "y":4}
+                {"x":0, "y":1, "matrix": [0, 0]},
+                {"x":1, "y":1, "matrix": [0, 1]},
+                {"x":2, "y":1, "matrix": [0, 2]},
+                {"x":0, "y":2, "matrix": [1, 0]},
+                {"x":1, "y":2, "matrix": [1, 1]},
+                {"x":2, "y":2, "matrix": [1, 2]},
+                {"x":0, "y":3, "matrix": [2, 0]},
+                {"x":1, "y":3, "matrix": [2, 1]},
+                {"x":2, "y":3, "matrix": [2, 2]},
+                {"x":0, "y":4, "matrix": [3, 0]},
+                {"x":1, "y":4, "matrix": [3, 1]},
+                {"x":2, "y":4, "matrix": [3, 2]}
             ]
         }
     }
diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk
index 4de2f506eb..fb9a585656 100644
--- a/keyboards/splitkb/zima/rules.mk
+++ b/keyboards/splitkb/zima/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/splitkb/zima/zima.c b/keyboards/splitkb/zima/zima.c
index f39e3a39eb..2ac1f78d34 100644
--- a/keyboards/splitkb/zima/zima.c
+++ b/keyboards/splitkb/zima/zima.c
@@ -13,7 +13,7 @@
  * 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 "zima.h"
+#include "quantum.h"
 #include <stdio.h>
 
 #ifdef HAPTIC_ENABLE
diff --git a/keyboards/splitkb/zima/zima.h b/keyboards/splitkb/zima/zima.h
deleted file mode 100644
index dc492ef107..0000000000
--- a/keyboards/splitkb/zima/zima.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2019 Thomas Baart
- *
- * 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_4x3( \
-    k00, k01, k02, \
-    k03, k04, k05, \
-    k06, k07, k08, \
-    k09, k10, k11  \
-   ) { \
-    {k00, k01, k02}, \
-    {k03, k04, k05}, \
-    {k06, k07, k08}, \
-    {k09, k10, k11} }