summaryrefslogtreecommitdiff
path: root/keyboards/gboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gboards')
-rw-r--r--keyboards/gboards/butterstick/config.h6
-rw-r--r--keyboards/gboards/butterstick/info.json5
-rw-r--r--keyboards/gboards/butterstick/sten.h5
-rw-r--r--keyboards/gboards/engine/engine.h7
-rw-r--r--keyboards/gboards/engine/keymap_engine.h2
-rw-r--r--keyboards/gboards/ergotaco/ergotaco.c2
-rw-r--r--keyboards/gboards/ergotaco/info.json61
-rw-r--r--keyboards/gboards/ergotaco/matrix.c7
-rw-r--r--keyboards/gboards/g/config_default.h2
-rw-r--r--keyboards/gboards/g/engine.h10
-rw-r--r--keyboards/gboards/g/keymap_combo.h2
-rw-r--r--keyboards/gboards/g/keymap_engine.h3
-rw-r--r--keyboards/gboards/georgi/georgi.c2
-rw-r--r--keyboards/gboards/georgi/matrix.c8
-rw-r--r--keyboards/gboards/georgi/sten.h4
-rw-r--r--keyboards/gboards/gergo/gergo.c2
-rw-r--r--keyboards/gboards/gergo/info.json4
-rw-r--r--keyboards/gboards/gergo/matrix.c7
-rw-r--r--keyboards/gboards/gergoplex/gergoplex.h18
-rw-r--r--keyboards/gboards/gergoplex/info.json76
20 files changed, 84 insertions, 149 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..39740ac3d3 100644
--- a/keyboards/gboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
@@ -5,9 +5,10 @@
//
// Amen.
-#include QMK_KEYBOARD_H
+#pragma once
+
+#include "butterstick.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..005dd730b8 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -10,15 +10,12 @@
crap is removed where possible
*/
-#include QMK_KEYBOARD_H
#pragma once
-#include "keymap.h"
+
+#include "quantum.h"
#include <string.h>
-#include <stdint.h>
#include <stdio.h>
#include "config_engine.h"
-#include <avr/pgmspace.h>
-#include "wait.h"
// Maximum values for combos
#define COMBO_END 0x00
diff --git a/keyboards/gboards/engine/keymap_engine.h b/keyboards/gboards/engine/keymap_engine.h
index 599c1ca3e4..dfed493e21 100644
--- a/keyboards/gboards/engine/keymap_engine.h
+++ b/keyboards/gboards/engine/keymap_engine.h
@@ -7,6 +7,8 @@
* With this disgusting bodge, you can just edit your .defs and compile!
*/
+#pragma once
+
// Clear all X Macros
#define PRES BLANK
#define KEYS BLANK
diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index ecab74b3a2..daeba1e0a6 100644
--- a/keyboards/gboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
bool i2c_initialized = 0;
i2c_status_t mcp23018_status = 0x20;
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/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 1bab5e8981..63d4c4f5f3 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -17,15 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
#include "wait.h"
-#include "action_layer.h"
-#include "print.h"
#include "debug.h"
#include "util.h"
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
diff --git a/keyboards/gboards/g/config_default.h b/keyboards/gboards/g/config_default.h
index 821c2c4ad5..56dd634d13 100644
--- a/keyboards/gboards/g/config_default.h
+++ b/keyboards/gboards/g/config_default.h
@@ -1,3 +1,5 @@
+#pragma once
+
#include "engine.h"
// Configuration options for the engine
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index 547ea09fdd..a78ddc96ff 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -10,18 +10,12 @@
crap is removed where possible
*/
-#include QMK_KEYBOARD_H
#pragma once
-#include "keymap.h"
+
+#include "quantum.h"
#include <string.h>
-#include <stdint.h>
#include <stdio.h>
#include "config_engine.h"
-#include <avr/pgmspace.h>
-#include "wait.h"
-#ifdef MOUSEKEY_ENABLE
-# include "mousekey.h"
-#endif
// Set defaults
#ifndef IN_CHORD_MASK
diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h
index 68ea44b1b4..c062a298a5 100644
--- a/keyboards/gboards/g/keymap_combo.h
+++ b/keyboards/gboards/g/keymap_combo.h
@@ -1,3 +1,5 @@
+#pragma once
+
// Keymap helpers
// define reference layers per layer.
#define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER) \
diff --git a/keyboards/gboards/g/keymap_engine.h b/keyboards/gboards/g/keymap_engine.h
index 055b5941e4..e134472da0 100644
--- a/keyboards/gboards/g/keymap_engine.h
+++ b/keyboards/gboards/g/keymap_engine.h
@@ -6,6 +6,9 @@
* using a external generator (Like is done for the ASETNIOP base keymaps)
* With this disgusting bodge, you can just edit your .defs and compile!
*/
+
+#pragma once
+
#include "g/engine.h"
// Clear all X Macros
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 8866886ce7..dd95b593f1 100644
--- a/keyboards/gboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "georgi.h"
bool i2c_initialized = 0;
i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 5ac696fd31..b66b1a194c 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -17,16 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
#include "wait.h"
-#include "action_layer.h"
-#include "print.h"
#include "debug.h"
#include "util.h"
-#include "keymap_steno.h"
-#include QMK_KEYBOARD_H
+#include "georgi.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 320c49514c..b5aa79893e 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 "georgi.h"
#include "mousekey.h"
-#include "keymap.h"
#include "keymap_steno.h"
#include "wait.h"
diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
index ba359f8145..da2a3007a8 100644
--- a/keyboards/gboards/gergo/gergo.c
+++ b/keyboards/gboards/gergo/gergo.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "gergo.h"
bool i2c_initialized = 0;
i2c_status_t mcp23018_status = 0x20;
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",
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index c352be24e1..8a6b38bf73 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -17,16 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
#include "wait.h"
-#include "action_layer.h"
-#include "print.h"
#include "debug.h"
#include "util.h"
#include "debounce.h"
-#include QMK_KEYBOARD_H
+#include "gergo.h"
#ifdef BALLER
#include <avr/interrupt.h>
diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h
index eda21d2a94..549228104a 100644
--- a/keyboards/gboards/gergoplex/gergoplex.h
+++ b/keyboards/gboards/gergoplex/gergoplex.h
@@ -35,21 +35,3 @@ extern i2c_status_t mcp23018_status;
#define OLATA 0x14 // output latch register
uint8_t init_mcp23018(void);
-
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L30, L31, L32, R30, R31, R32 \
-) { \
- { L04, L14, L24, XXX }, \
- { L03, L13, L23, L32 }, \
- { L02, L12, L22, L31 }, \
- { L01, L11, L21, L30 }, \
- { L00, L10, L20, XXX }, \
- { R00, R10, R20, XXX }, \
- { R01, R11, R21, R30 }, \
- { R02, R12, R22, R31 }, \
- { R03, R13, R23, R32 }, \
- { R04, R14, R24, XXX } \
-}
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index 914832aacf..061f8ff869 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -14,45 +14,49 @@
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- {"label":"L00", "x":0, "y":0.25},
- {"label":"L01", "x":1, "y":0.125},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0.125},
- {"label":"L04", "x":4, "y":0.375},
- {"label":"R00", "x":8, "y":0.375},
- {"label":"R01", "x":9, "y":0.125},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0.125},
- {"label":"R04", "x":12, "y":0.25},
+ {"matrix": [4, 0], "x": 0, "y": 0.25},
+ {"matrix": [3, 0], "x": 1, "y": 0.125},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [1, 0], "x": 3, "y": 0.125},
+ {"matrix": [0, 0], "x": 4, "y": 0.375},
- {"label":"L10", "x":0, "y":1.25},
- {"label":"L11", "x":1, "y":1.125},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1.125},
- {"label":"L14", "x":4, "y":1.375},
- {"label":"R10", "x":8, "y":1.375},
- {"label":"R11", "x":9, "y":1.125},
- {"label":"R12", "x":10, "y":1},
- {"label":"R13", "x":11, "y":1.125},
- {"label":"R14", "x":12, "y":1.25},
+ {"matrix": [5, 0], "x": 8, "y": 0.375},
+ {"matrix": [6, 0], "x": 9, "y": 0.125},
+ {"matrix": [7, 0], "x": 10, "y": 0},
+ {"matrix": [8, 0], "x": 11, "y": 0.125},
+ {"matrix": [9, 0], "x": 12, "y": 0.25},
- {"label":"L20", "x":0, "y":2.25},
- {"label":"L21", "x":1, "y":2.125},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2.125},
- {"label":"L24", "x":4, "y":2.375},
- {"label":"R20", "x":8, "y":2.375},
- {"label":"R21", "x":9, "y":2.125},
- {"label":"R22", "x":10, "y":2},
- {"label":"R23", "x":11, "y":2.125},
- {"label":"R24", "x":12, "y":2.25},
+ {"matrix": [4, 1], "x": 0, "y": 1.25},
+ {"matrix": [3, 1], "x": 1, "y": 1.125},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1.125},
+ {"matrix": [0, 1], "x": 4, "y": 1.375},
- {"label":"L30", "x":2, "y":3.5},
- {"label":"L31", "x":3.25, "y":3.625, "w":1.5},
- {"label":"L32", "x":5, "y":3.125, "h":2},
- {"label":"R30", "x":7, "y":3.125, "h":2},
- {"label":"R31", "x":8.25, "y":3.625, "w":1.5},
- {"label":"R32", "x":10, "y":3.5}
+ {"matrix": [5, 1], "x": 8, "y": 1.375},
+ {"matrix": [6, 1], "x": 9, "y": 1.125},
+ {"matrix": [7, 1], "x": 10, "y": 1},
+ {"matrix": [8, 1], "x": 11, "y": 1.125},
+ {"matrix": [9, 1], "x": 12, "y": 1.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 2.25},
+ {"matrix": [3, 2], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 3, "y": 2.125},
+ {"matrix": [0, 2], "x": 4, "y": 2.375},
+
+ {"matrix": [5, 2], "x": 8, "y": 2.375},
+ {"matrix": [6, 2], "x": 9, "y": 2.125},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [8, 2], "x": 11, "y": 2.125},
+ {"matrix": [9, 2], "x": 12, "y": 2.25},
+
+ {"matrix": [3, 3], "x": 2, "y": 3.5},
+ {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+ {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
+
+ {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
+ {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+ {"matrix": [8, 3], "x": 10, "y": 3.5}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 23:41:37 +0000