Merge remote-tracking branch 'upstream/develop'

7 files changed, 35 insertions, 96 deletions

diff --git a/keyboards/ktec/staryu/backlight_staryu.h b/keyboards/ktec/staryu/backlight_staryu.h
index b90350e28b..34511da5c1 100644
--- a/keyboards/ktec/staryu/backlight_staryu.h
+++ b/keyboards/ktec/staryu/backlight_staryu.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Add backwards compatibility for existing keymaps
 static inline void backlight_set_value(uint8_t index, uint8_t level) {
-  static const uint8_t backlight_pins[BACKLIGHT_LED_COUNT] = BACKLIGHT_PINS;
+  static const uint8_t backlight_pins[] = BACKLIGHT_PINS;
   if (level) {
       setPinOutput(backlight_pins[index]);
   } else {
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index b8abd983c5..23c362c0aa 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -16,18 +16,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 2
-#define MATRIX_COLS 3
-
-/* key matrix pins */
-#define DIRECT_PINS { \
-    { NO_PIN, D0,     D1 }, \
-    { D4,     D3,     D2 }, \
-}
-
 #define RGB_DI_PIN C6
 #define RGBLED_NUM 1     // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
@@ -41,22 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 200
-// #ifdef RGB_DI_PIN
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// #endif
-
-#undef BACKLIGHT_PIN
-#define BACKLIGHT_PINS { C2, C7, D5, D6, B0 }
-#define BACKLIGHT_LED_COUNT 5
-#define BACKLIGHT_LEVELS 10
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index 8971ec7021..02189fecf7 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -8,9 +8,30 @@
         "pid": "0x2328",
         "device_version": "2.0.5"
     },
+    "backlight": {
+        "pins": ["C2", "C7", "D5", "D6", "B0"],
+        "levels": 10
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "processor": "atmega32u2",
+    "bootloader": "lufa-dfu",
+    "matrix_pins": {
+        "direct": [
+            [null, "D0", "D1"],
+            ["D4", "D3", "D2"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}]
+            "layout": [
+                {"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/ktec/staryu/keymaps/krusli/keymap.c b/keyboards/ktec/staryu/keymaps/krusli/keymap.c
index 1db6857348..3fe539106d 100644
--- a/keyboards/ktec/staryu/keymaps/krusli/keymap.c
+++ b/keyboards/ktec/staryu/keymaps/krusli/keymap.c
@@ -59,21 +59,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_LAYER0] = LAYOUT(                 \
-             KC_ESC,     TO(_LAYER1), \
-    KC_Z,    KC_X,       KC_ENT       \
+  [_LAYER0] = LAYOUT(
+             KC_ESC,     TO(_LAYER1),
+    KC_Z,    KC_X,       KC_ENT
   ),
-  [_LAYER1] = LAYOUT(                 \
-             MUTE,       TO(_LAYER2), \
-    GIT_ADD, GIT_COMMIT, GIT_PUSH     \
+  [_LAYER1] = LAYOUT(
+             MUTE,       TO(_LAYER2),
+    GIT_ADD, GIT_COMMIT, GIT_PUSH
   ),
-  [_LAYER2] = LAYOUT(                 \
-             RGB_MOD,    TO(_LAYER3), \
-    RGB_TOG, RGB_HUD,    RGB_HUI      \
+  [_LAYER2] = LAYOUT(
+             RGB_MOD,    TO(_LAYER3),
+    RGB_TOG, RGB_HUD,    RGB_HUI
   ),
-  [_LAYER3] = LAYOUT(                 \
-             RGB_VAI,    TO(_LAYER0), \
-    RGB_SAD, RGB_VAD,    RGB_SAI      \
+  [_LAYER3] = LAYOUT(
+             RGB_VAI,    TO(_LAYER0),
+    RGB_SAD, RGB_VAD,    RGB_SAI
   )
 };
 
diff --git a/keyboards/ktec/staryu/rules.mk b/keyboards/ktec/staryu/rules.mk
index 73b1a47953..8a6e2c7b71 100755
--- a/keyboards/ktec/staryu/rules.mk
+++ b/keyboards/ktec/staryu/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u2
-
-# Bootloader selection
-BOOTLOADER = lufa-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/ktec/staryu/staryu.c b/keyboards/ktec/staryu/staryu.c
deleted file mode 100755
index 4adadf2015..0000000000
--- a/keyboards/ktec/staryu/staryu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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 "staryu.h"
diff --git a/keyboards/ktec/staryu/staryu.h b/keyboards/ktec/staryu/staryu.h
deleted file mode 100755
index bdce5806f7..0000000000
--- a/keyboards/ktec/staryu/staryu.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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
-
-#define LAYOUT( \
-	     K01, K02, \
-	K10, K11, K12  \
-) { \
-	{ ___, K01, K02 }, \
-	{ K10, K11, K12 }  \
-}