diff options
Diffstat (limited to 'keyboards/noxary/valhalla')
-rw-r--r-- | keyboards/noxary/valhalla/config.h | 4 | ||||
-rw-r--r-- | keyboards/noxary/valhalla/info.json | 251 | ||||
-rw-r--r-- | keyboards/noxary/valhalla/matrix_diagram.md | 21 | ||||
-rw-r--r-- | keyboards/noxary/valhalla/valhalla.c | 18 | ||||
-rw-r--r-- | keyboards/noxary/valhalla/valhalla.h | 36 |
5 files changed, 195 insertions, 135 deletions
diff --git a/keyboards/noxary/valhalla/config.h b/keyboards/noxary/valhalla/config.h index e6ff2a3cfe..f608132b5a 100644 --- a/keyboards/noxary/valhalla/config.h +++ b/keyboards/noxary/valhalla/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B12, B11, B10, B2 , B1 , B0 , A10, B9 , B8 , B7 , B6 , B5 , B4 , B3 , A15 } -#define MATRIX_ROW_PINS { A8 , A9 , B13, B14, B15 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/noxary/valhalla/info.json b/keyboards/noxary/valhalla/info.json index cfa29e69b0..165a4155a9 100644 --- a/keyboards/noxary/valhalla/info.json +++ b/keyboards/noxary/valhalla/info.json @@ -8,88 +8,185 @@ "pid": "0x5648", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B11", "B10", "B2", "B1", "B0", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["A8", "A9", "B13", "B14", "B15"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ - {"label":"`~", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":9, "y":0}, - {"label":"8*", "x":10, "y":0}, - {"label":"9(", "x":11, "y":0}, - {"label":"0)", "x":12, "y":0}, - {"label":"-_", "x":13, "y":0}, - {"label":"=+", "x":14, "y":0}, - {"label":"Backspace", "x":15, "y":0}, - {"label":"Backspace", "x":16, "y":0}, - {"label":"Delete", "x":17, "y":0}, - - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":8.5, "y":1}, - {"label":"U", "x":9.5, "y":1}, - {"label":"I", "x":10.5, "y":1}, - {"label":"O", "x":11.5, "y":1}, - {"label":"P", "x":12.5, "y":1}, - {"label":"[{", "x":13.5, "y":1}, - {"label":"]}", "x":14.5, "y":1}, - {"label":"\\|", "x":15.5, "y":1, "w":1.5}, - {"label":"Page Up", "x":17, "y":1}, - - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":8.75, "y":2}, - {"label":"J", "x":9.75, "y":2}, - {"label":"K", "x":10.75, "y":2}, - {"label":"L", "x":11.75, "y":2}, - {"label":";:", "x":12.75, "y":2}, - {"label":"'\"", "x":13.75, "y":2}, - {"label":"Enter", "x":14.75, "y":2, "w":2.25}, - {"label":"Page Down", "x":17, "y":2}, - - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"B", "x":8.25, "y":3}, - {"label":"N", "x":9.25, "y":3}, - {"label":"M", "x":10.25, "y":3}, - {"label":",<", "x":11.25, "y":3}, - {"label":".>", "x":12.25, "y":3}, - {"label":"/?", "x":13.25, "y":3}, - {"label":"Shift", "x":14.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":16, "y":3}, - {"label":"Fn", "x":17, "y":3}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"GUI", "x":1.5, "y":4}, - {"label":"Alt", "x":2.5, "y":4, "w":1.5}, - {"label":"Space", "x":4, "y":4, "w":1.75}, - {"label":"Space", "x":5.75, "y":4}, - {"label":"Space", "x":8, "y":4}, - {"label":"Space", "x":9, "y":4, "w":1.25}, - {"label":"Alt", "x":10.25, "y":4, "w":1.5}, - {"label":"GUI", "x":11.75, "y":4}, - {"label":"Ctrl", "x":12.75, "y":4, "w":1.5}, - {"label":"\u2190", "x":15, "y":4}, - {"label":"\u2193", "x":16, "y":4}, - {"label":"\u2192", "x":17, "y":4} + {"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": 9, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 10, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 15, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 16, "y": 0}, + {"label": "Delete", "matrix": [2, 14], "x": 17, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + + {"label": "Y", "matrix": [1, 6], "x": 8.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 9.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 10.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 11.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 12.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 13.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 14.5, "y": 1}, + {"label": "\\", "matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 14], "x": 17, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + + {"label": "H", "matrix": [2, 6], "x": 8.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 9.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 10.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 11.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 12.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 13.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 13], "x": 17, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, + + {"label": "B", "matrix": [3, 6], "x": 8.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 9.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 10.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 11.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 12.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 13.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 16, "y": 3}, + {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75}, + {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4}, + + {"label": "Space", "matrix": [4, 5], "x": 8, "y": 4}, + {"label": "Space", "matrix": [4, 6], "x": 9, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 7], "x": 10.25, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 8], "x": 11.75, "y": 4}, + {"label": "Ctrl", "matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5}, + + {"label": "\u2190", "matrix": [4, 12], "x": 15, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 16, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 17, "y": 4} + ] + }, + "LAYOUT_2u_bs": { + "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": 9, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 10, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 15, "y": 0, "w": 2}, + {"label": "Delete", "matrix": [2, 14], "x": 17, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + + {"label": "Y", "matrix": [1, 6], "x": 8.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 9.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 10.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 11.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 12.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 13.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 14.5, "y": 1}, + {"label": "\\", "matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 14], "x": 17, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + + {"label": "H", "matrix": [2, 6], "x": 8.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 9.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 10.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 11.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 12.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 13.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 13], "x": 17, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, + + {"label": "B", "matrix": [3, 6], "x": 8.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 9.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 10.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 11.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 12.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 13.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 16, "y": 3}, + {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75}, + {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4}, + + {"label": "Space", "matrix": [4, 5], "x": 8, "y": 4}, + {"label": "Space", "matrix": [4, 6], "x": 9, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 7], "x": 10.25, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 8], "x": 11.75, "y": 4}, + {"label": "Ctrl", "matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5}, + + {"label": "\u2190", "matrix": [4, 12], "x": 15, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 16, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 17, "y": 4} ] } } diff --git a/keyboards/noxary/valhalla/matrix_diagram.md b/keyboards/noxary/valhalla/matrix_diagram.md new file mode 100644 index 0000000000..74d3206a00 --- /dev/null +++ b/keyboards/noxary/valhalla/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for Noxary Valhalla + +``` + ┌───────┐ + 2u Backspace │0D │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │2E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │1D │1E │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │2D │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │3C │3D │3E │ +├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘ ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤ +│40 │41 │42 │43 │44 │ │45 │46 │47 │48 │49 │ │4C │4D │4E │ +└─────┴───┴─────┴──────┴───┘ └───┴────┴─────┴───┴─────┘ └───┴───┴───┘ + 2.75u ┌──────────┐ ┌────────┐ 2.25u + Left Space │44 │ │46 │ Right Space + └──────────┘ └────────┘ +``` diff --git a/keyboards/noxary/valhalla/valhalla.c b/keyboards/noxary/valhalla/valhalla.c deleted file mode 100644 index a8b2165091..0000000000 --- a/keyboards/noxary/valhalla/valhalla.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -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 "valhalla.h" diff --git a/keyboards/noxary/valhalla/valhalla.h b/keyboards/noxary/valhalla/valhalla.h deleted file mode 100644 index cd6f8e36d0..0000000000 --- a/keyboards/noxary/valhalla/valhalla.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -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 ___ KC_NO - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, ___, ___, K4C, K4D, K4E } \ -} |