aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gboards')
-rw-r--r--keyboards/gboards/butterstick/keyboard.json (renamed from keyboards/gboards/butterstick/info.json)11
-rw-r--r--keyboards/gboards/butterstick/rules.mk9
-rw-r--r--keyboards/gboards/engine/engine.h5
-rw-r--r--keyboards/gboards/ergotaco/ergotaco.c4
-rw-r--r--keyboards/gboards/ergotaco/keyboard.json (renamed from keyboards/gboards/ergotaco/info.json)7
-rw-r--r--keyboards/gboards/ergotaco/matrix.c4
-rw-r--r--keyboards/gboards/ergotaco/rules.mk3
-rw-r--r--keyboards/gboards/g/engine.h5
-rw-r--r--keyboards/gboards/georgi/georgi.c4
-rw-r--r--keyboards/gboards/georgi/keyboard.json (renamed from keyboards/gboards/georgi/info.json)11
-rw-r--r--keyboards/gboards/georgi/matrix.c4
-rw-r--r--keyboards/gboards/georgi/rules.mk16
-rw-r--r--keyboards/gboards/gergo/gergo.c4
-rw-r--r--keyboards/gboards/gergo/keyboard.json (renamed from keyboards/gboards/gergo/info.json)7
-rw-r--r--keyboards/gboards/gergo/matrix.c4
-rw-r--r--keyboards/gboards/gergo/rules.mk4
-rw-r--r--keyboards/gboards/gergoplex/gergoplex.c4
-rw-r--r--keyboards/gboards/gergoplex/keyboard.json (renamed from keyboards/gboards/gergoplex/info.json)7
-rw-r--r--keyboards/gboards/gergoplex/matrix.c2
-rw-r--r--keyboards/gboards/gergoplex/rules.mk9
20 files changed, 67 insertions, 57 deletions
diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/keyboard.json
index 1695ca0e23..59d703925b 100644
--- a/keyboards/gboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/keyboard.json
@@ -9,6 +9,17 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"],
"rows": ["F4", "F5"]
diff --git a/keyboards/gboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
deleted file mode 100644
index b4de1a5393..0000000000
--- a/keyboards/gboards/butterstick/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-LTO_ENABLE = yes
diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h
index 005dd730b8..a28777f4f2 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -12,9 +12,12 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
#include <string.h>
#include <stdio.h>
+#include "action.h"
+#include "progmem.h"
#include "config_engine.h"
// Maximum values for combos
diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index 694e07f031..6795dfde4f 100644
--- a/keyboards/gboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
@@ -50,14 +50,14 @@ uint8_t init_mcp23018(void) {
// - input : input : 1
// - driving : output : 0
uint8_t data[] = {0b00000000, 0b00111111};
- mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
if (!mcp23018_status) {
// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
}
// SREG=sreg_prev;
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/keyboard.json
index 80558ad692..1d13c2458a 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/keyboard.json
@@ -10,6 +10,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 3c49f2802e..40299f958e 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -234,7 +234,7 @@ static matrix_row_t read_cols(uint8_t row)
return 0;
} else {
uint8_t data = 0;
- mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
data = (~((uint8_t)data) >> 2) & 0x01 ;
#ifdef DEBUG_MATRIX
if (data != 0x00) xprintf("I2C: %d\n", data);
@@ -268,7 +268,7 @@ static void select_row(uint8_t row)
// Read using bitmask
} else { // set active row low : 0 // set other rows hi-Z : 1
uint8_t data = ~(1<<row);
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
}
} else {
// Output low(DDR:1, PORT:0) to select
diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
index 6fbefbd22d..5d025b31ef 100644
--- a/keyboards/gboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
@@ -1,7 +1,4 @@
CUSTOM_MATRIX = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = yes
-COMMAND_ENABLE = yes
# A bunch of stuff that you shouldn't touch unless you
# know what you're doing.
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index a78ddc96ff..2b62165c51 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -12,9 +12,12 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
#include <string.h>
#include <stdio.h>
+#include "action.h"
+#include "progmem.h"
#include "config_engine.h"
// Set defaults
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 745e8ab35d..44b7067b47 100644
--- a/keyboards/gboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
@@ -46,14 +46,14 @@ uint8_t init_mcp23018(void) {
// - input : input : 1
// - driving : output : 0
uint8_t data[] = {0b10000000, 0b11111111};
- mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
if (!mcp23018_status) {
// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
}
// SREG=sreg_prev;
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/keyboard.json
index 51737f75af..066797a241 100644
--- a/keyboards/gboards/georgi/info.json
+++ b/keyboards/gboards/georgi/keyboard.json
@@ -11,6 +11,17 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "steno": true
+ },
+ "build": {
+ "lto": true
+ },
"tapping": {
"toggle": 2
},
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index d1151ae80e..00c17a3e44 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -254,7 +254,7 @@ static matrix_row_t read_cols(uint8_t row)
return 0;
} else {
uint8_t data = 0;
- mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
#ifdef DEBUG_MATRIX
if (data != 0x00) xprintf("I2C: %d\n", data);
@@ -298,7 +298,7 @@ static void select_row(uint8_t row)
if (mcp23018_status) { // do nothing on error
} else { // set active row low : 0 // set other rows hi-Z : 1
uint8_t data = 0xFF & ~(1<<row);
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
}
} else {
diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
index 5b63e269fa..42be966784 100644
--- a/keyboards/gboards/georgi/rules.mk
+++ b/keyboards/gboards/georgi/rules.mk
@@ -1,18 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = yes
-STENO_ENABLE = yes
-LTO_ENABLE = yes
SRC += matrix.c
-I2C_DRIVER_REQUIRED = yes \ No newline at end of file
+I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
index 41d383d408..fa73c4b42f 100644
--- a/keyboards/gboards/gergo/gergo.c
+++ b/keyboards/gboards/gergo/gergo.c
@@ -44,14 +44,14 @@ uint8_t init_mcp23018(void) {
// - input : input : 1
// - driving : output : 0
uint8_t data[] = {0b10000000, 0b11111111};
- mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
if (!mcp23018_status) {
// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
}
// SREG=sreg_prev;
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/keyboard.json
index bc53f2db5f..e576ac8012 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/keyboard.json
@@ -16,6 +16,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index b4885361fb..1fa80a58a0 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -297,7 +297,7 @@ static matrix_row_t read_cols(uint8_t row) {
return 0;
} else {
uint8_t data = 0;
- mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT);
+ mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT);
#ifdef DEBUG_MATRIX
if (~data != 0x00) xprintf("I2C: %d\n", ~data);
@@ -344,7 +344,7 @@ static void select_row(uint8_t row)
if (mcp23018_status) { // do nothing on error
} else { // set active row low : 0 // set other rows hi-Z : 1
uint8_t data = 0xFF & ~(1<<row);
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
}
} else {
// Output low(DDR:1, PORT:0) to select
diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
index d789b349da..77c632bc1c 100644
--- a/keyboards/gboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
@@ -2,10 +2,6 @@
# change yes to no to disable
#
CUSTOM_MATRIX = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = yes
-COMMAND_ENABLE = yes
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergoplex/gergoplex.c b/keyboards/gboards/gergoplex/gergoplex.c
index b621201c16..b5844125bb 100644
--- a/keyboards/gboards/gergoplex/gergoplex.c
+++ b/keyboards/gboards/gergoplex/gergoplex.c
@@ -40,14 +40,14 @@ uint8_t init_mcp23018(void) {
// - input : input : 1
// - driving : output : 0
uint8_t data[] = {0b11000001, 0b11111111};
- mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
if (!mcp23018_status) {
// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
}
return mcp23018_status;
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/keyboard.json
index c5f6be4750..cf1e451392 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/keyboard.json
@@ -13,6 +13,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c
index 9437b24377..9abe9a83b3 100644
--- a/keyboards/gboards/gergoplex/matrix.c
+++ b/keyboards/gboards/gergoplex/matrix.c
@@ -207,7 +207,7 @@ static void select_row(uint8_t row) {
} else { // set active row low : 0 // set other rows hi-Z : 1
uint8_t data;
data = 0xFF & ~(1 << (row + 1));
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
}
} else {
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 9846c64771..6ae3f1122b 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -1,15 +1,6 @@
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = yes
SRC += matrix.c