diff options
Diffstat (limited to 'keyboards/fr4')
| -rw-r--r-- | keyboards/fr4/southpaw75/config.h | 8 | ||||
| -rw-r--r-- | keyboards/fr4/southpaw75/info.json | 96 | ||||
| -rw-r--r-- | keyboards/fr4/southpaw75/southpaw75.c | 17 | ||||
| -rw-r--r-- | keyboards/fr4/southpaw75/southpaw75.h | 37 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/config.h | 26 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/info.json | 222 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/matrix_diagram.md | 24 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/unix60.c | 17 | ||||
| -rw-r--r-- | keyboards/fr4/unix60/unix60.h | 36 |
11 files changed, 410 insertions, 149 deletions
diff --git a/keyboards/fr4/southpaw75/config.h b/keyboards/fr4/southpaw75/config.h index 88d4df0941..bbb0ecc339 100644 --- a/keyboards/fr4/southpaw75/config.h +++ b/keyboards/fr4/southpaw75/config.h @@ -16,14 +16,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { B5, F4, F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json index 466e0edab5..3eb325d0eb 100644 --- a/keyboards/fr4/southpaw75/info.json +++ b/keyboards/fr4/southpaw75/info.json @@ -1,18 +1,106 @@ { - "keyboard_name": "Southpaw75", + "keyboard_name": "Southpaw75", "manufacturer": "kelvinhall05", - "url": "https://github.com/kelvinhall05/southpaw75", - "maintainer": "kelvinhall05", + "url": "https://github.com/kelvinhall05/southpaw75", + "maintainer": "kelvinhall05", "usb": { "vid": "0xFEED", "pid": "0x350C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"~", "x":4, "y":0}, {"label":"!", "x":5, "y":0}, {"label":"@", "x":6, "y":0}, {"label":"#", "x":7, "y":0}, {"label":"$", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"^", "x":10, "y":0}, {"label":"&", "x":11, "y":0}, {"label":"*", "x":12, "y":0}, {"label":"(", "x":13, "y":0}, {"label":")", "x":14, "y":0}, {"label":"_", "x":15, "y":0}, {"label":"+", "x":16, "y":0}, {"label":"Backspace", "x":17, "y":0, "w":2}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"Tab", "x":4, "y":1, "w":1.5}, {"label":"Q", "x":5.5, "y":1}, {"label":"W", "x":6.5, "y":1}, {"label":"E", "x":7.5, "y":1}, {"label":"R", "x":8.5, "y":1}, {"label":"T", "x":9.5, "y":1}, {"label":"Y", "x":10.5, "y":1}, {"label":"U", "x":11.5, "y":1}, {"label":"I", "x":12.5, "y":1}, {"label":"O", "x":13.5, "y":1}, {"label":"P", "x":14.5, "y":1}, {"label":"{", "x":15.5, "y":1}, {"label":"}", "x":16.5, "y":1}, {"label":"|", "x":17.5, "y":1, "w":1.5}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Caps Lock", "x":4, "y":2, "w":1.75}, {"label":"A", "x":5.75, "y":2}, {"label":"S", "x":6.75, "y":2}, {"label":"D", "x":7.75, "y":2}, {"label":"F", "x":8.75, "y":2}, {"label":"G", "x":9.75, "y":2}, {"label":"H", "x":10.75, "y":2}, {"label":"J", "x":11.75, "y":2}, {"label":"K", "x":12.75, "y":2}, {"label":"L", "x":13.75, "y":2}, {"label":":", "x":14.75, "y":2}, {"label":"\"", "x":15.75, "y":2}, {"label":"Enter", "x":16.75, "y":2, "w":2.25}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"Shift", "x":4, "y":3, "w":2.25}, {"label":"Z", "x":6.25, "y":3}, {"label":"X", "x":7.25, "y":3}, {"label":"C", "x":8.25, "y":3}, {"label":"V", "x":9.25, "y":3}, {"label":"B", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":2.75}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Ctrl", "x":4, "y":4, "w":1.25}, {"label":"Win", "x":5.25, "y":4, "w":1.25}, {"label":"Alt", "x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":6.25}, {"label":"Alt", "x":14, "y":4, "w":1.25}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Menu", "x":16.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":17.75, "y":4, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [1, 7], "x": 16, "y": 0}, + {"matrix": [1, 8], "x": 17, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1, "h": 2}, + {"matrix": [2, 4], "x": 4, "y": 1, "w": 1.5}, + {"matrix": [2, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.5, "y": 1}, + {"matrix": [2, 7], "x": 7.5, "y": 1}, + {"matrix": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 0], "x": 9.5, "y": 1}, + {"matrix": [3, 1], "x": 10.5, "y": 1}, + {"matrix": [3, 2], "x": 11.5, "y": 1}, + {"matrix": [3, 3], "x": 12.5, "y": 1}, + {"matrix": [3, 4], "x": 13.5, "y": 1}, + {"matrix": [3, 5], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1}, + {"matrix": [3, 7], "x": 16.5, "y": 1}, + {"matrix": [3, 8], "x": 17.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 4, "y": 2, "w": 1.75}, + {"matrix": [4, 4], "x": 5.75, "y": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 2}, + {"matrix": [4, 7], "x": 8.75, "y": 2}, + {"matrix": [4, 8], "x": 9.75, "y": 2}, + {"matrix": [5, 0], "x": 10.75, "y": 2}, + {"matrix": [5, 1], "x": 11.75, "y": 2}, + {"matrix": [5, 2], "x": 12.75, "y": 2}, + {"matrix": [5, 3], "x": 13.75, "y": 2}, + {"matrix": [5, 4], "x": 14.75, "y": 2}, + {"matrix": [5, 5], "x": 15.75, "y": 2}, + {"matrix": [5, 6], "x": 16.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 7], "x": 0, "y": 3}, + {"matrix": [5, 8], "x": 1, "y": 3}, + {"matrix": [6, 0], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3, "h": 2}, + {"matrix": [6, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [6, 4], "x": 7.25, "y": 3}, + {"matrix": [6, 5], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 7], "x": 10.25, "y": 3}, + {"matrix": [6, 8], "x": 11.25, "y": 3}, + {"matrix": [7, 0], "x": 12.25, "y": 3}, + {"matrix": [7, 1], "x": 13.25, "y": 3}, + {"matrix": [7, 2], "x": 14.25, "y": 3}, + {"matrix": [7, 3], "x": 15.25, "y": 3}, + {"matrix": [7, 4], "x": 16.25, "y": 3, "w": 2.75}, + + {"matrix": [7, 5], "x": 0, "y": 4, "w": 2}, + {"matrix": [7, 6], "x": 2, "y": 4}, + {"matrix": [7, 7], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [7, 8], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 7.75, "y": 4, "w": 6.25}, + {"matrix": [8, 2], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 16.5, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 17.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/fr4/southpaw75/southpaw75.c b/keyboards/fr4/southpaw75/southpaw75.c deleted file mode 100644 index c9c6f2d366..0000000000 --- a/keyboards/fr4/southpaw75/southpaw75.c +++ /dev/null @@ -1,17 +0,0 @@ - /* - Copyright 2020 Kelvin Hall - - 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 "southpaw75.h" diff --git a/keyboards/fr4/southpaw75/southpaw75.h b/keyboards/fr4/southpaw75/southpaw75.h deleted file mode 100644 index 7842d8ea90..0000000000 --- a/keyboards/fr4/southpaw75/southpaw75.h +++ /dev/null @@ -1,37 +0,0 @@ - /* - Copyright 2020 Kelvin Hall - - 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, K35, K36, K37, K38, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K50, K51, K52, K53, K54, K55, K56, \ - K57, K58, K60, K61, K62, K63, K64, K65, K66, K67, K68, K70, K71, K72, K73, K74, \ - K75, K76, K77, K78, K80, K81, K82, K83, K84, K85 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/fr4/unix60/config.h b/keyboards/fr4/unix60/config.h deleted file mode 100644 index c661d4b038..0000000000 --- a/keyboards/fr4/unix60/config.h +++ /dev/null @@ -1,26 +0,0 @@ - /* - Copyright 2020 Lasse Küchenmeister - - 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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7 } -#define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index 2356702b48..14c686a040 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -1,18 +1,232 @@ { - "keyboard_name": "unix60", + "keyboard_name": "unix60", "manufacturer": "FR4Boards", - "url": "https://github.com/mkdl/Unix60", - "maintainer": "mkdl", + "url": "https://github.com/mkdl/Unix60", + "maintainer": "mkdl", "usb": { "vid": "0x4652", "pid": "0x5558", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "community_layouts": [ + "60_hhkb" + ], "layouts": { "LAYOUT_all": { - "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, "w":0.6}, {"x":13.6, "y":0, "w":0.8}, {"x":14.4, "y":0, "w":0.6}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "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":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}] + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 0], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 1], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 2], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 3], "x": 12, "y": 0}, + + {"label": "Backspace", "matrix": [1, 4], "x": 13, "y": 0, "w": 0.6}, + {"label": "2u Backspace", "matrix": [1, 5], "x": 13.6, "y": 0, "w": 0.8}, + {"label": "Backspace", "matrix": [1, 6], "x": 14.4, "y": 0, "w": 0.6}, + + {"label": "Tab", "matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 8], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 0], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 4], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 5], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 6], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [2, 7], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 8], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 0], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 1], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + + {"label": "Caps Lock", "matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [3, 4], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [3, 5], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [3, 6], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [3, 7], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [3, 8], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 0], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 1], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 2], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [4, 3], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 4], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [4, 5], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [4, 7], "x": 13.75, "y": 2, "w": 1.25}, + + {"label": "Shift", "matrix": [4, 8], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 0], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [5, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [5, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [5, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [5, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [5, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [5, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [5, 7], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [5, 8], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [6, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, + {"label": "GUI", "matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [6, 8], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 0], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 1], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 2], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 3], "x": 12, "y": 0}, + {"label": "\\", "matrix": [1, 4], "x": 13, "y": 0}, + {"label": "`", "matrix": [1, 6], "x": 14, "y": 0}, + + {"label": "Tab", "matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 8], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 0], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 4], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 5], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 6], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [2, 7], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 8], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 0], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 1], "x": 12.5, "y": 1}, + {"label": "Backspace", "matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5}, + + {"label": "Caps Lock", "matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [3, 4], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [3, 5], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [3, 6], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [3, 7], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [3, 8], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 0], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 1], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 2], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [4, 3], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 4], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [4, 5], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [4, 8], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [5, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [5, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [5, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [5, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [5, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [5, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [5, 7], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [5, 8], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [6, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, + {"label": "GUI", "matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [6, 8], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_iso": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 0], "x": 9, "y": 0}, + {"label": "0", "matrix": [1, 1], "x": 10, "y": 0}, + {"label": "-", "matrix": [1, 2], "x": 11, "y": 0}, + {"label": "=", "matrix": [1, 3], "x": 12, "y": 0}, + {"label": "\\", "matrix": [1, 4], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [1, 6], "x": 14, "y": 0}, + + {"label": "Tab", "matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 8], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [2, 0], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [2, 1], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [2, 4], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [2, 5], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [2, 6], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [2, 7], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [2, 8], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [3, 0], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [3, 1], "x": 12.5, "y": 1}, + + {"label": "Caps Lock", "matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [3, 4], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [3, 5], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [3, 6], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [3, 7], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [3, 8], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [4, 0], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [4, 1], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [4, 2], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [4, 3], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [4, 4], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [4, 5], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [4, 7], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"label": "Shift", "matrix": [4, 8], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [5, 0], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [5, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [5, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [5, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [5, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [5, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [5, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [5, 7], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [5, 8], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 0], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [6, 1], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [6, 3], "x": 14, "y": 3}, + + {"label": "Alt", "matrix": [6, 4], "x": 1.5, "y": 4}, + {"label": "GUI", "matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [6, 6], "x": 4, "y": 4, "w": 7}, + {"label": "GUI", "matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [6, 8], "x": 12.5, "y": 4} + ] } } } diff --git a/keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c b/keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c new file mode 100644 index 0000000000..53ab6602c2 --- /dev/null +++ b/keyboards/fr4/unix60/keymaps/default_hhkb/keymap.c @@ -0,0 +1,38 @@ + /* + Copyright 2020 Lasse Küchenmeister + + 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 QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) + ), + + [1] = LAYOUT_60_hhkb( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F11, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c b/keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c new file mode 100644 index 0000000000..f9cf5d62a3 --- /dev/null +++ b/keyboards/fr4/unix60/keymaps/default_hhkb_iso/keymap.c @@ -0,0 +1,38 @@ + /* + Copyright 2020 Lasse Küchenmeister + + 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 QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_hhkb_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) + ), + + [1] = LAYOUT_60_hhkb_iso( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F11, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/fr4/unix60/matrix_diagram.md b/keyboards/fr4/unix60/matrix_diagram.md new file mode 100644 index 0000000000..c06ad2bf9a --- /dev/null +++ b/keyboards/fr4/unix60/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for FR4Boards unix60 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │10 │11 │12 │13 │14 │16 │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ +│17 │18 │20 │21 │22 │23 │24 │25 │26 │27 │28 │30 │31 │32 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +│33 │34 │35 │36 │37 │38 │40 │41 │42 │43 │44 │45 │47 │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ +│48 │50 │51 │52 │53 │54 │55 │56 │57 │58 │60 │61 │62 │63 │ +└────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘ + │64 │65 │66 │67 │68 │ + └───┴─────┴───────────────────────────┴─────┴───┘ + ┌───────┐ + 2u Backspace │15 │ + └─┬─────┤ + │ │ + ISO Enter ┌──┴┐47 │ + │46 │ │ +┌────────┐ ┌─┴───┴────┤ +│48 │ 2.25u LShift 2.75u RShift │62 │ +└────────┘ └──────────┘ +``` diff --git a/keyboards/fr4/unix60/unix60.c b/keyboards/fr4/unix60/unix60.c deleted file mode 100644 index 80fd383316..0000000000 --- a/keyboards/fr4/unix60/unix60.c +++ /dev/null @@ -1,17 +0,0 @@ - /* - Copyright 2020 Lasse Küchenmeister - - 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 "unix60.h" diff --git a/keyboards/fr4/unix60/unix60.h b/keyboards/fr4/unix60/unix60.h deleted file mode 100644 index fa238da9eb..0000000000 --- a/keyboards/fr4/unix60/unix60.h +++ /dev/null @@ -1,36 +0,0 @@ - /* - Copyright 2020 Lasse Küchenmeister - - 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_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \ - K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, \ - K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, \ - K48, K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \ - K64, K65, K66, K67, K68 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68 } \ -} |