diff options
Diffstat (limited to 'keyboards/pteron36')
| -rw-r--r-- | keyboards/pteron36/info.json | 156 | ||||
| -rw-r--r-- | keyboards/pteron36/pteron36.c | 2 | ||||
| -rw-r--r-- | keyboards/pteron36/pteron36.h | 59 |
3 files changed, 83 insertions, 134 deletions
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index 66092d592c..54bcb2e7fa 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json | |||
| @@ -34,90 +34,98 @@ | |||
| 34 | "layouts": { | 34 | "layouts": { |
| 35 | "LAYOUT_split_3x5_3": { | 35 | "LAYOUT_split_3x5_3": { |
| 36 | "layout": [ | 36 | "layout": [ |
| 37 | {"x":0, "y":1}, | 37 | {"matrix": [0, 0], "x": 0, "y": 1}, |
| 38 | {"x":1, "y":0.5}, | 38 | {"matrix": [0, 1], "x": 1, "y": 0.5}, |
| 39 | {"x":2, "y":0}, | 39 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 40 | {"x":3, "y":0.5}, | 40 | {"matrix": [0, 3], "x": 3, "y": 0.5}, |
| 41 | {"x":4, "y":0.75}, | 41 | {"matrix": [0, 4], "x": 4, "y": 0.75}, |
| 42 | {"x":10, "y":0.75}, | ||
| 43 | {"x":11, "y":0.5}, | ||
| 44 | {"x":12, "y":0}, | ||
| 45 | {"x":13, "y":0.5}, | ||
| 46 | {"x":14, "y":1}, | ||
| 47 | 42 | ||
| 48 | {"x":0, "y":2}, | 43 | {"matrix": [4, 4], "x": 10, "y": 0.75}, |
| 49 | {"x":1, "y":1.5}, | 44 | {"matrix": [4, 3], "x": 11, "y": 0.5}, |
| 50 | {"x":2, "y":1}, | 45 | {"matrix": [4, 2], "x": 12, "y": 0}, |
| 51 | {"x":3, "y":1.5}, | 46 | {"matrix": [4, 1], "x": 13, "y": 0.5}, |
| 52 | {"x":4, "y":1.75}, | 47 | {"matrix": [4, 0], "x": 14, "y": 1}, |
| 53 | {"x":10, "y":1.75}, | ||
| 54 | {"x":11, "y":1.5}, | ||
| 55 | {"x":12, "y":1}, | ||
| 56 | {"x":13, "y":1.5}, | ||
| 57 | {"x":14, "y":2}, | ||
| 58 | 48 | ||
| 59 | {"x":0, "y":3}, | 49 | {"matrix": [1, 0], "x": 0, "y": 2}, |
| 60 | {"x":1, "y":2.5}, | 50 | {"matrix": [1, 1], "x": 1, "y": 1.5}, |
| 61 | {"x":2, "y":2}, | 51 | {"matrix": [1, 2], "x": 2, "y": 1}, |
| 62 | {"x":3, "y":2.5}, | 52 | {"matrix": [1, 3], "x": 3, "y": 1.5}, |
| 63 | {"x":4, "y":2.75}, | 53 | {"matrix": [1, 4], "x": 4, "y": 1.75}, |
| 64 | {"x":10, "y":2.75}, | ||
| 65 | {"x":11, "y":2.5}, | ||
| 66 | {"x":12, "y":2}, | ||
| 67 | {"x":13, "y":2.5}, | ||
| 68 | {"x":14, "y":3}, | ||
| 69 | 54 | ||
| 70 | {"x":4, "y":4}, | 55 | {"matrix": [5, 4], "x": 10, "y": 1.75}, |
| 71 | {"x":5, "y":4}, | 56 | {"matrix": [5, 3], "x": 11, "y": 1.5}, |
| 72 | {"x":6, "y":4}, | 57 | {"matrix": [5, 2], "x": 12, "y": 1}, |
| 73 | {"x":8, "y":4}, | 58 | {"matrix": [5, 1], "x": 13, "y": 1.5}, |
| 74 | {"x":9, "y":4}, | 59 | {"matrix": [5, 0], "x": 14, "y": 2}, |
| 75 | {"x":10, "y":4} | 60 | |
| 61 | {"matrix": [2, 0], "x": 0, "y": 3}, | ||
| 62 | {"matrix": [2, 1], "x": 1, "y": 2.5}, | ||
| 63 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 64 | {"matrix": [2, 3], "x": 3, "y": 2.5}, | ||
| 65 | {"matrix": [2, 4], "x": 4, "y": 2.75}, | ||
| 66 | |||
| 67 | {"matrix": [6, 4], "x": 10, "y": 2.75}, | ||
| 68 | {"matrix": [6, 3], "x": 11, "y": 2.5}, | ||
| 69 | {"matrix": [6, 2], "x": 12, "y": 2}, | ||
| 70 | {"matrix": [6, 1], "x": 13, "y": 2.5}, | ||
| 71 | {"matrix": [6, 0], "x": 14, "y": 3}, | ||
| 72 | |||
| 73 | {"matrix": [3, 0], "x": 4, "y": 4}, | ||
| 74 | {"matrix": [3, 1], "x": 5, "y": 4}, | ||
| 75 | {"matrix": [3, 2], "x": 6, "y": 4}, | ||
| 76 | |||
| 77 | {"matrix": [7, 2], "x": 8, "y": 4}, | ||
| 78 | {"matrix": [7, 1], "x": 9, "y": 4}, | ||
| 79 | {"matrix": [7, 0], "x": 10, "y": 4} | ||
| 76 | ] | 80 | ] |
| 77 | }, | 81 | }, |
| 78 | "LAYOUT_split_3x5_3_encoder": { | 82 | "LAYOUT_split_3x5_3_encoder": { |
| 79 | "layout": [ | 83 | "layout": [ |
| 80 | {"x":0, "y":1}, | 84 | {"matrix": [0, 0], "x": 0, "y": 1}, |
| 81 | {"x":1, "y":0.5}, | 85 | {"matrix": [0, 1], "x": 1, "y": 0.5}, |
| 82 | {"x":2, "y":0}, | 86 | {"matrix": [0, 2], "x": 2, "y": 0}, |
| 83 | {"x":3, "y":0.5}, | 87 | {"matrix": [0, 3], "x": 3, "y": 0.5}, |
| 84 | {"x":4, "y":0.75}, | 88 | {"matrix": [0, 4], "x": 4, "y": 0.75}, |
| 85 | {"x":10, "y":0.75}, | 89 | |
| 86 | {"x":11, "y":0.5}, | 90 | {"matrix": [4, 4], "x": 10, "y": 0.75}, |
| 87 | {"x":12, "y":0}, | 91 | {"matrix": [4, 3], "x": 11, "y": 0.5}, |
| 88 | {"x":13, "y":0.5}, | 92 | {"matrix": [4, 2], "x": 12, "y": 0}, |
| 89 | {"x":14, "y":1}, | 93 | {"matrix": [4, 1], "x": 13, "y": 0.5}, |
| 94 | {"matrix": [4, 0], "x": 14, "y": 1}, | ||
| 95 | |||
| 96 | {"matrix": [1, 0], "x": 0, "y": 2}, | ||
| 97 | {"matrix": [1, 1], "x": 1, "y": 1.5}, | ||
| 98 | {"matrix": [1, 2], "x": 2, "y": 1}, | ||
| 99 | {"matrix": [1, 3], "x": 3, "y": 1.5}, | ||
| 100 | {"matrix": [1, 4], "x": 4, "y": 1.75}, | ||
| 101 | |||
| 102 | {"matrix": [5, 4], "x": 10, "y": 1.75}, | ||
| 103 | {"matrix": [5, 3], "x": 11, "y": 1.5}, | ||
| 104 | {"matrix": [5, 2], "x": 12, "y": 1}, | ||
| 105 | {"matrix": [5, 1], "x": 13, "y": 1.5}, | ||
| 106 | {"matrix": [5, 0], "x": 14, "y": 2}, | ||
| 107 | |||
| 108 | {"matrix": [2, 0], "x": 0, "y": 3}, | ||
| 109 | {"matrix": [2, 1], "x": 1, "y": 2.5}, | ||
| 110 | {"matrix": [2, 2], "x": 2, "y": 2}, | ||
| 111 | {"matrix": [2, 3], "x": 3, "y": 2.5}, | ||
| 112 | {"matrix": [2, 4], "x": 4, "y": 2.75}, | ||
| 113 | {"matrix": [3, 4], "x": 5.5, "y": 2.75}, | ||
| 90 | 114 | ||
| 91 | {"x":0, "y":2}, | 115 | {"matrix": [7, 4], "x": 8.5, "y": 2.75}, |
| 92 | {"x":1, "y":1.5}, | 116 | {"matrix": [6, 4], "x": 10, "y": 2.75}, |
| 93 | {"x":2, "y":1}, | 117 | {"matrix": [6, 3], "x": 11, "y": 2.5}, |
| 94 | {"x":3, "y":1.5}, | 118 | {"matrix": [6, 2], "x": 12, "y": 2}, |
| 95 | {"x":4, "y":1.75}, | 119 | {"matrix": [6, 1], "x": 13, "y": 2.5}, |
| 96 | {"x":10, "y":1.75}, | 120 | {"matrix": [6, 0], "x": 14, "y": 3}, |
| 97 | {"x":11, "y":1.5}, | ||
| 98 | {"x":12, "y":1}, | ||
| 99 | {"x":13, "y":1.5}, | ||
| 100 | {"x":14, "y":2}, | ||
| 101 | 121 | ||
| 102 | {"x":0, "y":3}, | 122 | {"matrix": [3, 0], "x": 4, "y": 4}, |
| 103 | {"x":1, "y":2.5}, | 123 | {"matrix": [3, 1], "x": 5, "y": 4}, |
| 104 | {"x":2, "y":2}, | 124 | {"matrix": [3, 2], "x": 6, "y": 4}, |
| 105 | {"x":3, "y":2.5}, | ||
| 106 | {"x":4, "y":2.75}, | ||
| 107 | {"label":"enc1", "x":5.5, "y":2.75}, | ||
| 108 | {"label":"enc2", "x":8.5, "y":2.75}, | ||
| 109 | {"x":10, "y":2.75}, | ||
| 110 | {"x":11, "y":2.5}, | ||
| 111 | {"x":12, "y":2}, | ||
| 112 | {"x":13, "y":2.5}, | ||
| 113 | {"x":14, "y":3}, | ||
| 114 | 125 | ||
| 115 | {"x":4, "y":4}, | 126 | {"matrix": [7, 2], "x": 8, "y": 4}, |
| 116 | {"x":5, "y":4}, | 127 | {"matrix": [7, 1], "x": 9, "y": 4}, |
| 117 | {"x":6, "y":4}, | 128 | {"matrix": [7, 0], "x": 10, "y": 4} |
| 118 | {"x":8, "y":4}, | ||
| 119 | {"x":9, "y":4}, | ||
| 120 | {"x":10, "y":4} | ||
| 121 | ] | 129 | ] |
| 122 | } | 130 | } |
| 123 | } | 131 | } |
diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c index 4c14e6ebd5..fbcc64b706 100644 --- a/keyboards/pteron36/pteron36.c +++ b/keyboards/pteron36/pteron36.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "pteron36.h" | 17 | #include "quantum.h" |
| 18 | 18 | ||
| 19 | //common encoder setup | 19 | //common encoder setup |
| 20 | 20 | ||
diff --git a/keyboards/pteron36/pteron36.h b/keyboards/pteron36/pteron36.h deleted file mode 100644 index 113e7270db..0000000000 --- a/keyboards/pteron36/pteron36.h +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | /* Copyright 2021 Harshit Goel | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | /* This is a shortcut to help you visually see your layout. | ||
| 22 | * | ||
| 23 | * The first section contains all of the arguments representing the physical | ||
| 24 | * layout of the board and position of the keys. | ||
| 25 | * | ||
| 26 | * The second converts the arguments into a two-dimensional array which | ||
| 27 | * represents the switch matrix. | ||
| 28 | */ | ||
| 29 | |||
| 30 | #define LAYOUT_split_3x5_3( \ | ||
| 31 | L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\ | ||
| 32 | L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\ | ||
| 33 | L20, L21, L22,L23, L24 , R24, R23, R22, R21, R20, \ | ||
| 34 | L30, L31, L32, R32, R31, R30\ | ||
| 35 | ) {\ | ||
| 36 | {L00, L01, L02,L03, L04 },\ | ||
| 37 | {L10, L11, L12,L13, L14 },\ | ||
| 38 | {L20, L21, L22,L23, L24 },\ | ||
| 39 | {L30, L31, L32, KC_NO, KC_NO },\ | ||
| 40 | {R00, R01, R02,R03, R04 },\ | ||
| 41 | {R10, R11, R12,R13, R14 },\ | ||
| 42 | {R20, R21, R22,R23, R24 },\ | ||
| 43 | {R30, R31, R32,KC_NO, KC_NO }\ | ||
| 44 | } | ||
| 45 | #define LAYOUT_split_3x5_3_encoder(\ | ||
| 46 | L00, L01, L02,L03, L04 , R04, R03, R02, R01, R00,\ | ||
| 47 | L10, L11, L12,L13, L14 , R14, R13, R12, R11, R10,\ | ||
| 48 | L20, L21, L22,L23, L24 ,L34, R34,R24, R23, R22, R21, R20, \ | ||
| 49 | L30, L31, L32, R32, R31, R30\ | ||
| 50 | ){\ | ||
| 51 | {L00, L01, L02,L03, L04 },\ | ||
| 52 | {L10, L11, L12,L13, L14 },\ | ||
| 53 | {L20, L21, L22,L23, L24 },\ | ||
| 54 | {L30, L31, L32, KC_NO, L34 },\ | ||
| 55 | {R00, R01, R02,R03, R04 },\ | ||
| 56 | {R10, R11, R12,R13, R14 },\ | ||
| 57 | {R20, R21, R22,R23, R24 },\ | ||
| 58 | {R30, R31, R32,KC_NO, R34 }\ | ||
| 59 | } | ||
