summaryrefslogtreecommitdiff
path: root/keyboards/handwired/pill60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/pill60')
-rw-r--r--keyboards/handwired/pill60/info.json128
-rw-r--r--keyboards/handwired/pill60/pill60.h42
2 files changed, 64 insertions, 106 deletions
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index 0c8f353bff..6cc337f8ee 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -22,75 +22,75 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "Enc", "x": 0, "y": 0},
+ {"matrix": [4, 3], "x": 0, "y": 0},
- {"label": "Esc", "x": 0, "y": 1},
- {"label": "1","x": 1, "y": 1},
- {"label": "2","x": 2, "y": 1},
- {"label": "3","x": 3, "y": 1},
- {"label": "4","x": 4, "y": 1},
- {"label": "5","x": 5, "y": 1},
- {"label": "6","x": 6, "y": 1},
- {"label": "7","x": 7, "y": 1},
- {"label": "8","x": 8, "y": 1},
- {"label": "9","x": 9, "y": 1},
- {"label": "0","x": 10, "y": 1},
- {"label": "-","x": 11, "y": 1},
- {"label": "=","x": 12, "y": 1},
- {"label": "\\","x": 13, "y": 1},
- {"label": "Del","x": 14, "y": 1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
+ {"matrix": [0, 13], "x": 13, "y": 1},
+ {"matrix": [2, 13], "x": 14, "y": 1},
- {"label": "Tab","x": 0, "y": 2, "w": 1.5},
- {"label": "Q","x": 1.5, "y": 2},
- {"label": "W","x": 2.5, "y": 2},
- {"label": "E","x": 3.5, "y": 2},
- {"label": "R","x": 4.5, "y": 2},
- {"label": "T","x": 5.5, "y": 2},
- {"label": "Y","x": 6.5, "y": 2},
- {"label": "U","x": 7.5, "y": 2},
- {"label": "I","x": 8.5, "y": 2},
- {"label": "O","x": 9.5, "y": 2},
- {"label": "P","x": 10.5, "y": 2},
- {"label": "[","x": 11.5, "y": 2},
- {"label": "]","x": 12.5, "y": 2},
- {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [1, 6], "x": 6.5, "y": 2},
+ {"matrix": [1, 7], "x": 7.5, "y": 2},
+ {"matrix": [1, 8], "x": 8.5, "y": 2},
+ {"matrix": [1, 9], "x": 9.5, "y": 2},
+ {"matrix": [1, 10], "x": 10.5, "y": 2},
+ {"matrix": [1, 11], "x": 11.5, "y": 2},
+ {"matrix": [1, 12], "x": 12.5, "y": 2},
+ {"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"label": "Caps","x": 0, "y": 3, "w": 1.75},
- {"label": "A","x": 1.75, "y": 3},
- {"label": "S","x": 2.75, "y": 3},
- {"label": "D","x": 3.75, "y": 3},
- {"label": "F","x": 4.75, "y": 3},
- {"label": "G","x": 5.75, "y": 3},
- {"label": "H","x": 6.75, "y": 3},
- {"label": "J","x": 7.75, "y": 3},
- {"label": "K","x": 8.75, "y": 3},
- {"label": "L","x": 9.75, "y": 3},
- {"label": ";","x": 10.75, "y": 3},
- {"label": "'","x": 11.75, "y": 3},
- {"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [2, 6], "x": 6.75, "y": 3},
+ {"matrix": [2, 7], "x": 7.75, "y": 3},
+ {"matrix": [2, 8], "x": 8.75, "y": 3},
+ {"matrix": [2, 9], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 12], "x": 12.75, "y": 3, "w": 2.25},
- {"label": "L Shift","x": 0, "y": 4, "w": 2.25},
- {"label": "Z","x": 2.25, "y": 4},
- {"label": "X","x": 3.25, "y": 4},
- {"label": "C","x": 4.25, "y": 4},
- {"label": "V","x": 5.25, "y": 4},
- {"label": "B","x": 6.25, "y": 4},
- {"label": "N","x": 7.25, "y": 4},
- {"label": "M","x": 8.25, "y": 4},
- {"label": ",","x": 9.25, "y": 4},
- {"label": ".","x": 10.25, "y": 4},
- {"label": "/","x": 11.25, "y": 4},
- {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
- {"label": "FN","x": 14, "y": 4},
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 4},
+ {"matrix": [3, 2], "x": 3.25, "y": 4},
+ {"matrix": [3, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 4], "x": 5.25, "y": 4},
+ {"matrix": [3, 5], "x": 6.25, "y": 4},
+ {"matrix": [3, 6], "x": 7.25, "y": 4},
+ {"matrix": [3, 7], "x": 8.25, "y": 4},
+ {"matrix": [3, 8], "x": 9.25, "y": 4},
+ {"matrix": [3, 9], "x": 10.25, "y": 4},
+ {"matrix": [3, 10], "x": 11.25, "y": 4},
+ {"matrix": [3, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 4},
- {"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
- {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
- {"label": "L ALT","x": 2.5, "y": 5, "w": 1.25},
- {"label": "Space","x": 3.75, "y": 5, "w": 6.25},
- {"label": "R ALT","x": 10, "y": 5, "w": 1.25},
- {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25},
- {"label": "FN","x": 12.5, "y": 5, "w": 1.25},
- {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 5, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 5, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/pill60/pill60.h b/keyboards/handwired/pill60/pill60.h
deleted file mode 100644
index e020f1eb75..0000000000
--- a/keyboards/handwired/pill60/pill60.h
+++ /dev/null
@@ -1,42 +0,0 @@
- /* Copyright 2020 Imam Rafii
- *
- * 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"
-
-/* LAYOUT
- ENCODER
- ESC| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |BCKS | DEL
- TAB| Q | W | E | R | T | Y | U | I | O | P | [ | ] | \
- CAP| A | S | D | F | G | H | J | K | L | ; | ' | ENTER
- LSHFT| Z | X | C | V | B | N | M | , | . | / | RSHIF | FN
- LCT| WIN| ALT| ESPACE | ALT| WIN | MN| RCT|
-*/
-
-#define LAYOUT( \
- e00, \
- 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, k1e, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \
- k40, k41, k42, k47, k4a, k4b, k4c, k4e \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k0e }, \
- { k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, KC_NO }, \
- { k40, k41, k42, e00, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4e }\
-}