diff options
author | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/peej/rosaline | |
parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) |
Merge branch 'develop'
Diffstat (limited to 'keyboards/peej/rosaline')
-rw-r--r-- | keyboards/peej/rosaline/config.h | 10 | ||||
-rw-r--r-- | keyboards/peej/rosaline/ortho/info.json | 131 | ||||
-rw-r--r-- | keyboards/peej/rosaline/ortho/ortho.h | 57 | ||||
-rw-r--r-- | keyboards/peej/rosaline/rosaline.c | 2 | ||||
-rw-r--r-- | keyboards/peej/rosaline/rosaline.h | 30 | ||||
-rw-r--r-- | keyboards/peej/rosaline/staggered/info.json | 217 | ||||
-rw-r--r-- | keyboards/peej/rosaline/staggered/matrix_diagram.md | 33 | ||||
-rw-r--r-- | keyboards/peej/rosaline/staggered/staggered.h | 57 |
8 files changed, 271 insertions, 266 deletions
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h index 0bd9a069d0..d36ddb96e9 100644 --- a/keyboards/peej/rosaline/config.h +++ b/keyboards/peej/rosaline/config.h @@ -16,11 +16,5 @@ #pragma once - -#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 } -#define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define USB_MAX_POWER_CONSUMPTION 100 +#define LED1 C5 +#define LED2 C4 diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json index 2be28d4ef6..9fb9d3cb40 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/info.json @@ -6,73 +6,82 @@ "usb": { "vid": "0x706A", "pid": "0x0003", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_4x15": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "x": 13, "y": 0 }, - { "x": 14, "y": 0 }, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 13, "y": 1 }, - { "x": 14, "y": 1 }, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, - { "x": 6, "y": 2 }, - { "x": 7, "y": 2 }, - { "x": 8, "y": 2 }, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - { "x": 13, "y": 2 }, - { "x": 14, "y": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 13, "y": 3 }, - { "x": 14, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [4, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [4, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [4, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [4, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [4, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [5, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [5, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [5, 2], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [5, 3], "x": 7, "y": 1}, + {"matrix": [1, 4], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [1, 5], "x": 10, "y": 1}, + {"matrix": [5, 5], "x": 11, "y": 1}, + {"matrix": [1, 6], "x": 12, "y": 1}, + {"matrix": [5, 6], "x": 13, "y": 1}, + {"matrix": [1, 7], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [6, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [6, 2], "x": 5, "y": 2}, + {"matrix": [2, 3], "x": 6, "y": 2}, + {"matrix": [6, 3], "x": 7, "y": 2}, + {"matrix": [2, 4], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + {"matrix": [6, 5], "x": 11, "y": 2}, + {"matrix": [2, 6], "x": 12, "y": 2}, + {"matrix": [6, 6], "x": 13, "y": 2}, + {"matrix": [2, 7], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [3, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [3, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [3, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [3, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [3, 7], "x": 14, "y": 3} ] } } diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h deleted file mode 100644 index b3287784c3..0000000000 --- a/keyboards/peej/rosaline/ortho/ortho.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2021 Paul James - * - * 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 "rosaline.h" - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │00 │40 │01 │41 │02 │42 │03 │43 │04 │44 │05 │45 │06 │46 │07 │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │10 │50 │11 │51 │12 │52 │13 │53 │14 │54 │15 │55 │16 │56 │17 │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │20 │60 │21 │61 │22 │62 │23 │63 │24 │64 │25 │65 │26 │66 │27 │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │30 │70 │31 │71 │32 │72 │33 │73 │34 │74 │35 │75 │36 │76 │37 │ - * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ - * ┌───────────────────────────┐ - * │73 │ 7u Space - * └───────────────────────────┘ - * ┌───────┐ ┌───────┐ - * 2u Left │32 │ │35 │ 2u Right - * └───────┘ └───────┘ - */ - -#define LAYOUT_ortho_4x15( \ - k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \ - k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \ - k20, k60, k21, k61, k22, k62, k23, k63, k24, k64, k25, k65, k26, k66, k27, \ - k30, k70, k31, k71, k32, k72, k33, k73, k34, k74, k35, k75, k36, k76, k37 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, XXX }, \ - { k60, k61, k62, k63, k64, k65, k66, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, XXX } \ -} - -#define LED1 C5 -#define LED2 C4 diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c index 57141e8064..df0594da44 100644 --- a/keyboards/peej/rosaline/rosaline.c +++ b/keyboards/peej/rosaline/rosaline.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rosaline.h" +#include "quantum.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { writePin(LED1, record->event.pressed); diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h deleted file mode 100644 index 22125f3188..0000000000 --- a/keyboards/peej/rosaline/rosaline.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Paul James - * - * 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 - -#if defined(KEYBOARD_peej_rosaline_staggered) - #include "staggered.h" -#elif defined(KEYBOARD_peej_rosaline_ortho) - #include "ortho.h" -#endif - -#define LED1 C5 -#define LED2 C4 diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json index f37e073fbd..0679203163 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/info.json @@ -6,8 +6,14 @@ "usb": { "vid": "0x706A", "pid": "0x0003", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layout_aliases": { @@ -16,60 +22,167 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":0, "y":0, "w":1.5}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0, "w":1.5}, + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, + {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75}, + {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3}, + {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25}, + {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3}, + {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3}, + {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3}, + {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3}, + {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3} + ] + }, + "LAYOUT_tsangan": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, + {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, + {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_tsangan_split_rshift": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, - {"x":0, "y":1, "w":1.75}, - {"x":1.75, "y":1}, - {"x":2.75, "y":1}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":7.75, "y":1}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1, "w":2.25}, + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, - {"x":0, "y":2, "w":2.25}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "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":11.25, "y":2}, - {"x":12.25, "y":2, "w":1.75}, - {"x":14, "y":2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, + {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, - {"x":0, "y":3, "w":1.5}, - {"x":1.5, "y":3}, - {"x":2.5, "y":3, "w":1.5}, - {"x":4, "y":3, "w":2.75}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3, "w":2.25}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3} + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, + {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, + {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/peej/rosaline/staggered/matrix_diagram.md b/keyboards/peej/rosaline/staggered/matrix_diagram.md new file mode 100644 index 0000000000..5e004aae7b --- /dev/null +++ b/keyboards/peej/rosaline/staggered/matrix_diagram.md @@ -0,0 +1,33 @@ +# Matrix Diagram for Peej Rosaline Staggered + +``` +┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +│00 │10 │01 │02 │12 │03 │13 │04 │14 │05 │06 │16 │07 │17 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +│20 │11 │21 │22 │32 │23 │33 │24 │15 │25 │26 │36 │27 │ +└──────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────────┘ +─ Shift Row ───────────────────────────────────────────────── +┌────────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────────────┐ ┌───┬──────┬───┐ +│30 │31 │41 │42 │43 │53 │34 │44 │35 │45 │ [RShift]──── │ ─┬─ │46 │37 │47 │ 1u/1.75u/1u +└────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────────────┘ │ └───┴──────┴───┘ + │ ┌──────┬───┬───┐ + ├─ │46 │37 │47 │ 1.75u/1u/1u + │ └──────┴───┴───┘ + │ ┌───┬──────────┐ + └─ │46 │37 │ 1u/2.75u + └───┴──────────┘ +─ Bottom Row ──────────────────────────────────────────────── +┌─────┬───┬─────┬───────────────────────────┬───────────────┐ ┌───┬───┬───┬───┐ +│40 │50 │51 │ [Spacebar]─┐ │ [Bot. Right]─ │ ─┬─ │56 │66 │57 │67 │ 1u +└─────┴───┴─────┴───────────────────────────┴───────────────┘ │ └───┴───┴───┴───┘ + ┌────────────┴──────────────┐ │ ┌─────┬───┬─────┐ + ┌──────────┬────────┬───┬───┐ └─ │56 │66 │57 │ Tsangan + Split │52 │54 │55 │65 │ └─────┴───┴─────┘ + └──────────┴────────┴───┴───┘ + ┌──────────┬───┬────────┬───┐ + Split Fn │52 │54 │55 │65 │ + └──────────┴───┴────────┴───┘ + ┌───────────────────────────┐ + 7u Spacebar │54 │ + └───────────────────────────┘ +``` diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h deleted file mode 100644 index cc2703c834..0000000000 --- a/keyboards/peej/rosaline/staggered/staggered.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2021 Paul James - * - * 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 "rosaline.h" - -/* - * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ - * │00 │10 │01 │02 │12 │03 │13 │04 │14 │05 │06 │16 │07 │17 │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │20 │11 │21 │22 │32 │23 │33 │24 │15 │25 │26 │36 │27 │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┬──────────┐ ┌──────┬───┬───┐ - * │30 │31 │41 │42 │43 │53 │34 │44 │35 │45 │46 │37 │47 │ │46 │37 │ 1u/2.75u RShift │46 │37 │47 │ 1.75u/1u/1u RShift - * ├─────┬──┴┬──┴──┬┴───┴───┴─┬─┴───┴──┬┴──┬┴──┬┴──┬┴──┬───┼───┤ └───┴──────────┘ └──────┴───┴───┘ - * │40 │50 │51 │52 │54 │55 │65 │56 │66 │57 │67 │ - * └─────┴───┴─────┴──────────┴────────┴───┴───┴───┴───┴───┴───┘ - * ┌───────────────────────────┬─────┬───┬─────┐ - * 7u Space │54 │56 │66 │57 │ Tsangan Right Mods - * └───────────────────────────┴─────┴───┴─────┘ - * ┌──────────┬───┬────────┬───┐ - * 2.75/1/2.25/1u │52 │54 │55 │65 │ - * └──────────┴───┴────────┴───┘ - */ - -#define LAYOUT_all( \ - k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \ - k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36, k27, \ - k30, k31, k41, k42, k43, k53, k34, k44, k35, k45, k46, k37, k47, \ - k40, k50, k51, k52, k54, k55, k65, k56, k66, k57, k67 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -#define LED1 C5 -#define LED2 C4 |