Fixup for_science (qmk#19867)

freznel10 · Feb 17, 2023 · a0708b2 · a0708b2
1 parent 92f85ce
commit a0708b2
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 304 deletions.
diff --git a/keyboards/for_science/config.h b/keyboards/for_science/config.h
diff --git a/keyboards/for_science/for_science.c b/keyboards/for_science/for_science.c
diff --git a/keyboards/for_science/for_science.h b/keyboards/for_science/for_science.h
diff --git 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
@@ -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