diff options
Diffstat (limited to 'waffle')
-rw-r--r-- | waffle/config.h | 22 | ||||
-rw-r--r-- | waffle/tapping.c | 10 | ||||
-rw-r--r-- | waffle/waffle.c | 15 | ||||
-rw-r--r-- | waffle/waffle.h | 5 |
4 files changed, 36 insertions, 16 deletions
diff --git a/waffle/config.h b/waffle/config.h index 9a733aa..31d803e 100644 --- a/waffle/config.h +++ b/waffle/config.h @@ -10,9 +10,6 @@ #define NO_ACTION_ONESHOT #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX #define ENABLE_COMPILE_KEYCODE -#ifndef SPC_OFFSET -#define SPC_OFFSET 40 -#endif #ifdef RAW_ENABLE #undef VENDOR_ID #define VENDOR_ID 0x6A73 @@ -37,3 +34,22 @@ #define SPLIT_LED_STATE_ENABLE #define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_KEYLOG_STR #endif + +#ifdef RGB_MATRIX_ENABLE +#define RGB_MATRIX_SLEEP +#define RGB_MATRIX_TIMEOUT 300000 +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_KEYPRESSES +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define RGB_MATRIX_KEYPRESSES +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#endif diff --git a/waffle/tapping.c b/waffle/tapping.c index 205326d..5e9aeb0 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -77,7 +77,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { case LWRSPC: case ESCLWR: case RSEBSP: - return TAPPING_TERM - SPC_OFFSET; + return TAPPING_TERM - 40; case TD(EM_DASH_MINS): case TD(PLY_NXT_PRV): case TD(CBRACKET): @@ -126,14 +126,6 @@ void raise_paste(tap_dance_state_t *state, void *user_data) { tap_code16(C(S(KC_V))); } -tap_dance_action_t tap_dance_actions[] = { - [EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins), - [PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv), - [PASTE_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset), - [CBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), - [SBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), -}; - bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef UNICODE_COMMON_ENABLE if (!process_record_unicode(keycode, record)) diff --git a/waffle/waffle.c b/waffle/waffle.c index 05d9916..fb6f5a4 100644 --- a/waffle/waffle.c +++ b/waffle/waffle.c @@ -11,6 +11,14 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { } #endif +tap_dance_action_t tap_dance_actions[] = { + [EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins), + [PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv), + [PASTE_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset), + [CBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), + [SBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), +}; + #if defined(SPLIT_KEYBOARD) && defined(OLED_ENABLE) #include "transactions.h" extern char keylog_str[5]; @@ -47,12 +55,11 @@ void keyboard_post_init_user(void) { #endif #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom(HSV_CYAN); + rgblight_sethsv_noeeprom(RGB_CYAN); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); -#endif -#ifdef RGB_MATRIX_ENABLE +#elif RGB_MATRIX_ENABLE rgb_matrix_enable_noeeprom(); - rgb_matrix_sethsv_noeeprom(HSV_CYAN); + rgb_matrix_sethsv_noeeprom(RGB_CYAN); rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); #endif #ifdef CONSOLE_ENABLE diff --git a/waffle/waffle.h b/waffle/waffle.h index 77ec797..e7bd8de 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -54,6 +54,11 @@ enum unicode_mode { }; #endif +void td_reset(tap_dance_state_t *state, void *user_data); +void em_dash_mins(tap_dance_state_t *state, void *user_data); +void ply_nxt_prv(tap_dance_state_t *state, void *user_data); +void raise_paste(tap_dance_state_t *state, void *user_data); + #define PNP TD(PLY_NXT_PRV) #define PSTRSE TD(PASTE_RAISE) #define ESCLWR LT(_LOWER, KC_ESC) |