summaryrefslogtreecommitdiff
path: root/keyboards/gboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gboards')
-rw-r--r--keyboards/gboards/butterstick/config.h1
-rw-r--r--keyboards/gboards/butterstick/sten.c2
-rw-r--r--keyboards/gboards/engine/engine.c4
-rw-r--r--keyboards/gboards/ergotaco/config.h1
-rw-r--r--keyboards/gboards/g/engine.c4
-rw-r--r--keyboards/gboards/georgi/config.h1
-rw-r--r--keyboards/gboards/georgi/sten.c2
-rw-r--r--keyboards/gboards/gergo/config.h1
-rw-r--r--keyboards/gboards/gergoplex/config.h1
-rw-r--r--keyboards/gboards/gergoplex/info.json1
-rw-r--r--keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c14
-rw-r--r--keyboards/gboards/gergoplex/rules.mk2
12 files changed, 14 insertions, 20 deletions
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index 50f23cb945..cbd5b6b56f 100644
--- a/keyboards/gboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
@@ -1,6 +1,5 @@
#pragma once
-#include "config_common.h"
#define VERSION "Paula Deen"
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..4bd7a09766 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
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/georgi/config.h b/keyboards/gboards/georgi/config.h
index e3da59a781..939ece3265 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 */
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..d2b9852740 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
diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index 68e6abdab7..fb1931eea8 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
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index 462c2434a3..eb305c5e8e 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -8,6 +8,7 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "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/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 31a7d6bae8..4cf1e7624e 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -18,8 +18,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 20:55:22 +0000