diff options
| author | Ryan <fauxpark@gmail.com> | 2023-04-25 02:38:35 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 02:38:35 +1000 |
| commit | f111bea3cda240b7c54bff2e12b5043b7b0797f7 (patch) | |
| tree | 9fa3b3356f50e0b989231bf69da4ce00c18e85e0 /keyboards/gboards | |
| parent | 72d2be24f9bb1ab40a7a64447f2625c31b22a201 (diff) | |
Move miscellaneous layouts to data driven (#20516)
Diffstat (limited to 'keyboards/gboards')
| -rw-r--r-- | keyboards/gboards/butterstick/butterstick.c | 2 | ||||
| -rw-r--r-- | keyboards/gboards/butterstick/butterstick.h | 11 | ||||
| -rw-r--r-- | keyboards/gboards/butterstick/info.json | 40 | ||||
| -rw-r--r-- | keyboards/gboards/butterstick/sten.h | 2 |
4 files changed, 22 insertions, 33 deletions
diff --git a/keyboards/gboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c index 3bcbcbe8b4..e19edc69ac 100644 --- a/keyboards/gboards/butterstick/butterstick.c +++ b/keyboards/gboards/butterstick/butterstick.c @@ -13,7 +13,7 @@ * 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 "butterstick.h" +#include "quantum.h" void matrix_scan_kb(void) { #ifdef DEBUG_MATRIX diff --git a/keyboards/gboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h deleted file mode 100644 index f97488c3f5..0000000000 --- a/keyboards/gboards/butterstick/butterstick.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_butter( \ - k09, k08, k07, k06, k05, k04, k03, k02, k01, k00, \ - k19, k18, k17, k16, k15, k14, k13, k12, k11, k10 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \ -} diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 465cd940a1..d2fc3d3f40 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -18,27 +18,27 @@ "layouts": { "LAYOUT_butter": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, + {"matrix": [0, 9], "x": 0, "y": 0}, + {"matrix": [0, 8], "x": 1, "y": 0}, + {"matrix": [0, 7], "x": 2, "y": 0}, + {"matrix": [0, 6], "x": 3, "y": 0}, + {"matrix": [0, 5], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 1], "x": 8, "y": 0}, + {"matrix": [0, 0], "x": 9, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1} + {"matrix": [1, 9], "x": 0, "y": 1}, + {"matrix": [1, 8], "x": 1, "y": 1}, + {"matrix": [1, 7], "x": 2, "y": 1}, + {"matrix": [1, 6], "x": 3, "y": 1}, + {"matrix": [1, 5], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [1, 2], "x": 7, "y": 1}, + {"matrix": [1, 1], "x": 8, "y": 1}, + {"matrix": [1, 0], "x": 9, "y": 1} ] } } diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h index 39740ac3d3..84c54c9e2e 100644 --- a/keyboards/gboards/butterstick/sten.h +++ b/keyboards/gboards/butterstick/sten.h @@ -7,7 +7,7 @@ #pragma once -#include "butterstick.h" +#include QMK_KEYBOARD_H #include "mousekey.h" #include "keymap_steno.h" #include "wait.h" |