From 3650d59afe69484c7d8c489763e04ddd3d79c03b Mon Sep 17 00:00:00 2001 From: Akaash Suresh Date: Thu, 2 Jan 2020 11:52:23 -0600 Subject: Merge upstream/master with userspace --- users/curry/curry.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 users/curry/curry.h (limited to 'users/curry/curry.h') diff --git a/users/curry/curry.h b/users/curry/curry.h new file mode 100644 index 0000000000..985453c49b --- /dev/null +++ b/users/curry/curry.h @@ -0,0 +1,57 @@ +#pragma once + +#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 +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +# include "rgb_stuff.h" +#endif +#if defined(KEYBOARD_lily58_rev1) & defined(PROTOCOL_LUFA) +# include "lufa.h" +# include "split_util.h" +#endif + +/* Define layer names */ +enum userspace_layers { + _QWERTY = 0, + _NUMLOCK = 0, + _COLEMAK, + _DVORAK, + _MODS, + _LOWER, + _RAISE, + _ADJUST, +}; + +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); + +// clang-format off +typedef union { + uint32_t raw; + struct { + bool rgb_layer_change :1; + bool is_overwatch :1; + bool nuke_switch :1; + uint8_t unicode_mod :4; + bool swapped_numbers :1; + bool rgb_matrix_idle_anim :1; + }; +} userspace_config_t; +// clang-format on + +extern userspace_config_t userspace_config; -- cgit v1.2.3 From 5b8f1327d810d7b345b8b99d4062a0aebb650f8c Mon Sep 17 00:00:00 2001 From: CurryFurious Date: Thu, 2 Jan 2020 16:26:09 -0600 Subject: Removing unnecessary struct definitions Removed userspace_config unused variables, and removed _NUMLOCK as it isn't used anywhere. --- users/curry/curry.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'users/curry/curry.h') diff --git a/users/curry/curry.h b/users/curry/curry.h index 985453c49b..a9de9ae510 100644 --- a/users/curry/curry.h +++ b/users/curry/curry.h @@ -21,7 +21,6 @@ /* Define layer names */ enum userspace_layers { _QWERTY = 0, - _NUMLOCK = 0, _COLEMAK, _DVORAK, _MODS, @@ -45,10 +44,7 @@ typedef union { uint32_t raw; struct { bool rgb_layer_change :1; - bool is_overwatch :1; bool nuke_switch :1; - uint8_t unicode_mod :4; - bool swapped_numbers :1; bool rgb_matrix_idle_anim :1; }; } userspace_config_t; -- cgit v1.2.3