diff options
Diffstat (limited to 'keyboards/keyhive')
| -rw-r--r-- | keyboards/keyhive/lattice60/info.json | 133 | ||||
| -rw-r--r-- | keyboards/keyhive/lattice60/lattice60.c | 2 | ||||
| -rw-r--r-- | keyboards/keyhive/lattice60/lattice60.h | 64 |
3 files changed, 132 insertions, 67 deletions
diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json index d3a0383ec8..2c12fb6bfd 100644 --- a/keyboards/keyhive/lattice60/info.json +++ b/keyboards/keyhive/lattice60/info.json @@ -19,12 +19,141 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"~", "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":"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":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "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":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"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":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"", "x":14, "y":3}, {"label":"Alt", "x":1.5, "y":4}, {"label":"Win", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4}, {"x":5, "y":4, "w":2.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Alt", "x":12.5, "y":4} + {"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": [5, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 1}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [5, 1], "x": 3.5, "y": 1}, + {"matrix": [1, 2], "x": 4.5, "y": 1}, + {"matrix": [5, 2], "x": 5.5, "y": 1}, + {"matrix": [1, 3], "x": 6.5, "y": 1}, + {"matrix": [5, 3], "x": 7.5, "y": 1}, + {"matrix": [1, 4], "x": 8.5, "y": 1}, + {"matrix": [5, 4], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 5], "x": 11.5, "y": 1}, + {"matrix": [1, 6], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [6, 0], "x": 1.75, "y": 2}, + {"matrix": [2, 1], "x": 2.75, "y": 2}, + {"matrix": [6, 1], "x": 3.75, "y": 2}, + {"matrix": [2, 2], "x": 4.75, "y": 2}, + {"matrix": [6, 2], "x": 5.75, "y": 2}, + {"matrix": [2, 3], "x": 6.75, "y": 2}, + {"matrix": [6, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [6, 4], "x": 9.75, "y": 2}, + {"matrix": [2, 5], "x": 10.75, "y": 2}, + {"matrix": [6, 5], "x": 11.75, "y": 2}, + {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [3, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [3, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [3, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [3, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 6], "x": 14, "y": 3}, + + {"matrix": [0, 7], "x": 1.5, "y": 4}, + {"matrix": [1, 7], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [2, 7], "x": 4, "y": 4}, + {"matrix": [3, 3], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [5, 7], "x": 10, "y": 4}, + {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [7, 7], "x": 12.5, "y": 4} ] }, "LAYOUT_60_hhkb": { "layout": [ - {"label":"~", "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":"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":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "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":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"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":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"", "x":14, "y":3}, {"label":"Alt", "x":1.5, "y":4}, {"label":"Win", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Alt", "x":12.5, "y":4} + {"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": [5, 6], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 1}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [5, 1], "x": 3.5, "y": 1}, + {"matrix": [1, 2], "x": 4.5, "y": 1}, + {"matrix": [5, 2], "x": 5.5, "y": 1}, + {"matrix": [1, 3], "x": 6.5, "y": 1}, + {"matrix": [5, 3], "x": 7.5, "y": 1}, + {"matrix": [1, 4], "x": 8.5, "y": 1}, + {"matrix": [5, 4], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 5], "x": 11.5, "y": 1}, + {"matrix": [1, 6], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [6, 0], "x": 1.75, "y": 2}, + {"matrix": [2, 1], "x": 2.75, "y": 2}, + {"matrix": [6, 1], "x": 3.75, "y": 2}, + {"matrix": [2, 2], "x": 4.75, "y": 2}, + {"matrix": [6, 2], "x": 5.75, "y": 2}, + {"matrix": [2, 3], "x": 6.75, "y": 2}, + {"matrix": [6, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [6, 4], "x": 9.75, "y": 2}, + {"matrix": [2, 5], "x": 10.75, "y": 2}, + {"matrix": [6, 5], "x": 11.75, "y": 2}, + {"matrix": [2, 6], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [3, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [3, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [3, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [3, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 6], "x": 14, "y": 3}, + + {"matrix": [0, 7], "x": 1.5, "y": 4}, + {"matrix": [1, 7], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 3], "x": 4, "y": 4, "w": 7}, + {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [7, 7], "x": 12.5, "y": 4} ] } } diff --git a/keyboards/keyhive/lattice60/lattice60.c b/keyboards/keyhive/lattice60/lattice60.c index 6cc0ea42fb..7a5450a678 100644 --- a/keyboards/keyhive/lattice60/lattice60.c +++ b/keyboards/keyhive/lattice60/lattice60.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lattice60.h" +#include "quantum.h" #define LED1_PIN C4 #define LED2_PIN C5 diff --git a/keyboards/keyhive/lattice60/lattice60.h b/keyboards/keyhive/lattice60/lattice60.h deleted file mode 100644 index d9f5f37dea..0000000000 --- a/keyboards/keyhive/lattice60/lattice60.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright 2019 Ethan Durrant (emdarcher) - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_all( \ - k00, k04, k10, k14, k20, k24, k30, k34, k40, k44, k50, k54, k60, k64, k65, \ - k01, k05, k11, k15, k21, k25, k31, k35, k41, k45, k51, k55, k61, k66, \ - k02, k06, k12, k16, k22, k26, k32, k36, k42, k46, k52, k56, k62, \ - k03, k07, k13, k17, k23, k27, k37, k43, k47, k53, k57, k63, k67, \ - k70, k71, k72, k33, k74, k75, k76, k77 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60, k70 }, \ - { k01, k11, k21, k31, k41, k51, k61, k71 }, \ - { k02, k12, k22, k32, k42, k52, k62, k72 }, \ - { k03, k13, k23, k33, k43, k53, k63, KC_NO }, \ - { k04, k14, k24, k34, k44, k54, k64, k74 }, \ - { k05, k15, k25, k35, k45, k55, k65, k75 }, \ - { k06, k16, k26, k36, k46, k56, k66, k76 }, \ - { k07, k17, k27, k37, k47, k57, k67, k77 } \ -} - - -#define LAYOUT_60_hhkb( \ - k00, k04, k10, k14, k20, k24, k30, k34, k40, k44, k50, k54, k60, k64, k65, \ - k01, k05, k11, k15, k21, k25, k31, k35, k41, k45, k51, k55, k61, k66, \ - k02, k06, k12, k16, k22, k26, k32, k36, k42, k46, k52, k56, k62, \ - k03, k07, k13, k17, k23, k27, k37, k43, k47, k53, k57, k63, k67, \ - k70, k71, k33, k76, k77 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60, k70 }, \ - { k01, k11, k21, k31, k41, k51, k61, k71 }, \ - { k02, k12, k22, k32, k42, k52, k62, KC_NO }, \ - { k03, k13, k23, k33, k43, k53, k63, KC_NO }, \ - { k04, k14, k24, k34, k44, k54, k64, KC_NO }, \ - { k05, k15, k25, k35, k45, k55, k65, KC_NO }, \ - { k06, k16, k26, k36, k46, k56, k66, k76 }, \ - { k07, k17, k27, k37, k47, k57, k67, k77 } \ -} |