From b7fe24923e29218b15233163d9fe0ac5f332d3fc Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 8 May 2021 10:26:51 -0700 Subject: Update sethBarberee Userspace (#12620) * update for LTO and guard RGBLED_SPLIT * Revert "update for LTO and guard RGBLED_SPLIT" This reverts commit ce81177cbe330ae3e1e14c264dc0cb0946f08d70. * Revert "Revert "update for LTO and guard RGBLED_SPLIT"" This reverts commit 67da0ce9f38777064ad094c1ecba7ce17a40994f. * update iris keymap for keymap_kc removal and overhaul userspace * add licenses * fix tap_dance error when rgblight is disabled and update/clean iris/sinc maps --- users/sethBarberee/sethBarberee.c | 112 ++++++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 36 deletions(-) (limited to 'users/sethBarberee/sethBarberee.c') diff --git a/users/sethBarberee/sethBarberee.c b/users/sethBarberee/sethBarberee.c index 10f78f63b5..536f3f921b 100644 --- a/users/sethBarberee/sethBarberee.c +++ b/users/sethBarberee/sethBarberee.c @@ -1,45 +1,85 @@ + /* Copyright 2021 SethBarberee + * + * 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 . + */ #include "sethBarberee.h" -#ifdef RGBLIGHT_ENABLE -#ifdef TAP_DANCE_ENABLE - -// Initialize it now -tap caps_status = { - .toggled = false, - .toggle_mode = CAPS_LOCK_MODE, - .normal_mode = NORMAL_MODE -}; - -void dance_ecap_finished (qk_tap_dance_state_t *state, void *user_data){ - if(state->count == 1){ - register_code(KC_ESC); - } else { - register_code(KC_CAPS); - if(!caps_status.toggled){ - // Toggling caps so indicate - caps_status.toggled = true; - rgblight_mode_noeeprom(caps_status.toggle_mode); - } else { - // Turning off so return to normal mode - caps_status.toggled = false; - rgblight_mode_noeeprom(caps_status.normal_mode); - } - } +#include "version.h" + +__attribute__ ((weak)) void keyboard_pre_init_keymap(void) {} + +void keyboard_pre_init_user(void){ +#if defined(BOOTLOADER_CATERINA) + // Make sure the red LEDs don't light + setPinOutput(D5); + writePinHigh(D5); + + setPinOutput(B0); + writePinHigh(B0); +#endif + keyboard_pre_init_keymap(); } -void dance_ecap_reset (qk_tap_dance_state_t *state, void *user_data){ - if(state->count == 1){ - unregister_code(KC_ESC); - } else { - unregister_code(KC_CAPS); +__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) { return state; } + +layer_state_t layer_state_set_user(layer_state_t state){ + + if (!is_keyboard_master()) { + return state; } + + state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); +#if defined(RGBLIGHT_ENABLE) + state = layer_state_set_rgb_light(state); +#endif + return layer_state_set_keymap(state); } -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - //Tap once for Esc, twice for Caps Lock - [TD_ECAP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_ecap_finished, dance_ecap_reset), -// Other declarations would go here, separated by commas, if you have them -}; +__attribute__ ((weak)) void keyboard_post_init_keymap(void) {} +void keyboard_post_init_user(void) +{ +#if defined(RGBLIGHT_ENABLE) + keyboard_post_init_rgb_light(); #endif + keyboard_post_init_keymap(); +} + +__attribute__((weak)) void suspend_power_down_keymap(void) {} + +void suspend_power_down_user(void) { +#ifdef OLED_DRIVER_ENABLE + oled_off(); #endif + suspend_power_down_keymap(); +} + +__attribute__((weak)) void suspend_wakeup_init_keymap(void) {} + +void suspend_wakeup_init_user(void) { suspend_wakeup_init_keymap(); } + +__attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true;} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (process_record_keymap(keycode, record)) + { + switch (keycode) { + case KC_VRSN: // Prints firmware version + if (record->event.pressed) { + SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE); + } + break; + } + } + return true; +} -- cgit v1.2.3