diff options
Diffstat (limited to 'keyboards/gboards')
| -rw-r--r-- | keyboards/gboards/butterstick/config.h | 6 | ||||
| -rw-r--r-- | keyboards/gboards/butterstick/info.json | 5 | ||||
| -rw-r--r-- | keyboards/gboards/butterstick/sten.h | 3 | ||||
| -rw-r--r-- | keyboards/gboards/engine/engine.h | 3 | ||||
| -rw-r--r-- | keyboards/gboards/ergotaco/info.json | 61 | ||||
| -rw-r--r-- | keyboards/gboards/g/engine.h | 4 | ||||
| -rw-r--r-- | keyboards/gboards/georgi/sten.h | 2 | ||||
| -rw-r--r-- | keyboards/gboards/gergo/info.json | 4 |
8 files changed, 26 insertions, 62 deletions
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index d0415c48f5..a3516ccedb 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -4,9 +4,3 @@ #define VERSION "Paula Deen" #define FORCE_NKRO - -#define MATRIX_ROW_PINS { F4, F5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 085d56f91e..465cd940a1 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -8,6 +8,11 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"], + "rows": ["F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h index 0d5c58df21..84c54c9e2e 100644 --- a/keyboards/gboards/butterstick/sten.h +++ b/keyboards/gboards/butterstick/sten.h @@ -5,9 +5,10 @@ // // Amen. +#pragma once + #include QMK_KEYBOARD_H #include "mousekey.h" -#include "keymap.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 5b9d5b0ecb..5b2da811d8 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -10,9 +10,8 @@ crap is removed where possible */ -#include QMK_KEYBOARD_H #pragma once -#include "keymap.h" +#include QMK_KEYBOARD_H #include <string.h> #include <stdint.h> #include <stdio.h> diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index 163b76db19..8414985841 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -13,54 +13,19 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 1.25 - }, - { - "x": 1, - "y": 0.75 - }, - { - "x": 2, - "y": 0.5 - }, - { - "x": 3, - "y": 0.25 - }, - { - "x": 4, - "y": 1 - }, - { - "x": 5, - "y": 1.75 - }, - { - "x": 7, - "y": 1.75 - }, - { - "x": 8, - "y": 1 - }, - { - "x": 9, - "y": 0.25 - }, - { - "x": 10, - "y": 0.5 - }, - { - "x": 11, - "y": 0.75 - }, - { - "x": 12, - "y": 1.25 - } + {"x": 0, "y": 1}, + {"x": 1, "y": 0.5}, + {"x": 2, "y": 0.25}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.75}, + {"x": 5, "y": 1.5}, + + {"x": 7, "y": 1.5}, + {"x": 8, "y": 0.75}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0.25}, + {"x": 11, "y": 0.5}, + {"x": 12, "y": 1} ] } } diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index 547ea09fdd..e166ba37d2 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -10,9 +10,9 @@ crap is removed where possible */ -#include QMK_KEYBOARD_H #pragma once -#include "keymap.h" + +#include QMK_KEYBOARD_H #include <string.h> #include <stdint.h> #include <stdio.h> diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h index 320c49514c..05d518efac 100644 --- a/keyboards/gboards/georgi/sten.h +++ b/keyboards/gboards/georgi/sten.h @@ -4,10 +4,10 @@ // the slave and the master. Until we return from main. // // Amen. +#pragma once #include QMK_KEYBOARD_H #include "mousekey.h" -#include "keymap.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index f38051809d..5aadadbaed 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -100,7 +100,7 @@ { "label": "L13", "x": 3.5, - "y": 1.0 + "y": 1 }, { "label": "L14", @@ -137,7 +137,7 @@ { "label": "R13", "x": 15, - "y": 1.0 + "y": 1 }, { "label": "R14", |