From 3076f86dc11d346d07c63e5fb11702817d7034e7 Mon Sep 17 00:00:00 2001 From: Jacob Jerrell Date: Sun, 6 Dec 2020 00:30:27 -0600 Subject: Bocaj - Third Annual Refactor (Redux) (#10295) * Reset everything to upstream, reapply Bocaj changes * Bocaj - address PR comments * Just in time changes * Bocaj - Several adjustments after using the layout for a while --- users/bocaj/bocaj.h | 96 +++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 54 deletions(-) (limited to 'users/bocaj/bocaj.h') diff --git a/users/bocaj/bocaj.h b/users/bocaj/bocaj.h index 04991a0150..e69be74da5 100644 --- a/users/bocaj/bocaj.h +++ b/users/bocaj/bocaj.h @@ -1,5 +1,6 @@ /* -Copyright 2018 Jacob Jerrell @JacobJerrell +Copyright 2017 Christopher Courtney @drashna +Copyright 2020 Jacob Jerrell @JacobJerrell 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 @@ -16,70 +17,57 @@ along with this program. If not, see . */ #pragma once -#include "quantum.h" +#include QMK_KEYBOARD_H + #include "version.h" #include "eeprom.h" -#include "wrappers.h" #include "process_records.h" -#ifdef TAP_DANCE_ENABLE - #include "tap_dances.h" -#endif // TAP_DANCE_ENABLE +#include "wrappers.h" +#if defined(RGB_MATRIX_ENABLE) +# include "rgb_matrix_stuff.h" +#endif -/* Layer Names */ +/* Define layer names */ enum userspace_layers { - _WORKMAN = 0, - _WINWORKMAN, - _QWERTY, - _LOWER, - _ADJUST, - _DIABLO, + _WORKMAN = 0, + _QWERTY, + _WWORKMAN, + _WQWERTY, + _LOWER, + _RAISE, + _ADJUST, + _MOD, + LAYER_SAFE_RANGE, }; -#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) - #define BOCAJ_UNICODE_MODE UC_OSX -#else - // set to 2 for UC_WIN, set to 4 for UC_WINC - #define BOCAJ_UNICODE_MODE 2 -#endif - -/* -define modifiers here, since MOD_* doesn't seem to work for these - */ #define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) -#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL)) -#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) -#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) +#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL)) +#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) +#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) -bool mod_key_press_timer (uint16_t code, uint16_t mod_code, bool pressed); -bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer); -bool send_game_macro(const char *str, keyrecord_t *record, bool override); -void matrix_init_keymap(void); -void shutdown_keymap(void); -void suspend_power_down_keymap(void); -void suspend_wakeup_init_keymap(void); -void matrix_scan_keymap(void); -uint32_t layer_state_set_keymap (uint32_t state); -uint32_t default_layer_state_set_keymap (uint32_t state); -void led_set_keymap(uint8_t usb_led); -void eeconfig_init_keymap(void); -void tap(uint16_t keycode); +bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed); +bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer); +void matrix_init_keymap(void); +void shutdown_keymap(void); +void suspend_power_down_keymap(void); +void suspend_wakeup_init_keymap(void); +void matrix_scan_keymap(void); +layer_state_t layer_state_set_keymap(layer_state_t state); +layer_state_t default_layer_state_set_keymap(layer_state_t state); +void led_set_keymap(uint8_t usb_led); +void eeconfig_init_keymap(void); +bool hasAllBitsInMask(uint8_t value, uint8_t mask); +// clang-format off +#ifdef KEYBOARD_planck_ez typedef union { - uint8_t raw; + uint32_t raw; + struct { + bool rgb_layer_change :1; + bool rgb_matrix_idle_anim :1; + }; } userspace_config_t; +// clang-format on extern userspace_config_t userspace_config; - -// If Tap Dancing is enabled, we manage that here. -// If it is not, then we define the KC_D3_# codes gracefully -#ifdef TAP_DANCE_ENABLE - #define KC_D3_1 TD(TD_D3_1) - #define KC_D3_2 TD(TD_D3_2) - #define KC_D3_3 TD(TD_D3_3) - #define KC_D3_4 TD(TD_D3_4) -#else // !TAP_DANCE_ENABLE - #define KC_D3_1 KC_1 - #define KC_D3_2 KC_2 - #define KC_D3_3 KC_3 - #define KC_D3_4 KC_4 -#endif // TAP_DANCE_ENABLE +#endif -- cgit v1.2.3