diff options
Diffstat (limited to 'keyboards/gboards')
25 files changed, 73 insertions, 80 deletions
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index 50f23cb945..36875c543a 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -1,10 +1,8 @@ #pragma once -#include "config_common.h" #define VERSION "Paula Deen" -#define DEBOUNCE 5 #define FORCE_NKRO /* key matrix size */ diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 158769dbd1..085d56f91e 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_butter": { "layout": [ diff --git a/keyboards/gboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk index e05ccd047c..b4de1a5393 100644 --- a/keyboards/gboards/butterstick/rules.mk +++ b/keyboards/gboards/butterstick/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c index 8820127848..5d6adcc1d0 100644 --- a/keyboards/gboards/butterstick/sten.c +++ b/keyboards/gboards/butterstick/sten.c @@ -370,7 +370,7 @@ void saveState(uint32_t cleanChord) { for (int i = 0; i < 32; i++) pChordState[i] = chordState[i]; } -void restoreState() { +void restoreState(void) { cChord = pChord; chordIndex = pChordIndex; for (int i = 0; i < 32; i++) diff --git a/keyboards/gboards/engine/engine.c b/keyboards/gboards/engine/engine.c index 9094b7905a..7d4cc05e5f 100644 --- a/keyboards/gboards/engine/engine.c +++ b/keyboards/gboards/engine/engine.c @@ -53,7 +53,7 @@ bool inMouse = false; int8_t mousePress; // All processing done at chordUp goes through here -void processKeysUp() { +void processKeysUp(void) { // Check for mousekeys, this is release #ifdef MOUSEKEY_ENABLE if (inMouse) { @@ -372,7 +372,7 @@ void saveState(C_SIZE cleanChord) { pChordIndex = chordIndex; for (int i = 0; i < 32; i++) pChordState[i] = chordState[i]; } -void restoreState() { +void restoreState(void) { cChord = pChord; chordIndex = pChordIndex; for (int i = 0; i < 32; i++) chordState[i] = pChordState[i]; diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index 21d14144d9..3274a5ab92 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Copy and worked on with love from the EZ team #pragma once -#include "config_common.h" #define VERBOSE @@ -35,9 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_WHEEL_DELAY 0 #define TAPPING_TOGGLE 1 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) @@ -49,5 +45,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key combination for command */ #define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT) -#define DEBOUNCE 5 #define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index bd1863288e..163b76db19 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c index 7e5d675218..1bab5e8981 100644 --- a/keyboards/gboards/ergotaco/matrix.c +++ b/keyboards/gboards/ergotaco/matrix.c @@ -112,7 +112,7 @@ void matrix_init(void) } } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -188,7 +188,7 @@ uint8_t matrix_scan(void) unselect_rows(); } - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk index db236477b0..2df8900c2d 100644 --- a/keyboards/gboards/ergotaco/rules.mk +++ b/keyboards/gboards/ergotaco/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - CUSTOM_MATRIX = yes EXTRAKEY_ENABLE = yes CONSOLE_ENABLE = yes diff --git a/keyboards/gboards/g/engine.c b/keyboards/gboards/g/engine.c index 015b48d38f..7ce18d334e 100644 --- a/keyboards/gboards/g/engine.c +++ b/keyboards/gboards/g/engine.c @@ -53,7 +53,7 @@ bool inMouse = false; int8_t mousePress; // All processing done at chordUp goes through here -void processKeysUp() { +void processKeysUp(void) { // Check for mousekeys, this is release #ifdef MOUSEKEY_ENABLE if (inMouse) { @@ -377,7 +377,7 @@ void saveState(C_SIZE cleanChord) { pChordIndex = chordIndex; for (int i = 0; i < 32; i++) pChordState[i] = chordState[i]; } -void restoreState() { +void restoreState(void) { cChord = pChord; chordIndex = pChordIndex; for (int i = 0; i < 32; i++) chordState[i] = pChordState[i]; diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h index b92b6a4bc4..68ea44b1b4 100644 --- a/keyboards/gboards/g/keymap_combo.h +++ b/keyboards/gboards/g/keymap_combo.h @@ -1,4 +1,10 @@ // Keymap helpers +// define reference layers per layer. +#define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER) \ + case LAYER: return REF_LAYER; + +#define DEF_REF_LAYER(LAYER) \ + default: return LAYER; #define K_ENUM(name, key, ...) name, #define K_DATA(name, key, ...) const uint16_t PROGMEM cmb_##name[] = {__VA_ARGS__, COMBO_END}; @@ -7,17 +13,22 @@ #define A_ENUM(name, string, ...) name, #define A_DATA(name, string, ...) const uint16_t PROGMEM cmb_##name[] = {__VA_ARGS__, COMBO_END}; #define A_COMB(name, string, ...) [name] = COMBO_ACTION(cmb_##name), -#define A_ACTI(name, string, ...) \ - case name: \ - if (pressed) SEND_STRING(string); \ +#define A_ACTI(name, string, ...) \ + case name: \ + if (pressed) SEND_STRING(string); \ break; -#define A_TOGG(name, layer, ...) \ - case name: \ - if (pressed) layer_invert(layer); \ +#define A_TOGG(name, layer, ...) \ + case name: \ + if (pressed) layer_invert(layer); \ break; #define BLANK(...) +#undef COMBO_REF_LAYER +#undef DEFAULT_REF_LAYER +#define COMBO_REF_LAYER BLANK +#define DEFAULT_REF_LAYER BLANK + // Generate data needed for combos/actions // Create Enum #undef COMB @@ -66,10 +77,33 @@ void process_combo_event(uint16_t combo_index, bool pressed) { } // Allow user overrides per keymap -#if __has_include("inject.h") +#if __has_include("inject.h") # include "inject.h" #endif } #undef COMB #undef SUBS #undef TOGG + +// Allow reference layers per layer. +#define COMB BLANK +#define SUBS BLANK +#define TOGG BLANK + +#undef DEFAULT_REF_LAYER +#undef COMBO_REF_LAYER +#define COMBO_REF_LAYER REF_LAYER_FOR_LAYER +#define DEFAULT_REF_LAYER DEF_REF_LAYER + +uint8_t combo_ref_from_layer(uint8_t current_layer){ + switch (current_layer){ +#include "combos.def" + } + return current_layer; +} + +#undef COMB +#undef SUBS +#undef TOGG +#undef COMBO_REF_LAYER +#undef DEFAULT_REF_LAYER diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index e3da59a781..858f99208f 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Copy and worked on with love from the EZ team #pragma once -#include "config_common.h" /* Defaults */ @@ -42,9 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_WHEEL_DELAY 0 #define TAPPING_TOGGLE 2 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) @@ -59,5 +55,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -#define DEBOUNCE 5 #define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 619fa4af5d..3f1c69b7f5 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -8,6 +8,8 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_georgi": "LAYOUT" }, diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c index 24bb2d7acf..5ac696fd31 100644 --- a/keyboards/gboards/georgi/matrix.c +++ b/keyboards/gboards/georgi/matrix.c @@ -133,7 +133,7 @@ void matrix_init(void) } } - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -209,7 +209,7 @@ uint8_t matrix_scan(void) unselect_rows(); } - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk index 9f66bb0d5b..5980342669 100644 --- a/keyboards/gboards/georgi/rules.mk +++ b/keyboards/gboards/georgi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/georgi/sten.c b/keyboards/gboards/georgi/sten.c index bd96dee758..7318d04af3 100644 --- a/keyboards/gboards/georgi/sten.c +++ b/keyboards/gboards/georgi/sten.c @@ -370,7 +370,7 @@ void saveState(uint32_t cleanChord) { for (int i = 0; i < 32; i++) pChordState[i] = chordState[i]; } -void restoreState() { +void restoreState(void) { cChord = pChord; chordIndex = pChordIndex; for (int i = 0; i < 32; i++) diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 1308312950..485ae37618 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Copy and worked on with love from the EZ team #pragma once -#include "config_common.h" #define BOOTMAGIC_LITE_ROW 13 #define BOOTMAGIC_LITE_COLUMN 2 @@ -47,9 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_WHEEL_DELAY 0 #define TAPPING_TOGGLE 1 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) @@ -64,5 +60,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -#define DEBOUNCE 5 #define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index 753a5e2e73..e1ab1d5202 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -8,6 +8,8 @@ "pid": "0x1307", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_gergo": "LAYOUT" }, diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c index 3898246e30..c352be24e1 100644 --- a/keyboards/gboards/gergo/matrix.c +++ b/keyboards/gboards/gergo/matrix.c @@ -153,7 +153,7 @@ void matrix_init(void) { } debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { @@ -260,7 +260,7 @@ uint8_t matrix_scan(void) { } debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); enableInterrupts(); diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk index 0f877e2d4b..95e12cc36c 100644 --- a/keyboards/gboards/gergo/rules.mk +++ b/keyboards/gboards/gergo/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h index 68e6abdab7..d733cb3b7a 100644 --- a/keyboards/gboards/gergoplex/config.h +++ b/keyboards/gboards/gergoplex/config.h @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Copy and worked on with love from the EZ team #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 @@ -38,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define IGNORE_MOD_TAP_INTERRUPT #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) - -#define DEBOUNCE 5 diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index 462c2434a3..914832aacf 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index 8b832cbac8..44c570b42c 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -46,10 +46,10 @@ enum { GAME }; -td_state_t cur_dance(qk_tap_dance_state_t *state); +td_state_t cur_dance(tap_dance_state_t *state); -void ql_finished(qk_tap_dance_state_t *state, void *user_data); -void ql_reset(qk_tap_dance_state_t *state, void *user_data); +void ql_finished(tap_dance_state_t *state, void *user_data); +void ql_reset(tap_dance_state_t *state, void *user_data); #define KC_CTL_A MT(MOD_LCTL, KC_A) // Tap for A, hold for Control #define KC_SFT_Z MT(MOD_RSFT, KC_Z) // Tap for Z, hold for Shift @@ -158,7 +158,7 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { } } -td_state_t cur_dance(qk_tap_dance_state_t *state) { +td_state_t cur_dance(tap_dance_state_t *state) { if (state->count == 1) return TD_SINGLE_TAP; if (state->count == 2) @@ -173,7 +173,7 @@ static td_tap_t ql_tap_state = { .state = TD_NONE }; -void ql_finished(qk_tap_dance_state_t *state, void *user_data) { +void ql_finished(tap_dance_state_t *state, void *user_data) { ql_tap_state.state = cur_dance(state); switch (ql_tap_state.state) { case TD_SINGLE_TAP: @@ -194,11 +194,11 @@ void ql_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void ql_reset(qk_tap_dance_state_t *state, void *user_data) { +void ql_reset(tap_dance_state_t *state, void *user_data) { ql_tap_state.state = TD_NONE; } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [GAME] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset) }; diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c index df2b2dde15..c9f5528b74 100644 --- a/keyboards/gboards/gergoplex/matrix.c +++ b/keyboards/gboards/gergoplex/matrix.c @@ -83,7 +83,7 @@ void matrix_init(void) { } debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } void matrix_power_up(void) { mcp23018_status = init_mcp23018(); @@ -141,7 +141,7 @@ uint8_t matrix_scan(void) { } debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); #ifdef DEBUG_MATRIX for (uint8_t c = 0; c < MATRIX_COLS; c++) diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk index 31a7d6bae8..6887c869b9 100644 --- a/keyboards/gboards/gergoplex/rules.mk +++ b/keyboards/gboards/gergoplex/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -18,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes -LAYOUTS = split_3x5_3 - DEBOUNCE_TYPE = sym_eager_pr SRC += matrix.c QUANTUM_LIB_SRC += i2c_master.c |