Merge branch 'develop'

5 files changed, 65 insertions, 92 deletions

diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 95bf0d9b87..7240672afe 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
-#define MATRIX_COL_PINS { A6, A7, A8, A9, A10, B0, B1, B2, B6, B7, C13, C14, C15 }
-
-#define DIODE_DIRECTION ROW2COL
 #define TAPPING_TOGGLE 2
 
 #ifdef RGB_MATRIX_ENABLE
     #define WS2812_SPI SPID1
     #define WS2812_SPI_MOSI_PAL_MODE 5
-    #define RGB_DI_PIN B5
     #define RGBLED_NUM 52
     #define RGB_MATRIX_LED_COUNT RGBLED_NUM
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 3ece3f5dba..827e0fec0e 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -8,6 +8,18 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "spi"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
+        "rows": ["A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
@@ -17,61 +29,61 @@
     "layouts": {
         "LAYOUT_ortho_4x13": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Å", "x":11, "y":0},
-                {"label":"¨", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
 
-                {"label":"Esc", "x":0, "y":1},
-                {"label":"A", "x":1, "y":1},
-                {"label":"S", "x":2, "y":1},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1},
-                {"label":"G", "x":5, "y":1},
-                {"label":"H", "x":6, "y":1},
-                {"label":"J", "x":7, "y":1},
-                {"label":"K", "x":8, "y":1},
-                {"label":"L", "x":9, "y":1},
-                {"label":"Ö", "x":10, "y":1},
-                {"label":"Ä", "x":11, "y":1},
-                {"label":"'", "x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
 
-                {"label":"Shift", "x":0, "y":2},
-                {"label":"Z", "x":1, "y":2},
-                {"label":"X", "x":2, "y":2},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2},
-                {"label":"B", "x":5, "y":2},
-                {"label":"N", "x":6, "y":2},
-                {"label":"M", "x":7, "y":2},
-                {"label":",", "x":8, "y":2},
-                {"label":".", "x":9, "y":2},
-                {"label":"-", "x":10, "y":2},
-                {"label":"Up", "x":11, "y":2},
-                {"label":"Backspace", "x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
 
-                {"label":"Ctrl", "x":0, "y":3},
-                {"label":"Alt", "x":1, "y":3},
-                {"label":"GUI", "x":2, "y":3},
-                {"label":"Fn1", "x":3, "y":3},
-                {"label":"Space", "x":4, "y":3},
-                {"label":"NoOp", "x":5, "y":3},
-                {"label":"Fn2", "x":6, "y":3},
-                {"label":"Alt Gr", "x":7, "y":3},
-                {"label":"<", "x":8, "y":3},
-                {"label":"Enter", "x":9, "y":3},
-                {"label":"Left", "x":10, "y":3},
-                {"label":"Down", "x":11, "y":3},
-                {"label":"Right", "x":12, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/nack/nack.c b/keyboards/nack/nack.c
index 8433e551c4..27e029a9fd 100644
--- a/keyboards/nack/nack.c
+++ b/keyboards/nack/nack.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
@@ -37,4 +37,3 @@
       4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
     } };
 #endif
-
diff --git a/keyboards/nack/nack.h b/keyboards/nack/nack.h
deleted file mode 100644
index b409d40df3..0000000000
--- a/keyboards/nack/nack.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 farfalleflickan <farfalleflickan@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
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x13( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,\
-    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
-    k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38,\
-    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51\
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 },\
-    { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25 },\
-    { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38 },\
-    { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51 },\
-}
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
index ff4148699a..d2558648dd 100644
--- a/keyboards/nack/rules.mk
+++ b/keyboards/nack/rules.mk
@@ -11,7 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = spi
 AUDIO_DRIVER = dac_basic 	# How to drive the 2 speakers
 UNICODE_ENABLE = yes        # Unicode support