Fixup for_science (#19867)

5 files changed, 69 insertions, 304 deletions

diff --git a/keyboards/for_science/config.h b/keyboards/for_science/config.h
deleted file mode 100644
index d767b95df8..0000000000
--- a/keyboards/for_science/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2017 Paul James (paul@peej.co.uk)
-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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-//#define MATRIX_ROW_PINS { F6, B1, B3, B2, B6 }
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-//#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 }
-
-//#define USE_I2C
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION ROW2COL
-
-//#define MASTER_RIGHT
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/for_science/for_science.c b/keyboards/for_science/for_science.c
deleted file mode 100644
index 32956ca673..0000000000
--- a/keyboards/for_science/for_science.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Paul James (paul@peej.co.uk)
- *
- * 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 "for_science.h"
diff --git a/keyboards/for_science/for_science.h b/keyboards/for_science/for_science.h
deleted file mode 100644
index 09362a5286..0000000000
--- a/keyboards/for_science/for_science.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2017 Paul James (paul@peej.co.uk)
- *
- * 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_split_4x5_3( \
-    L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
-    L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
-    L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
-    L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \
-              LT1, LT2, LT3, RT1, RT2, RT3 \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32, L33, L34 }, \
-    { KC_NO, KC_NO, LT1, LT2, LT3 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { R34, R33, R32, R31, R30 }, \
-    { KC_NO, KC_NO, RT3, RT2, RT1 } \
-}
diff --git a/keyboards/for_science/info.json b/keyboards/for_science/info.json
index ec40cb4884..2864385fb0 100644
--- a/keyboards/for_science/info.json
+++ b/keyboards/for_science/info.json
@@ -9,197 +9,81 @@
         "device_version": "0.0.1"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_split_4x5_3": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "x": 7.25,
-                    "y": 0
-                },
-                {
-                    "x": 8.25,
-                    "y": 0
-                },
-                {
-                    "x": 9.25,
-                    "y": 0
-                },
-                {
-                    "x": 10.25,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "x": 6.25,
-                    "y": 1
-                },
-                {
-                    "x": 7.25,
-                    "y": 1
-                },
-                {
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "x": 6.25,
-                    "y": 2
-                },
-                {
-                    "x": 7.25,
-                    "y": 2
-                },
-                {
-                    "x": 8.25,
-                    "y": 2
-                },
-                {
-                    "x": 9.25,
-                    "y": 2
-                },
-                {
-                    "x": 10.25,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "x": 4,
-                    "y": 4
-                },
-                {
-                    "x": 6.25,
-                    "y": 4
-                },
-                {
-                    "x": 7.25,
-                    "y": 4
-                },
-                {
-                    "x": 8.25,
-                    "y": 4
-                }
+                { "label": "L00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+
+                { "label": "R00", "matrix": [5, 0], "w": 1, "x": 6.25, "y": 0 },
+                { "label": "R01", "matrix": [5, 1], "w": 1, "x": 7.25, "y": 0 },
+                { "label": "R02", "matrix": [5, 2], "w": 1, "x": 8.25, "y": 0 },
+                { "label": "R03", "matrix": [5, 3], "w": 1, "x": 9.25, "y": 0 },
+                { "label": "R04", "matrix": [5, 4], "w": 1, "x": 10.25, "y": 0 },
+
+                { "label": "L10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
+                { "label": "L11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
+                { "label": "L12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+                { "label": "L13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
+                { "label": "L14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 },
+
+                { "label": "R10", "matrix": [6, 0], "w": 1, "x": 6.25, "y": 1 },
+                { "label": "R11", "matrix": [6, 1], "w": 1, "x": 7.25, "y": 1 },
+                { "label": "R12", "matrix": [6, 2], "w": 1, "x": 8.25, "y": 1 },
+                { "label": "R13", "matrix": [6, 3], "w": 1, "x": 9.25, "y": 1 },
+                { "label": "R14", "matrix": [6, 4], "w": 1, "x": 10.25, "y": 1 },
+
+                { "label": "L20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
+                { "label": "L21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
+                { "label": "L22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+                { "label": "L23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
+                { "label": "L24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
+
+                { "label": "R20", "matrix": [7, 0], "w": 1, "x": 6.25, "y": 2 },
+                { "label": "R21", "matrix": [7, 1], "w": 1, "x": 7.25, "y": 2 },
+                { "label": "R22", "matrix": [7, 2], "w": 1, "x": 8.25, "y": 2 },
+                { "label": "R23", "matrix": [7, 3], "w": 1, "x": 9.25, "y": 2 },
+                { "label": "R24", "matrix": [7, 4], "w": 1, "x": 10.25, "y": 2 },
+
+                { "label": "L30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
+                { "label": "L31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
+                { "label": "L32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
+                { "label": "L33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 },
+                { "label": "L34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 },
+
+                { "label": "R30", "matrix": [8, 0], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "R31", "matrix": [8, 1], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "R32", "matrix": [8, 2], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "R33", "matrix": [8, 3], "w": 1, "x": 9.25, "y": 3 },
+                { "label": "R34", "matrix": [8, 4], "w": 1, "x": 10.25, "y": 3 },
+
+                { "label": "LT1", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
+                { "label": "LT2", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 },
+                { "label": "LT3", "matrix": [4, 4], "w": 1, "x": 4, "y": 4 },
+
+                { "label": "RT1", "matrix": [9, 0], "w": 1, "x": 6.25, "y": 4 },
+                { "label": "RT2", "matrix": [9, 1], "w": 1, "x": 7.25, "y": 4 },
+                { "label": "RT3", "matrix": [9, 2], "w": 1, "x": 8.25, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/for_science/rules.mk b/keyboards/for_science/rules.mk
index 309e55c9f4..6e7633bfe0 100644
--- a/keyboards/for_science/rules.mk
+++ b/keyboards/for_science/rules.mk
@@ -1,12 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank