Skip to content

Commit

Permalink
Re-enable all features.
Browse files Browse the repository at this point in the history
  • Loading branch information
trankillity committed Dec 17, 2023
1 parent 2a0725e commit e91620f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
18 changes: 9 additions & 9 deletions config.h
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#pragma once

// #define COMBO_VARIABLE_LEN
// #undef COMBO_TERM
// #define COMBO_TERM 30
#define COMBO_VARIABLE_LEN
#undef COMBO_TERM
#define COMBO_TERM 30

#define PERMISSIVE_HOLD
#define HOLD_ON_OTHER_KEY_PRESS
#define TAPPPING_TERM 150
#define TAPPPING_TERM 100
#define FP_SUPER_TAB_TIMEOUT 500
#define ONESHOT_TIMEOUT 1000
#define ONESHOT_TIMEOUT 500

#ifdef RGBLIGHT_LIMIT_VAL
#undef RGBLIGHT_LIMIT_VAL
#endif
#define RGBLIGHT_LIMIT_VAL 120
// #ifdef RGBLIGHT_LIMIT_VAL
// #undef RGBLIGHT_LIMIT_VAL
// #endif
// #define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_LAYERS_RETAIN_VAL
6 changes: 1 addition & 5 deletions keymap.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include QMK_KEYBOARD_H

#include "config.h"
// #include "g/keymap_combo.h"
#include "g/keymap_combo.h"
// #include "casemodes.h"

// Defines names for use in layer keycodes and the keymap
Expand Down Expand Up @@ -144,10 +144,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

};

// layer_state_t layer_state_set_user(layer_state_t state) {
// return update_tri_layer_state(state, _NAVI, _NUMB, _SYST);
// }

const key_override_t comma_override = ko_make_basic(MOD_MASK_SHIFT, KC_COMMA, KC_SCLN);
const key_override_t fstop_override = ko_make_basic(MOD_MASK_SHIFT, KC_DOT, KC_COLON);

Expand Down
4 changes: 2 additions & 2 deletions rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ENCODER_ENABLE=yes
HAPTIC_ENABLE=yes
AUDIO_ENABLE=yes

# COMBO_ENABLE = yes
COMBO_ENABLE = yes
KEY_OVERRIDE_ENABLE = yes

# VPATH += keyboards/gboards
VPATH += keyboards/gboards

0 comments on commit e91620f

Please sign in to comment.