summaryrefslogtreecommitdiff
path: root/keyboards/hillside/46
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hillside/46')
-rw-r--r--keyboards/hillside/46/0_1/0_1.c2
-rw-r--r--keyboards/hillside/46/0_1/0_1.h37
-rw-r--r--keyboards/hillside/46/0_1/info.json63
-rw-r--r--keyboards/hillside/46/info.json66
4 files changed, 64 insertions, 104 deletions
diff --git a/keyboards/hillside/46/0_1/0_1.c b/keyboards/hillside/46/0_1/0_1.c
index d958056801..1d7ac1f063 100644
--- a/keyboards/hillside/46/0_1/0_1.c
+++ b/keyboards/hillside/46/0_1/0_1.c
@@ -1,7 +1,7 @@
// Copyright 2022 Michael McCoyd (@mmccoyd)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "0_1.h"
+#include "quantum.h"
// Keymatrix spots to ignore, as one signals handedness and others have no key
const matrix_row_t matrix_mask[] = {
diff --git a/keyboards/hillside/46/0_1/0_1.h b/keyboards/hillside/46/0_1/0_1.h
deleted file mode 100644
index 880b244237..0000000000
--- a/keyboards/hillside/46/0_1/0_1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2022 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a mapping so keymap files can be more readable to humans.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts those identifiers into a two-dimensional array which
- * represents the switch matrix.
- *
- * The identifiers could be anything, but for human sanity have the folowing form
- * <Left or Right><Physical or thumb row><Circuit column counting from outer pinky>
- */
-
-// clang-format off
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, LT5, RT5, R25, R24, R23, R22, R21, R20, \
- LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { KC_NO, RT1, RT2, RT3, RT4, RT5 } \
- }
-// clang-format on
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
index f18bd158cc..549bff42a6 100644
--- a/keyboards/hillside/46/0_1/info.json
+++ b/keyboards/hillside/46/0_1/info.json
@@ -37,10 +37,71 @@
"rgblight": {
"led_count": 4,
- "pin": "D3",
"split": true,
"hue_steps": 8,
"saturation_steps": 8,
"brightness_steps": 8
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1.13},
+ {"matrix": [0, 1], "x": 1, "y": 0.93},
+ {"matrix": [0, 2], "x": 2.1, "y": 0.31},
+ {"matrix": [0, 3], "x": 3.2, "y": 0},
+ {"matrix": [0, 4], "x": 4.2, "y": 0.28},
+ {"matrix": [0, 5], "x": 5.2, "y": 0.42},
+
+ {"matrix": [4, 5], "x": 9.7, "y": 0.42},
+ {"matrix": [4, 4], "x": 10.7, "y": 0.28},
+ {"matrix": [4, 3], "x": 11.7, "y": 0},
+ {"matrix": [4, 2], "x": 12.8, "y": 0.31},
+ {"matrix": [4, 1], "x": 13.9, "y": 0.93},
+ {"matrix": [4, 0], "x": 14.9, "y": 1.13},
+
+ {"matrix": [1, 0], "x": 0.1, "y": 2.13},
+ {"matrix": [1, 1], "x": 1.1, "y": 1.93},
+ {"matrix": [1, 2], "x": 2.15, "y": 1.31},
+ {"matrix": [1, 3], "x": 3.2, "y": 1},
+ {"matrix": [1, 4], "x": 4.2, "y": 1.28},
+ {"matrix": [1, 5], "x": 5.2, "y": 1.42},
+
+ {"matrix": [5, 5], "x": 9.7, "y": 1.42},
+ {"matrix": [5, 4], "x": 10.7, "y": 1.28},
+ {"matrix": [5, 3], "x": 11.7, "y": 1},
+ {"matrix": [5, 2], "x": 12.75, "y": 1.31},
+ {"matrix": [5, 1], "x": 13.8, "y": 1.93},
+ {"matrix": [5, 0], "x": 14.8, "y": 2.13},
+
+ {"matrix": [2, 0], "x": 0.2, "y": 3.13},
+ {"matrix": [2, 1], "x": 1.2, "y": 2.93},
+ {"matrix": [2, 2], "x": 2.2, "y": 2.31},
+ {"matrix": [2, 3], "x": 3.2, "y": 2},
+ {"matrix": [2, 4], "x": 4.2, "y": 2.28},
+ {"matrix": [2, 5], "x": 5.2, "y": 2.42},
+ {"matrix": [3, 5], "x": 6.2, "y": 2.88},
+
+ {"matrix": [7, 5], "x": 8.7, "y": 2.88},
+ {"matrix": [6, 5], "x": 9.7, "y": 2.42},
+ {"matrix": [6, 4], "x": 10.7, "y": 2.28},
+ {"matrix": [6, 3], "x": 11.7, "y": 2},
+ {"matrix": [6, 2], "x": 12.7, "y": 2.31},
+ {"matrix": [6, 1], "x": 13.7, "y": 2.93},
+ {"matrix": [6, 0], "x": 14.7, "y": 3.13},
+
+ {"matrix": [3, 1], "x": 3.7, "y": 3.28},
+ {"matrix": [3, 2], "x": 4.7, "y": 3.42},
+ {"matrix": [3, 3], "x": 5.7, "y": 3.88},
+ {"matrix": [3, 4], "x": 6.7, "y": 4.44},
+
+ {"matrix": [7, 4], "x": 8.2, "y": 4.44},
+ {"matrix": [7, 3], "x": 9.2, "y": 3.88},
+ {"matrix": [7, 2], "x": 10.2, "y": 3.42},
+ {"matrix": [7, 1], "x": 11.2, "y": 3.28}
+ ]
+ }
}
}
diff --git a/keyboards/hillside/46/info.json b/keyboards/hillside/46/info.json
index 5af9add00f..67090583a9 100644
--- a/keyboards/hillside/46/info.json
+++ b/keyboards/hillside/46/info.json
@@ -5,69 +5,5 @@
"keyboard_name": "Hillside 46",
"url": "http://github.com/mmccoyd/hillside/",
- "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
-
- "layouts": {
- "LAYOUT": {
- "layout": [
-
- {"label": "`~", "x": 0, "y": 1.13},
- {"label": "Q", "x": 1, "y": 0.93},
- {"label": "W", "x": 2.1, "y": 0.31},
- {"label": "E", "x": 3.2, "y": 0},
- {"label": "R", "x": 4.2, "y": 0.28},
- {"label": "T", "x": 5.2, "y": 0.42},
-
- {"label": "Y", "x": 9.7, "y": 0.42},
- {"label": "U", "x": 10.7, "y": 0.28},
- {"label": "I", "x": 11.7, "y": 0},
- {"label": "O", "x": 12.8, "y": 0.31},
- {"label": "P", "x": 13.9, "y": 0.93},
- {"label": "Backspace", "x": 14.9, "y": 1.13},
-
-
- {"label": "Tab", "x": 0.1, "y": 2.13},
- {"label": "A", "x": 1.1, "y": 1.93},
- {"label": "S", "x": 2.15, "y": 1.31},
- {"label": "D", "x": 3.2, "y": 1},
- {"label": "F", "x": 4.2, "y": 1.28},
- {"label": "G", "x": 5.2, "y": 1.42},
-
- {"label": "H", "x": 9.7, "y": 1.42},
- {"label": "J", "x": 10.7, "y": 1.28},
- {"label": "K", "x": 11.7, "y": 1},
- {"label": "L", "x": 12.75, "y": 1.31},
- {"label": ";", "x": 13.8, "y": 1.93},
- {"label": "Enter", "x": 14.8, "y": 2.13},
-
-
- {"label": "Ctrl", "x": 0.2, "y": 3.13},
- {"label": "Z", "x": 1.2, "y": 2.93},
- {"label": "X", "x": 2.2, "y": 2.31},
- {"label": "C", "x": 3.2, "y": 2},
- {"label": "V", "x": 4.2, "y": 2.28},
- {"label": "B", "x": 5.2, "y": 2.42},
- {"label": "ESC", "x": 6.2, "y": 2.88},
-
- {"label": "CAP", "x": 8.7, "y": 2.88},
- {"label": "N", "x": 9.7, "y": 2.42},
- {"label": "M", "x": 10.7, "y": 2.28},
- {"label": ",", "x": 11.7, "y": 2},
- {"label": ".", "x": 12.7, "y": 2.31},
- {"label": "/", "x": 13.7, "y": 2.93},
- {"label": "'", "x": 14.7, "y": 3.13},
-
-
- {"label": "Gui", "x": 3.7, "y": 3.28},
- {"label": "Alt", "x": 4.7, "y": 3.42},
- {"label": "Shift", "x": 5.7, "y": 3.88},
- {"label": "Nav", "x": 6.7, "y": 4.44},
-
- {"label": "Sym", "x": 8.2, "y": 4.44},
- {"label": "Space", "x": 9.2, "y": 3.88},
- {"label": "Alt", "x": 10.2, "y": 3.42},
- {"label": "Gui", "x": 11.2, "y": 3.28}
- ]
- }
- }
+ "tags": ["split", "column stagger", "choc v1", "choc spaced" ]
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 04:48:54 +0000