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/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/engine.h10
-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
14 files changed, 35 insertions, 95 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/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/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/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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 22:25:29 +0000