Merge branch 'develop'

5 files changed, 111 insertions, 167 deletions

diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h
index d3eee645bf..2f4f0fac76 100644
--- a/keyboards/phage_studio/pila87/config.h
+++ b/keyboards/phage_studio/pila87/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { A1, A2, A10, A9, A8, C9 }
-#define MATRIX_COL_PINS { B5, B4,  B6, C0, C1, C2, C3, B7, B3, D2, C12, C11, C10, A15, C15, C13, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 91
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
@@ -32,9 +24,6 @@
     #define RGB_MATRIX_KEYPRESSES
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
-    /* RGB Matrix config */
-    #define RGB_DI_PIN A4
-
     /* RGB Matrix effect */
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index 5bba67c683..522cd9c548 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -8,106 +8,127 @@
         "pid": "0x5887",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"],
+        "rows": ["A1", "A2", "A10", "A9", "A8", "C9"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C14",
         "scroll_lock": "A0"
     },
+    "ws2812": {
+        "pin": "A4"
+    },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
 
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":7, "y":1.5},
-                {"label":"8*", "x":8, "y":1.5},
-                {"label":"9(", "x":9, "y":1.5},
-                {"label":"0)", "x":10, "y":1.5},
-                {"label":"-_", "x":11, "y":1.5},
-                {"label":"=+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"App", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/phage_studio/pila87/pila87.c b/keyboards/phage_studio/pila87/pila87.c
index 23304c03bb..3425e0abf5 100644
--- a/keyboards/phage_studio/pila87/pila87.c
+++ b/keyboards/phage_studio/pila87/pila87.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pila87.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/phage_studio/pila87/pila87.h b/keyboards/phage_studio/pila87/pila87.h
deleted file mode 100644
index 771410333b..0000000000
--- a/keyboards/phage_studio/pila87/pila87.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2022 Phage Studio
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 XXX KC_NO
-
-/* ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
- * │00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
- * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4D        │     │4F │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
- * │50  │51  │52  │55                      │5A  │5B  │5C  │5D  │ │5E │5F │5G │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- */
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05,   K06, K07, K08, K09,    K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
-     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,   K2E, K2F, K2G, \
-      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
-       K40,    K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4F,      \
-    K50,  K51,  K52,                K55,                K5A,  K5B,  K5C,  K5D,  K5E, K5F, K5G  \
-)\
-{\
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, K4F, XXX }, \
-    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk
index ffe0bc9f39..05f967d7a8 100644
--- a/keyboards/phage_studio/pila87/rules.mk
+++ b/keyboards/phage_studio/pila87/rules.mk
@@ -1,15 +1,5 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-# Cannot use `BOOTLOADER = stm32duino` due to the need to override
-# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually.
-OPT_DEFS += -DBOOTLOADER_STM32DUINO
-MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
-BOOTLOADER_TYPE = stm32duino
-DFU_ARGS = -d 1EAF:0003 -a 2 -R
-DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
 
 # Build Options
 #   change yes to no to disable
@@ -29,7 +19,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 # Wear-levelling driver
 EEPROM_DRIVER = wear_leveling