summaryrefslogtreecommitdiffstats
path: root/layouts/community/ergodox
diff options
context:
space:
mode:
Diffstat (limited to 'layouts/community/ergodox')
-rw-r--r--layouts/community/ergodox/belak/keymap.c14
-rw-r--r--layouts/community/ergodox/haegin/keymap.c10
-rw-r--r--layouts/community/ergodox/meagerfindings/keymap.c2
-rw-r--r--layouts/community/ergodox/replicaJunction/config.h51
-rw-r--r--layouts/community/ergodox/replicaJunction/keymap.c378
-rw-r--r--layouts/community/ergodox/replicaJunction/readme.md5
-rw-r--r--layouts/community/ergodox/replicaJunction/rules.mk33
-rw-r--r--layouts/community/ergodox/videck/keymap.c6
-rw-r--r--layouts/community/ergodox/yoruian/keymap.c4
9 files changed, 18 insertions, 485 deletions
diff --git a/layouts/community/ergodox/belak/keymap.c b/layouts/community/ergodox/belak/keymap.c
index 95255be683..ea72091145 100644
--- a/layouts/community/ergodox/belak/keymap.c
+++ b/layouts/community/ergodox/belak/keymap.c
@@ -45,11 +45,11 @@ enum belak_td {
TD_LAYER_TOGGLE = 0,
};
-void belak_td_each(qk_tap_dance_state_t *state, void *user_data);
-void belak_td_finished(qk_tap_dance_state_t *state, void *user_data);
-void belak_td_reset(qk_tap_dance_state_t *state, void *user_data);
+void belak_td_each(tap_dance_state_t *state, void *user_data);
+void belak_td_finished(tap_dance_state_t *state, void *user_data);
+void belak_td_reset(tap_dance_state_t *state, void *user_data);
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_LAYER_TOGGLE] = ACTION_TAP_DANCE_FN_ADVANCED(belak_td_each, belak_td_finished, belak_td_reset),
};
@@ -332,7 +332,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-void belak_td_each(qk_tap_dance_state_t *state, void *user_data) {
+void belak_td_each(tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1:
td_led_override = 1;
@@ -345,7 +345,7 @@ void belak_td_each(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void belak_td_finished(qk_tap_dance_state_t *state, void *user_data) {
+void belak_td_finished(tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1:
layer_on(SYMB);
@@ -357,6 +357,6 @@ void belak_td_finished(qk_tap_dance_state_t *state, void *user_data) {
td_led_override = 0;
}
-void belak_td_reset(qk_tap_dance_state_t *state, void *user_data) {
+void belak_td_reset(tap_dance_state_t *state, void *user_data) {
td_led_override = 0;
}
diff --git a/layouts/community/ergodox/haegin/keymap.c b/layouts/community/ergodox/haegin/keymap.c
index 7c1883e57a..3704fe557c 100644
--- a/layouts/community/ergodox/haegin/keymap.c
+++ b/layouts/community/ergodox/haegin/keymap.c
@@ -167,7 +167,7 @@ static fib_tap fib_bspc = {
.state = BSPC_LETTER
};
-void cur_backspace (qk_tap_dance_state_t *state) {
+void cur_backspace (tap_dance_state_t *state) {
int next_fib = fib_bspc.a + fib_bspc.b;
fib_bspc.a = fib_bspc.b;
fib_bspc.b = next_fib;
@@ -177,7 +177,7 @@ void cur_backspace (qk_tap_dance_state_t *state) {
}
}
-void dance_backspace (qk_tap_dance_state_t *state, void *user_data) {
+void dance_backspace (tap_dance_state_t *state, void *user_data) {
// If we're at the fifth tap, switch to deleting by words, and reset the fib
// counter
if (state->count == 4) {
@@ -197,7 +197,7 @@ void dance_backspace (qk_tap_dance_state_t *state, void *user_data) {
}
};
-void dance_backspace_ended (qk_tap_dance_state_t *state, void *user_data) {
+void dance_backspace_ended (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
if (state->pressed) {
fib_bspc.state = HOLD_CTRL;
@@ -208,7 +208,7 @@ void dance_backspace_ended (qk_tap_dance_state_t *state, void *user_data) {
}
};
-void dance_backspace_reset (qk_tap_dance_state_t *state, void *user_data) {
+void dance_backspace_reset (tap_dance_state_t *state, void *user_data) {
switch (fib_bspc.state) {
case HOLD_CTRL: unregister_code(KC_LCTL); break;
case BSPC_WORD: unregister_code(KC_BSPC); unregister_code(KC_LALT); break;
@@ -219,7 +219,7 @@ void dance_backspace_reset (qk_tap_dance_state_t *state, void *user_data) {
fib_bspc.state = BSPC_LETTER;
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_BSPC] = ACTION_TAP_DANCE_FN_ADVANCED (dance_backspace, dance_backspace_ended, dance_backspace_reset)
};
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
index 3035572a77..800fd091b3 100644
--- a/layouts/community/ergodox/meagerfindings/keymap.c
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -51,7 +51,7 @@ enum custom_keycodes {
static uint16_t key_timer; //key timer for macros
//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
//Tap once for Copy, twice for Paste, three times for Cut.
[TD_COPY_CUT] = ACTION_TAP_DANCE_DOUBLE(LGUI(KC_C),LGUI(KC_X)),
//Tap once for Snagit, twice for Cmd + Shift + Opt + 4 (OS X cropping screenshot that is copied to the clipboard only.)
diff --git a/layouts/community/ergodox/replicaJunction/config.h b/layouts/community/ergodox/replicaJunction/config.h
deleted file mode 100644
index a02f9a95db..0000000000
--- a/layouts/community/ergodox/replicaJunction/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 Joshua T.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Do not allow one macro to contain the other macro
-#define DYNAMIC_MACRO_NO_NESTING
-
-// "THE most important tap hold configuration setting"
-// https://precondition.github.io/home-row-mods#ignore-mod-tap-interrupt
-// https://docs.qmk.fm/#/tap_hold?id=ignore-mod-tap-interrupt
-#define IGNORE_MOD_TAP_INTERRUPT
-
-// This one is a style choice. Play with it both on and off to see which
-// one suits you better.
-// https://precondition.github.io/home-row-mods#permissive-hold
-// https://docs.qmk.fm/#/tap_hold?id=permissive-hold
-#define PERMISSIVE_HOLD
-
-// If you press a dual-role key for longer than TAPPING_TERM, then
-// release it without pressing another key, without this setting nothing
-// would happen. With this setting, it sends the key's tap function.
-// https://precondition.github.io/home-row-mods#retro-tapping
-#define RETRO_TAPPING
-
-// Disable some unused features to save space
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-
-/////
-// Flags for stuff in my userspace
-
-#define USER_INCLUDE_GAMING_LAYER
-#define USER_INCLUDE_MACRO_LAYER
-
-// "Super Alt-Tab"
-// https://docs.qmk.fm/#/feature_macros?id=super-alt%E2%86%AFtab
-#define USER_SUPER_ALT_TAB_TIMEOUT 500
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
deleted file mode 100644
index 4e0559a3e2..0000000000
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* Copyright 2021 Joshua T.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "replicaJunction.h"
-
-// Most layers are defined in my userspace, but this keyboard has
-// an extra one.
-enum additional_keyboard_layers {
- L_SYSLEDS = _LAYER_SAFE_RANGE
-};
-
-#define BSP_SYM LT(L_SYMBOLS, KC_BSPC)
-#define SPC_NAV LT(L_NAVIGATION, KC_SPC)
-
-#define MO_FN MO(L_FN)
-#define MO_MAC MO(L_MACROS)
-#define MO_SLED MO(L_SYSLEDS)
-
-#define TG_GAME TG(L_GAMING)
-
-#define ESC_SFT LSFT_T(KC_ESC)
-#define TAB_SFT RSFT_T(KC_TAB)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[L_BASE] = LAYOUT_ergodox(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS,
- KC_EQL, KC_Q, KC_W, KC_F, KC_P, KC_B, NUMWORD,
- KC_MINS, KC_A, KC_R, KC_S, KC_T, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_RBRC,
- KC_LCTL, KC_LGUI ,KC_LALT, MO_FN, ESC_SFT,
- KC_HOME, KC_END,
- KC_PGUP,
- BSP_SYM, CTL_DEL, KC_PGDN,
-
- TG_GAME, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
- CAPWORD, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
- KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- QK_LOCK, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- TAB_SFT, MO_FN, KC_RALT, KC_RGUI, MO_SLED,
- KC_LEFT, KC_RGHT,
- KC_UP,
- KC_DOWN, ALT_ENT, SPC_NAV
-),
-
-
-[L_GAMING] = LAYOUT_ergodox(
- KC_GRV, _______,_______,_______,_______,_______,_______,
- KC_TAB, _______,_______,_______,_______,_______,_______,
- KC_ESC, KC_A, KC_R, KC_S, KC_T, _______,
- KC_LSFT,_______,_______,KC_C, KC_D, _______,_______,
- _______,_______,KC_TAB, KC_LALT,KC_LCTL,
- QK_LOCK,_______,
- _______,
- KC_SPC, KC_LSFT,_______,
-
- ooooooo,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,_______,
- _______,KC_N, KC_E, KC_I, KC_O, _______,
- _______,_______,_______,_______,_______,_______,_______,
- MO_FN, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,
- KC_BTN3,_______,
- KC_BTN2,
- KC_BTN1,KC_ENT, KC_BSPC
-),
-
-
-[L_NUMBERS] = LAYOUT_ergodox(
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,_______,
- _______,KC_LGUI,KC_LALT,KC_LSFT,KC_LCTL,_______,
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,_______,
-
- _______,KC_NUM, _______,_______,_______,_______,_______,
- KC_NUM, KC_HASH,KC_P7, KC_P8, KC_P9, KC_PSLS,SFT_TAB,
- KC_PPLS,KC_P4, KC_P5, KC_P6, KC_PAST,KC_TAB,
- _______,KC_PMNS,KC_P1, KC_P2, KC_P3, KC_BSLS,KC_EQL,
- KC_P0, KC_P0, KC_PDOT,KC_PENT,_______,
- _______,_______,
- _______,
- _______,_______,_______
-),
-
-
-[L_SYMBOLS] = LAYOUT_ergodox(
- _______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
- _______,KC_AT, KC_LT, KC_DLR, KC_GT, XXXXXXX,_______,
- _______,KC_BSLS,KC_LPRN,KC_DQUO,KC_RPRN,KC_HASH,
- _______,KC_EXLM,KC_COLN,KC_ASTR,KC_PLUS,XXXXXXX,_______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- ooooooo,_______,_______,
-
- _______,KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______,XXXXXXX,KC_LBRC,KC_UNDS,KC_RBRC,XXXXXXX,KC_F12,
- KC_PERC,KC_LCBR,KC_EQL, KC_RCBR,KC_PIPE,_______,
- _______,XXXXXXX,KC_AMPR,KC_CIRC,KC_TILD,KC_GRV, _______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,ooooooo
-),
-
-
-[L_NAVIGATION] = LAYOUT_ergodox(
- _______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
- _______,OS_UNDO,OS_CUT, OS_PAST,OS_COPY,OS_SALL,_______,
- _______,KC_LGUI,KC_LSFT,KC_LALT,KC_LCTL,_______,
- _______,WIN_V, _______,_______,OS_FIND,SEARCH, _______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,_______,
-
- _______,KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______,KC_PGUP,KC_HOME,KC_UP, KC_END, KC_DEL, KC_F12,
- KC_PGDN,KC_LEFT,KC_DOWN,KC_RGHT,KC_BSPC,_______,
- _______,_______,SFT_TAB,KC_TAB, KC_APP, KC_PSCR,_______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,ooooooo
-),
-
-
-[L_FN] = LAYOUT_ergodox(
- _______,_______,_______,_______,_______,_______,_______,
- _______,QK_VERS,_______,DM_REC2,DM_REC1,DM_RSTP,_______,
- _______,QK_MAKE,_______,DM_PLY2,DM_PLY1,_______,
- _______,QK_FLSH,K_SECR1,K_SECR2,K_SECR3,K_SECR4,_______,
- _______,_______,_______,ooooooo,_______,
- _______,_______,
- _______,
- KC_LCTL,_______,_______,
-
- _______,_______,_______,_______,_______,_______,_______,
- _______,KC_VOLU,KC_F9, KC_F10, KC_F11, KC_F12, _______,
- KC_MUTE,KC_F5, KC_F6, KC_F7, KC_F8, _______,
- _______,KC_VOLD,KC_F1, KC_F2, KC_F3, KC_F4, _______,
- _______,ooooooo,_______,_______,_______,
- _______,QK_BOOT,
- _______,
- _______,_______,KC_LALT
-),
-
-
-[L_MACROS] = LAYOUT_ergodox(
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,DM_REC2,DM_REC1,_______,_______,
- _______,_______,_______,DM_PLY2,DM_PLY1,DM_RSTP,
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- ooooooo,_______,_______,
-
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,SHEBANG,_______,_______,_______,_______,
- PRG_NE, PRG_EQ, PRG_GEQ,PRG_LEQ,PRG_ARR,_______,
- _______,_______,PS_ITEM,FS_PIPE,_______,FS_ARR, _______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,ooooooo
-),
-
-
-
-[L_SYSLEDS] = LAYOUT_ergodox(
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,
- _______,_______,
- _______,
- _______,_______,_______,
-
- KC_NUM, _______,_______,_______,_______,_______,_______,
- KC_CAPS,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,
- KC_SCRL,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,_______,ooooooo,
- _______,_______,
- _______,
- _______,_______,_______
-)
-
-// Template
-// [_NUMBERS] = LAYOUT_ergodox(
-// _______,_______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,
-// _______,_______,
-// _______,
-// _______,_______,_______,
-
-// _______,_______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,_______,_______,
-// _______,_______,_______,_______,_______,
-// _______,_______,
-// _______,
-// _______,_______,_______
-// ),
-
-};
-
-void keyboard_post_init_user_kb(void) {
- ergodox_right_led_1_on();
-}
-
-
-////////////////////////////////////////////////////////////
-// System LED code
-////////////////////////////////////////////////////////////
-
-// We need to track both the layer state and the system LED state in
-// order to update the LEDs appropriately when either one changes.
-// These are both represented as a bitmask.
-//
-// There is a global 'layer_state' variable but it is set after the call
-// to layer_state_set_user(), so it doesn't work properly for our
-// purposes.
-static uint32_t current_layer_state = 0;
-static uint8_t sys_led_state = 0;
-
-// Whether the given layer (one of the constant defined at the top) is active.
-#define LAYER_ON(state, layer) (state & (1<<layer))
-
-// Brightness of LEDs (0-255)
-// Default value is 255. Use a lesser value for dimmer LEDs.
-static const uint8_t max_led_value = 255;
-
-void led_1_on(void) {
- ergodox_right_led_1_on();
- ergodox_right_led_1_set(max_led_value);
-}
-
-void led_2_on(void) {
- ergodox_right_led_2_on();
- ergodox_right_led_2_set(max_led_value);
-}
-
-void led_3_on(void) {
- ergodox_right_led_3_on();
- ergodox_right_led_3_set(max_led_value);
-}
-
-// The onboard LED doesn't support brightness, but this function keeps
-// things consistent.
-void led_board_on(void) {
- ergodox_board_led_on();
-}
-
-void led_1_off(void) {
- ergodox_right_led_1_off();
-}
-
-void led_2_off(void) {
- ergodox_right_led_2_off();
-}
-
-void led_3_off(void) {
- ergodox_right_led_3_off();
-}
-
-void led_board_off(void) {
- ergodox_board_led_off();
-}
-
-void set_leds_by_system_state(uint8_t led_state) {
- led_t host_led_state = host_keyboard_led_state();
-
- if (led_state & host_led_state.num_lock) {
- led_1_on();
- }
- else {
- led_1_off();
- }
-
- if (led_state & host_led_state.caps_lock) {
- led_2_on();
- }
- else {
- led_2_off();
- }
-
- if (led_state & host_led_state.scroll_lock) {
- led_3_on();
- }
- else {
- led_3_off();
- }
-}
-
-void set_leds_by_layer_state(uint32_t layer_state) {
- if (LAYER_ON(layer_state, L_FN)) {
- led_1_on();
- led_2_on();
- led_3_on();
- led_board_off();
- }
- else if (LAYER_ON(layer_state, L_GAMING)) {
- led_1_off();
- led_2_off();
- led_3_off();
- led_board_on();
- }
- else if (LAYER_ON(layer_state, L_NUMBERS)) {
- led_1_on();
- led_2_off();
- led_3_off();
- led_board_off();
- }
- else if (LAYER_ON(layer_state, L_NAVIGATION)) {
- led_1_off();
- led_2_on();
- led_3_off();
- led_board_off();
- }
- else {
- led_1_on();
- led_2_off();
- led_3_off();
- led_board_off();
- }
-}
-
-void led_set_kb(uint8_t usb_led) {
- sys_led_state = usb_led;
-
- if (LAYER_ON(current_layer_state, L_SYSLEDS)) {
- set_leds_by_system_state(sys_led_state);
- }
- else {
- set_leds_by_layer_state(current_layer_state);
- }
-
- led_set_user(usb_led);
-}
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
- current_layer_state = state;
-
- if (LAYER_ON(state, L_SYSLEDS)) {
- set_leds_by_system_state(sys_led_state);
- }
- else {
- set_leds_by_layer_state(state);
- }
-
- return update_tri_layer_state(state, L_SYMBOLS, L_NAVIGATION, L_MACROS);
-}
diff --git a/layouts/community/ergodox/replicaJunction/readme.md b/layouts/community/ergodox/replicaJunction/readme.md
deleted file mode 100644
index 57e4480474..0000000000
--- a/layouts/community/ergodox/replicaJunction/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# replicaJunction - Ergodox (EZ) Layout
-
-Most of the goodies in this layout are defined in [my userspace folder](../../../../users/replicaJunction/readme.md). Better explanations of the interesting features are provided there.
-
-One feature is worth pointing out here, since it's keyboard-specific: handling of the LEDs. Normally, I use the LEDs to indicate layer state, but it's occasionally useful to be able to view the system state as well (num lock, caps lock, scroll lock). The final layer in the keymap, `L_SYSLEDS`, is used to indicate this. I have a MO key that temporarily switches the LED behavior to show system state, and on this layer, the three keys with LEDs are each used to toggle the respective lock.
diff --git a/layouts/community/ergodox/replicaJunction/rules.mk b/layouts/community/ergodox/replicaJunction/rules.mk
deleted file mode 100644
index 523639cc46..0000000000
--- a/layouts/community/ergodox/replicaJunction/rules.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# https://docs.qmk.fm/getting_started_make_guide.html
-
-# Userspace options
-USER_CAPS_WORD_ENABLE = yes
-USER_NUM_WORD_ENABLE = yes
-USER_SECRETS_ENABLE = yes
-USER_SUPER_ALT_TAB_ENABLE = yes
-
-# Features to enable
-DYNAMIC_MACRO_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-
-# Extra features that are nice but takes space. Enable only if they're
-# used in the layout.
-WPM_ENABLE = no
-# EXTRAKEY_ENABLE = no # For volume keys and similar
-# MOUSEKEY_ENABLE = no # Them mouse keys yo
-KEY_OVERRIDE_ENABLE = no
-LEADER_ENABLE = no
-TAP_DANCE_ENABLE = no
-# RGBLIGHT_ENABLE = no # Keyboard RGB underglow
-RGB_MATRIX_ENABLE = no
-
-# Features I definitely don't care aboud
-LTO_ENABLE = yes
-CONSOLE_ENABLE = no
-VERBOSE = no
-DEBUG_MATRIX_SCAN_RATE = no
-DEBUG_MATRIX = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-
diff --git a/layouts/community/ergodox/videck/keymap.c b/layouts/community/ergodox/videck/keymap.c
index 1a17657da1..e0a3cec912 100644
--- a/layouts/community/ergodox/videck/keymap.c
+++ b/layouts/community/ergodox/videck/keymap.c
@@ -106,7 +106,7 @@ typedef struct
videck_tap_dance_trigger_t trigger;
} videck_tap_dance_tuple_t;
-static void videck_tap_dance_finished (qk_tap_dance_state_t *state, void *user_data) {
+static void videck_tap_dance_finished (tap_dance_state_t *state, void *user_data) {
videck_tap_dance_tuple_t *const tuple = (videck_tap_dance_tuple_t *)user_data;
if (state->count == 1) {
@@ -116,7 +116,7 @@ static void videck_tap_dance_finished (qk_tap_dance_state_t *state, void *user_d
}
}
-static void videck_tap_dance_reset (qk_tap_dance_state_t *state, void *user_data) {
+static void videck_tap_dance_reset (tap_dance_state_t *state, void *user_data) {
videck_tap_dance_tuple_t *const tuple = (videck_tap_dance_tuple_t *)user_data;
if (state->count == 1) {
@@ -139,7 +139,7 @@ static void videck_caps_trigger (const uint16_t kc) {
.user_data = (void *)&((videck_tap_dance_tuple_t) { kc1, kc2, double_trigger }), \
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_L] = ACTION_TAP_DANCE_DOUBLE_TRIGGER(KC_LSFT, KC_CAPS, videck_caps_trigger),
[TD_R] = ACTION_TAP_DANCE_DOUBLE_TRIGGER(KC_RSFT, KC_CAPS, videck_caps_trigger)
};
diff --git a/layouts/community/ergodox/yoruian/keymap.c b/layouts/community/ergodox/yoruian/keymap.c
index a5ffcd886c..c51a3586c6 100644
--- a/layouts/community/ergodox/yoruian/keymap.c
+++ b/layouts/community/ergodox/yoruian/keymap.c
@@ -17,7 +17,7 @@
#include "yoruian.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_ergodox_YORUIAN\
+[0] = LAYOUT_ergodox_YORUIAN
(9, 7, 5, 3, 1, GRV, MINS, EQL, LBRC, 0, 2, 4, 6, 8,
ES, RBRC, Y, O, R, BSLS, P3, P3, J, V, D, F, W, Q,
LC, U, I, A, N, SCLN, M, H, T, S, C, RC,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
BSPC, RALT, P2, TAB,
NO, NO,
E, LSFT, NO, NO, ENT, SPC),
-[1] = LAYOUT_ergodox_YORUIAN\
+[1] = LAYOUT_ergodox_YORUIAN
(TR, TR, TR, TR, TR, TR, TR, TR, TR, F5, F6, F7, F8, F9,
TR, TR, TR, TR, TR, TR, TR, TR, TR, F1, F2, F3, F4, FT,
TR, TR, TR, TR, TR, TR, PAUS, LEFT, DOWN, UP, RGHT, FE,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 10:03:51 +0000