diff options
Diffstat (limited to 'keyboards/cannonkeys/ortho60v2')
-rw-r--r-- | keyboards/cannonkeys/ortho60v2/info.json | 122 | ||||
-rw-r--r-- | keyboards/cannonkeys/ortho60v2/ortho60v2.c | 31 | ||||
-rw-r--r-- | keyboards/cannonkeys/ortho60v2/ortho60v2.h | 19 |
3 files changed, 61 insertions, 111 deletions
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/info.json index 03e1a28f30..360c98bff9 100644 --- a/keyboards/cannonkeys/ortho60v2/info.json +++ b/keyboards/cannonkeys/ortho60v2/info.json @@ -27,7 +27,7 @@ }, "encoder": { "rotary": [ - { "pin_a": "GP28", "pin_b": "GP29" } + {"pin_a": "GP28", "pin_b": "GP29"} ] }, "backlight": { @@ -38,66 +38,66 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - { "label": "`", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "label": "1", "matrix": [0, 1], "x": 1.0, "y": 0.0 }, - { "label": "2", "matrix": [0, 2], "x": 2.0, "y": 0.0 }, - { "label": "3", "matrix": [0, 3], "x": 3.0, "y": 0.0 }, - { "label": "4", "matrix": [0, 4], "x": 4.0, "y": 0.0 }, - { "label": "5", "matrix": [0, 5], "x": 5.0, "y": 0.0 }, - { "label": "6", "matrix": [0, 6], "x": 6.0, "y": 0.0 }, - { "label": "7", "matrix": [0, 7], "x": 7.0, "y": 0.0 }, - { "label": "8", "matrix": [0, 8], "x": 8.0, "y": 0.0 }, - { "label": "9", "matrix": [0, 9], "x": 9.0, "y": 0.0 }, - { "label": "0", "matrix": [0, 10], "x": 10.0, "y": 0.0 }, - { "label": "Del", "matrix": [0, 11], "x": 11.0, "y": 0.0 }, - { "label": "Tab", "matrix": [1, 0], "x": 0.0, "y": 1.0 }, - { "label": "Q", "matrix": [1, 1], "x": 1.0, "y": 1.0 }, - { "label": "W", "matrix": [1, 2], "x": 2.0, "y": 1.0 }, - { "label": "E", "matrix": [1, 3], "x": 3.0, "y": 1.0 }, - { "label": "R", "matrix": [1, 4], "x": 4.0, "y": 1.0 }, - { "label": "T", "matrix": [1, 5], "x": 5.0, "y": 1.0 }, - { "label": "Y", "matrix": [1, 6], "x": 6.0, "y": 1.0 }, - { "label": "U", "matrix": [1, 7], "x": 7.0, "y": 1.0 }, - { "label": "I", "matrix": [1, 8], "x": 8.0, "y": 1.0 }, - { "label": "O", "matrix": [1, 9], "x": 9.0, "y": 1.0 }, - { "label": "P", "matrix": [1, 10], "x": 10.0, "y": 1.0 }, - { "label": "Back Space", "matrix": [1, 11], "x": 11.0, "y": 1.0 }, - { "label": "Esc", "matrix": [2, 0], "x": 0.0, "y": 2.0 }, - { "label": "A", "matrix": [2, 1], "x": 1.0, "y": 2.0 }, - { "label": "S", "matrix": [2, 2], "x": 2.0, "y": 2.0 }, - { "label": "D", "matrix": [2, 3], "x": 3.0, "y": 2.0 }, - { "label": "F", "matrix": [2, 4], "x": 4.0, "y": 2.0 }, - { "label": "G", "matrix": [2, 5], "x": 5.0, "y": 2.0 }, - { "label": "H", "matrix": [2, 6], "x": 6.0, "y": 2.0 }, - { "label": "J", "matrix": [2, 7], "x": 7.0, "y": 2.0 }, - { "label": "K", "matrix": [2, 8], "x": 8.0, "y": 2.0 }, - { "label": "L", "matrix": [2, 9], "x": 9.0, "y": 2.0 }, - { "label": ";", "matrix": [2, 10], "x": 10.0, "y": 2.0 }, - { "label": "'", "matrix": [2, 11], "x": 11.0, "y": 2.0 }, - { "label": "Shift", "matrix": [3, 0], "x": 0.0, "y": 3.0 }, - { "label": "Z", "matrix": [3, 1], "x": 1.0, "y": 3.0 }, - { "label": "X", "matrix": [3, 2], "x": 2.0, "y": 3.0 }, - { "label": "C", "matrix": [3, 3], "x": 3.0, "y": 3.0 }, - { "label": "V", "matrix": [3, 4], "x": 4.0, "y": 3.0 }, - { "label": "B", "matrix": [3, 5], "x": 5.0, "y": 3.0 }, - { "label": "N", "matrix": [3, 6], "x": 6.0, "y": 3.0 }, - { "label": "M", "matrix": [3, 7], "x": 7.0, "y": 3.0 }, - { "label": ",", "matrix": [3, 8], "x": 8.0, "y": 3.0 }, - { "label": ".", "matrix": [3, 9], "x": 9.0, "y": 3.0 }, - { "label": "/", "matrix": [3, 10], "x": 10.0, "y": 3.0 }, - { "label": "Return", "matrix": [3, 11], "x": 11.0, "y": 3.0 }, - { "matrix": [4, 0], "x": 0.0, "y": 4.0 }, - { "label": "Ctrl", "matrix": [4, 1], "x": 1.0, "y": 4.0 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.0, "y": 4.0 }, - { "label": "Super", "matrix": [4, 3], "x": 3.0, "y": 4.0 }, - { "label": "Lower", "matrix": [4, 4], "x": 4.0, "y": 4.0 }, - { "matrix": [4, 5], "x": 5.0, "y": 4.0 }, - { "matrix": [4, 6], "x": 6.0, "y": 4.0 }, - { "label": "Raise", "matrix": [4, 7], "x": 7.0, "y": 4.0 }, - { "label": "←", "matrix": [4, 8], "x": 8.0, "y": 4.0 }, - { "label": "↓", "matrix": [4, 9], "x": 9.0, "y": 4.0 }, - { "label": "↑", "matrix": [4, 10], "x": 10.0, "y": 4.0 }, - { "label": "→", "matrix": [4, 11], "x": 11.0, "y": 4.0 } + {"label": "`", "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": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "Del", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "Back Space", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 5, "y": 3}, + {"label": "N", "matrix": [3, 6], "x": 6, "y": 3}, + {"label": "M", "matrix": [3, 7], "x": 7, "y": 3}, + {"label": ",", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": ".", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "/", "matrix": [3, 10], "x": 10, "y": 3}, + {"label": "Return", "matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2, "y": 4}, + {"label": "Super", "matrix": [4, 3], "x": 3, "y": 4}, + {"label": "Lower", "matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"label": "Raise", "matrix": [4, 7], "x": 7, "y": 4}, + {"label": "←", "matrix": [4, 8], "x": 8, "y": 4}, + {"label": "↓", "matrix": [4, 9], "x": 9, "y": 4}, + {"label": "↑", "matrix": [4, 10], "x": 10, "y": 4}, + {"label": "→", "matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.c b/keyboards/cannonkeys/ortho60v2/ortho60v2.c deleted file mode 100644 index 0fc9239ee8..0000000000 --- a/keyboards/cannonkeys/ortho60v2/ortho60v2.c +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2022 CannonKeys - -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 "ortho60v2.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - return true; -} -#endif diff --git a/keyboards/cannonkeys/ortho60v2/ortho60v2.h b/keyboards/cannonkeys/ortho60v2/ortho60v2.h deleted file mode 100644 index a9ca3d7e47..0000000000 --- a/keyboards/cannonkeys/ortho60v2/ortho60v2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2022 CannonKeys - -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" |