Miscellaneous keyboard.json migrations (#23378)

3 files changed, 281 insertions, 1 deletions

diff --git a/keyboards/canary/canary60rgb/v1/keyboard.json b/keyboards/canary/canary60rgb/v1/keyboard.json
new file mode 100644
index 0000000000..ac1ba67de0
--- /dev/null
+++ b/keyboards/canary/canary60rgb/v1/keyboard.json
@@ -0,0 +1,161 @@
+{
+    "keyboard_name": "CANARY60RGB",
+    "manufacturer": "CANARY",
+    "url": "",
+    "maintainer": "tuananhnguyen204",
+    "usb": {
+        "vid": "0x4341",
+        "pid": "0x0621",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "flower_blooming": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/canary/canary60rgb/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/canary/canary60rgb/v1/v1.c b/keyboards/canary/canary60rgb/v1/v1.c
new file mode 100644
index 0000000000..b14878ff22
--- /dev/null
+++ b/keyboards/canary/canary60rgb/v1/v1.c
@@ -0,0 +1,120 @@
+/* Copyright 2021 CANARYTEAM <tuananhnguyen204@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/>.
+ */
+ #include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW10_CS14, SW11_CS14,  SW12_CS14 },
+    { 0, SW10_CS13, SW11_CS13,  SW12_CS13 },
+    { 0, SW10_CS12, SW11_CS12,  SW12_CS12 },
+    { 0, SW10_CS11, SW11_CS11,  SW12_CS11 },
+    { 0, SW10_CS10, SW11_CS10,  SW12_CS10 },
+    { 0, SW10_CS9,  SW11_CS9,   SW12_CS9 },
+    { 0, SW10_CS8,  SW11_CS8,   SW12_CS8 },
+    { 0, SW10_CS7,  SW11_CS7,   SW12_CS7 },
+    { 0, SW10_CS6,  SW11_CS6,   SW12_CS6 },
+    { 0, SW10_CS5,  SW11_CS5,   SW12_CS5 },
+    { 0, SW10_CS4,  SW11_CS4,   SW12_CS4 },
+    { 0, SW10_CS3,  SW11_CS3,   SW12_CS3 },
+    { 0, SW10_CS2,  SW11_CS2,   SW12_CS2 },
+    { 0, SW10_CS1,  SW11_CS1,   SW12_CS1 },
+
+    { 0, SW7_CS14, SW8_CS14,  SW9_CS14 },
+    { 0, SW7_CS13, SW8_CS13,  SW9_CS13 },
+    { 0, SW7_CS12, SW8_CS12,  SW9_CS12 },
+    { 0, SW7_CS11, SW8_CS11,  SW9_CS11 },
+    { 0, SW7_CS10, SW8_CS10,  SW9_CS10 },
+    { 0, SW7_CS9,  SW8_CS9,   SW9_CS9 },
+    { 0, SW7_CS8,  SW8_CS8,   SW9_CS8 },
+    { 0, SW7_CS7,  SW8_CS7,   SW9_CS7 },
+    { 0, SW7_CS6,  SW8_CS6,   SW9_CS6 },
+    { 0, SW7_CS5,  SW8_CS5,   SW9_CS5 },
+    { 0, SW7_CS4,  SW8_CS4,   SW9_CS4 },
+    { 0, SW7_CS3,  SW8_CS3,   SW9_CS3 },
+    { 0, SW7_CS2,  SW8_CS2,   SW9_CS2 },
+    { 0, SW7_CS1,  SW8_CS1,   SW9_CS1 },
+
+    { 0, SW4_CS14, SW5_CS14,  SW6_CS14 },
+    { 0, SW4_CS12, SW5_CS12,  SW6_CS12 },
+    { 0, SW4_CS11, SW5_CS11,  SW6_CS11 },
+    { 0, SW4_CS10, SW5_CS10,  SW6_CS10 },
+    { 0, SW4_CS9,  SW5_CS9,   SW6_CS9 },
+    { 0, SW4_CS8,  SW5_CS8,   SW6_CS8 },
+    { 0, SW4_CS7,  SW5_CS7,   SW6_CS7 },
+    { 0, SW4_CS6,  SW5_CS6,   SW6_CS6 },
+    { 0, SW4_CS5,  SW5_CS5,   SW6_CS5 },
+    { 0, SW4_CS4,  SW5_CS4,   SW6_CS4 },
+    { 0, SW4_CS3,  SW5_CS3,   SW6_CS3 },
+    { 0, SW4_CS2,  SW5_CS2,   SW6_CS2 },
+    { 0, SW4_CS1,  SW5_CS1,   SW6_CS1 },
+
+    { 0, SW1_CS14, SW2_CS14,  SW3_CS14 },
+    { 0, SW1_CS13, SW2_CS13,  SW3_CS13 },
+    { 0, SW1_CS11, SW2_CS11,  SW3_CS11 },
+    { 0, SW1_CS10, SW2_CS10,  SW3_CS10 },
+    { 0, SW1_CS9,  SW2_CS9,   SW3_CS9 },
+    { 0, SW1_CS8,  SW2_CS8,   SW3_CS8 },
+    { 0, SW1_CS7,  SW2_CS7,   SW3_CS7 },
+    { 0, SW1_CS6,  SW2_CS6,   SW3_CS6 },
+    { 0, SW1_CS5,  SW2_CS5,   SW3_CS5 },
+    { 0, SW1_CS4,  SW2_CS4,   SW3_CS4 },
+    { 0, SW1_CS3,  SW2_CS3,   SW3_CS3 },
+    { 0, SW1_CS2,  SW2_CS2,   SW3_CS2 },
+    { 0, SW1_CS1,  SW2_CS1,   SW3_CS1 },
+
+    { 0, SW1_CS15, SW2_CS15,  SW3_CS15 },
+    { 0, SW4_CS13, SW5_CS13,  SW6_CS13 },
+    { 0, SW1_CS12, SW2_CS12,  SW3_CS12 },
+    { 0, SW4_CS15, SW5_CS15,  SW6_CS15 },
+    { 0, SW7_CS15, SW8_CS15,  SW9_CS15 },
+    { 0, SW1_CS16, SW2_CS16,  SW3_CS16 },
+    { 0, SW4_CS16, SW5_CS16,  SW6_CS16 },
+    { 0, SW7_CS16, SW8_CS16,  SW9_CS16 },
+    { 0, SW10_CS16, SW11_CS16,  SW12_CS16 }
+};
+
+led_config_t g_led_config = {
+    {
+        { 13, 12, 11,     10,      9,  8,      7,      6,  5,  4,  3,  2,      1,  0 },
+        { 27, 26, 25,     24,     23, 22,     21,     20, 19, 18, 17, 16,     15, 14 },
+        { 40, 39, 38,     37,     36, 35,     34,     33, 32, 31, 30, 29, NO_LED, 28 },
+        { 53, 52, 51,     50,     49, 48,     47,     46, 45, 44, 43, 42, NO_LED, 41 },
+        { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 }
+    }, {
+        { 216,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
+        { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
+        { 214,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 },               {   6,  32 },
+        { 224,  48 },               { 208,  48 }, { 186,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  36,  48 }, {   9,  48 },
+        { 224,  64 }, { 208,  64 }, { 192,  64 },                                           { 176,  64 },                             { 160,  64 }, { 102,  64 }, {  42,  64 }, {  22,  64 }, {   2,  64 }
+    }, {
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        1,    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1,          1,       1, 4, 1, 1, 1
+    }
+};
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
+    }
+    return true;
+}
+#endif