diff options
Diffstat (limited to 'keyboards/nopunin10did/kastenwagen1840')
5 files changed, 172 insertions, 125 deletions
diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h index 80a7793edb..42a557e6a4 100644 --- a/keyboards/nopunin10did/kastenwagen1840/config.h +++ b/keyboards/nopunin10did/kastenwagen1840/config.h @@ -16,15 +16,7 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B5, B7, D5, C7, F1, F0, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6, D7 } - /* Indicator LEDs */ #define LED_INDICATOR_TOP B0 #define LED_INDICATOR_MID D4 #define LED_INDICATOR_BOT C6 - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json index bf6b9234b0..a43f84fa57 100644 --- a/keyboards/nopunin10did/kastenwagen1840/info.json +++ b/keyboards/nopunin10did/kastenwagen1840/info.json @@ -8,6 +8,11 @@ "pid": "0x4B57", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "E6", "D7"], + "rows": ["B4", "B5", "B7", "D5", "C7", "F1", "F0", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, @@ -19,71 +24,155 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":0 , "y":0, "label":"Esc"}, - {"x":1 , "y":0, "label":"Q"}, - {"x":2 , "y":0, "label":"W"}, - {"x":3 , "y":0, "label":"E"}, - {"x":4 , "y":0, "label":"R"}, - {"x":5 , "y":0, "label":"T"}, - {"x":6 , "y":0, "label":"Y"}, - {"x":7 , "y":0, "label":"U"}, - {"x":8 , "y":0, "label":"I"}, - {"x":9 , "y":0, "label":"O"}, - {"x":10 , "y":0, "label":"P"}, - {"x":11 , "y":0, "label":"L Bracket"}, - {"x":12 , "y":0, "label":"Backspace", "w":1.75}, - {"x":14.25, "y":0, "label":"P-7"}, - {"x":15.25, "y":0, "label":"P-8"}, - {"x":16.25, "y":0, "label":"P-9"}, - {"x":17.25, "y":0, "label":"P-Minus"}, - {"x":0 , "y":1, "label":"Tab", "w":1.25}, - {"x":1.25, "y":1, "label":"A"}, - {"x":2.25, "y":1, "label":"S"}, - {"x":3.25, "y":1, "label":"D"}, - {"x":4.25, "y":1, "label":"F"}, - {"x":5.25, "y":1, "label":"G"}, - {"x":6.25, "y":1, "label":"H"}, - {"x":7.25, "y":1, "label":"J"}, - {"x":8.25, "y":1, "label":"K"}, - {"x":9.25, "y":1, "label":"L"}, - {"x":10.25, "y":1, "label":"Semicolon"}, - {"x":11.25, "y":1, "label":"Quote"}, - {"x":12.25, "y":1, "label":"Enter", "w":1.5}, - {"x":14.25, "y":1, "label":"P-4"}, - {"x":15.25, "y":1, "label":"P-5"}, - {"x":16.25, "y":1, "label":"P-6"}, - {"x":17.25, "y":1, "label":"P-Plus"}, - {"x":0 , "y":2, "label":"Left Shift", "w":1.75}, - {"x":1.75, "y":2, "label":"Z"}, - {"x":2.75, "y":2, "label":"X"}, - {"x":3.75, "y":2, "label":"C"}, - {"x":4.75, "y":2, "label":"V"}, - {"x":5.75, "y":2, "label":"B"}, - {"x":6.75, "y":2, "label":"N"}, - {"x":7.75, "y":2, "label":"M"}, - {"x":8.75, "y":2, "label":"Comma"}, - {"x":9.75, "y":2, "label":"Period"}, - {"x":10.75, "y":2, "label":"Slash"}, - {"x":11.75, "y":2, "label":"Right Shift", "w":1.25}, - {"x":13.125,"y":2.125,"label":"Up"}, - {"x":14.25, "y":2, "label":"P-1"}, - {"x":15.25, "y":2, "label":"P-2"}, - {"x":16.25, "y":2, "label":"P-3"}, - {"x":17.25, "y":2, "label":"P-Mult"}, - {"x":0 , "y":3, "label":"Left Ctrl", "w":1.25}, - {"x":1.25 , "y":3, "label":"Left Alt", "w":1.25}, - {"x":2.5 , "y":3, "label":"MO(2)"}, - {"x":3.5 , "y":3, "label":"Space", "w":2.75}, - {"x":6.25 , "y":3, "label":"Space", "w":2.25}, - {"x":8.5 , "y":3, "label":"MO(3)"}, - {"x":9.5 , "y":3, "label":"R Win / Alt Gr", "w":1.25}, - {"x":10.75, "y":3, "label":"MO(1)", "w":1.25}, - {"x":12.125,"y":3.125,"label":"Left"}, - {"x":13.125,"y":3.125,"label":"Down"}, - {"x":14.125,"y":3.125,"label":"Right"}, - {"x":15.25 ,"y":3, "label":"P-0"}, - {"x":16.25 ,"y":3, "label":"P-Dot"}, - {"x":17.25 ,"y":3, "label":"P-Enter"} + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [1, 0], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "E", "matrix": [1, 1], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 2], "x": 4, "y": 0}, + {"label": "T", "matrix": [1, 2], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "U", "matrix": [1, 3], "x": 7, "y": 0}, + {"label": "I", "matrix": [0, 4], "x": 8, "y": 0}, + {"label": "O", "matrix": [1, 4], "x": 9, "y": 0}, + {"label": "P", "matrix": [0, 5], "x": 10, "y": 0}, + {"label": "[", "matrix": [1, 5], "x": 11, "y": 0}, + {"label": "Backspace", "matrix": [0, 6], "x": 12, "y": 0, "w": 1.75}, + + {"label": "7", "matrix": [0, 7], "x": 14.25, "y": 0}, + {"label": "8", "matrix": [1, 7], "x": 15.25, "y": 0}, + {"label": "9", "matrix": [0, 8], "x": 16.25, "y": 0}, + {"label": "-", "matrix": [1, 8], "x": 17.25, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [2, 2], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [3, 2], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "J", "matrix": [3, 3], "x": 7.25, "y": 1}, + {"label": "K", "matrix": [2, 4], "x": 8.25, "y": 1}, + {"label": "L", "matrix": [3, 4], "x": 9.25, "y": 1}, + {"label": ";", "matrix": [2, 5], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [3, 5], "x": 11.25, "y": 1}, + {"label": "Enter", "matrix": [2, 6], "x": 12.25, "y": 1, "w": 1.5}, + + {"label": "4", "matrix": [2, 7], "x": 14.25, "y": 1}, + {"label": "5", "matrix": [3, 7], "x": 15.25, "y": 1}, + {"label": "6", "matrix": [2, 8], "x": 16.25, "y": 1}, + {"label": "+", "matrix": [3, 8], "x": 17.25, "y": 1}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [5, 0], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [5, 1], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [4, 2], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [5, 2], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [5, 3], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [4, 4], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [5, 4], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [5, 5], "x": 11.75, "y": 2, "w": 1.25}, + + {"label": "\u2191", "matrix": [4, 6], "x": 13.125, "y": 2.125}, + + {"label": "1", "matrix": [4, 7], "x": 14.25, "y": 2}, + {"label": "2", "matrix": [5, 7], "x": 15.25, "y": 2}, + {"label": "3", "matrix": [4, 8], "x": 16.25, "y": 2}, + {"label": "*", "matrix": [5, 8], "x": 17.25, "y": 2}, + + {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "Fn2", "matrix": [6, 1], "x": 2.5, "y": 3}, + {"label": "Fn2/Space", "matrix": [7, 1], "x": 3.5, "y": 3, "w": 2.75}, + {"label": "Fn3/Space", "matrix": [7, 3], "x": 6.25, "y": 3, "w": 2.25}, + {"label": "Fn3", "matrix": [6, 4], "x": 8.5, "y": 3}, + {"label": "GUI/Alt", "matrix": [7, 4], "x": 9.5, "y": 3, "w": 1.25}, + {"label": "Fn", "matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25}, + + {"label": "\u2190", "matrix": [7, 5], "x": 12.125, "y": 3.125}, + {"label": "\u2193", "matrix": [7, 6], "x": 13.125, "y": 3.125}, + {"label": "\u2192", "matrix": [6, 7], "x": 14.125, "y": 3.125}, + + {"label": "0", "matrix": [7, 7], "x": 15.25, "y": 3}, + {"label": ".", "matrix": [6, 8], "x": 16.25, "y": 3}, + {"label": "Fn3/Enter", "matrix": [7, 8], "x": 17.25, "y": 3} + ] + }, + "LAYOUT_7u_space": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [1, 0], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "E", "matrix": [1, 1], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 2], "x": 4, "y": 0}, + {"label": "T", "matrix": [1, 2], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "U", "matrix": [1, 3], "x": 7, "y": 0}, + {"label": "I", "matrix": [0, 4], "x": 8, "y": 0}, + {"label": "O", "matrix": [1, 4], "x": 9, "y": 0}, + {"label": "P", "matrix": [0, 5], "x": 10, "y": 0}, + {"label": "[", "matrix": [1, 5], "x": 11, "y": 0}, + {"label": "Backspace", "matrix": [0, 6], "x": 12, "y": 0, "w": 1.75}, + + {"label": "7", "matrix": [0, 7], "x": 14.25, "y": 0}, + {"label": "8", "matrix": [1, 7], "x": 15.25, "y": 0}, + {"label": "9", "matrix": [0, 8], "x": 16.25, "y": 0}, + {"label": "-", "matrix": [1, 8], "x": 17.25, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [2, 2], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [3, 2], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "J", "matrix": [3, 3], "x": 7.25, "y": 1}, + {"label": "K", "matrix": [2, 4], "x": 8.25, "y": 1}, + {"label": "L", "matrix": [3, 4], "x": 9.25, "y": 1}, + {"label": ";", "matrix": [2, 5], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [3, 5], "x": 11.25, "y": 1}, + {"label": "Enter", "matrix": [2, 6], "x": 12.25, "y": 1, "w": 1.5}, + + {"label": "4", "matrix": [2, 7], "x": 14.25, "y": 1}, + {"label": "5", "matrix": [3, 7], "x": 15.25, "y": 1}, + {"label": "6", "matrix": [2, 8], "x": 16.25, "y": 1}, + {"label": "+", "matrix": [3, 8], "x": 17.25, "y": 1}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [5, 0], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [5, 1], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [4, 2], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [5, 2], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [5, 3], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [4, 4], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [5, 4], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [5, 5], "x": 11.75, "y": 2, "w": 1.25}, + + {"label": "\u2191", "matrix": [4, 6], "x": 13.125, "y": 2.125}, + + {"label": "1", "matrix": [4, 7], "x": 14.25, "y": 2}, + {"label": "2", "matrix": [5, 7], "x": 15.25, "y": 2}, + {"label": "3", "matrix": [4, 8], "x": 16.25, "y": 2}, + {"label": "*", "matrix": [5, 8], "x": 17.25, "y": 2}, + + {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "Fn2/Space", "matrix": [7, 1], "x": 2.5, "y": 3, "w": 7}, + {"label": "GUI/Alt", "matrix": [7, 4], "x": 9.5, "y": 3, "w": 1.25}, + {"label": "Fn", "matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25}, + + {"label": "\u2190", "matrix": [7, 5], "x": 12.125, "y": 3.125}, + {"label": "\u2193", "matrix": [7, 6], "x": 13.125, "y": 3.125}, + {"label": "\u2192", "matrix": [6, 7], "x": 14.125, "y": 3.125}, + + {"label": "0", "matrix": [7, 7], "x": 15.25, "y": 3}, + {"label": ".", "matrix": [6, 8], "x": 16.25, "y": 3}, + {"label": "Fn3/Enter", "matrix": [7, 8], "x": 17.25, "y": 3} ] } } diff --git a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c index a54b557406..01eb8f3903 100644 --- a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c +++ b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "kastenwagen1840.h" +#include "quantum.h" #ifndef LAYER_LED_DISABLE diff --git a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h deleted file mode 100644 index a6fad98d00..0000000000 --- a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.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" - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐ ┌───┬───┬───┬───┐ - * │100│101│110│111│120│121│130│131│140│141│150│151│160 │ │170│171│180│181│ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤ ├───┼───┼───┼───┤ - * │202 │203│212│213│222│223│232│233│242│243│252│253│262 │ │272│273│282│283│ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬──┘ ├───┼───┼───┼───┤ ┌───┐ - * │304 │305│314│315│324│325│334│335│344│345│354│355 │┌───┐│374│375│384│385│ │ │ - * ├────┬─┴──┬┴──┬┴───┴───┴─┬─┴───┴──┬┴──┬┴───┼───┴┬───┘│364│└───┼───┼───┼───┤ │487│ 2u NumEnter - * │406 │407 │416│417 │437 │446│447 │456 │┌───┼───┼───┐│477│486│487│ │ │ - * └────┴────┴───┴──────────┴────────┴───┴────┴────┘│457│467│476│└───┴───┴───┘ └───┘ - * ┌───────────────────────────┐ └───┴───┴───┘┌───────┐ - * │417 │ 7u Space │477 │ 2u Num0 - * └───────────────────────────┘ └───────┘ - */ - -#define LAYOUT_all( \ -K100 , K101 , K110 , K111 , K120 , K121 , K130 , K131 , K140 , K141 , K150 , K151 , K160 , K170 , K171 , K180 , K181 , \ -K202 , K203 , K212 , K213 , K222 , K223 , K232 , K233 , K242 , K243 , K252 , K253 , K262 , K272 , K273 , K282 , K283 , \ -K304 , K305 , K314 , K315 , K324 , K325 , K334 , K335 , K344 , K345 , K354 , K355 , K364 , K374 , K375 , K384 , K385 , \ -K406 , K407 , K416 , K417 , K437 , K446 , K447 , K456 , K457 , K467 , K476 , K477 , K486 , K487 \ -) \ -{ \ - { K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170 , K180 }, \ - { K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, K171 , K181 }, \ - { K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272 , K282 }, \ - { K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, K273 , K283 }, \ - { K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374 , K384 }, \ - { K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, K375 , K385 }, \ - { K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476 , K486 }, \ - { K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , K477 , K487 } \ -} diff --git a/keyboards/nopunin10did/kastenwagen1840/matrix_diagram.md b/keyboards/nopunin10did/kastenwagen1840/matrix_diagram.md new file mode 100644 index 0000000000..7f7fbe619a --- /dev/null +++ b/keyboards/nopunin10did/kastenwagen1840/matrix_diagram.md @@ -0,0 +1,17 @@ +# Matrix Diagram for Kastenwagen 1840 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐ ┌───┬───┬───┬───┐ +│00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │ │07 │17 │08 │18 │ +├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤ ├───┼───┼───┼───┤ +│20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │ │27 │37 │28 │38 │ +├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬──┘ ├───┼───┼───┼───┤ ┌───┐ +│40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │┌───┐│47 │57 │48 │58 │ │ │ +├────┬─┴──┬┴──┬┴───┴───┴─┬─┴───┴──┬┴──┬┴───┼───┴┬───┘│46 │└───┼───┼───┼───┤ │78 │ 2u Numpad Enter +│60 │70 │61 │71 │73 │64 │74 │65 │┌───┼───┼───┐│77 │68 │78 │ │ │ +└────┴────┴───┴──────────┴────────┴───┴────┴────┘│75 │76 │67 │└───┴───┴───┘ └───┘ + ┌─ 7u Spacebar ─────────────┐ └───┴───┴───┘┌───────┐ + ┌───────────────────────────┐ │77 │ 2u Numpad Zero + │71 │ └───────┘ + └───────────────────────────┘ +``` |