Merge remote-tracking branch 'upstream/master'

1 files changed, 84 insertions, 114 deletions

diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index acc6b9f9ed..71779a6215 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -19,40 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 userspace_config_t userspace_config;
 #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-    #define DRASHNA_UNICODE_MODE UC_WIN
+#    define DRASHNA_UNICODE_MODE UC_WIN
 #else
-  // set to 2 for UC_WIN, set to 4 for UC_WINC
-    #define DRASHNA_UNICODE_MODE 2
+// set to 2 for UC_WIN, set to 4 for UC_WINC
+#    define DRASHNA_UNICODE_MODE 2
 #endif
 
-
-// This block is for all of the gaming macros, as they were all doing
-// the same thing, but with differring text sent.
-bool send_game_macro(const char *str, keyrecord_t *record, bool override) {
-    if (!record->event.pressed || override) {
-        uint16_t keycode;
-        if (userspace_config.is_overwatch) {
-        keycode = KC_BSPC;
-        } else {
-        keycode = KC_ENTER;
-        }
-        clear_keyboard();
-        tap_code(keycode);
-        wait_ms(TAP_CODE_DELAY);
-        send_string_with_delay(str, TAP_CODE_DELAY);
-        wait_ms(TAP_CODE_DELAY);
-        tap_code(KC_ENTER);
-    }
-    if (override) wait_ms(3000);
-    return false;
-}
-
-bool mod_key_press_timer (uint16_t code, uint16_t mod_code, bool pressed) {
+bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed) {
     static uint16_t this_timer;
-    if(pressed) {
-        this_timer= timer_read();
+    if (pressed) {
+        this_timer = timer_read();
     } else {
-        if (timer_elapsed(this_timer) < TAPPING_TERM){
+        if (timer_elapsed(this_timer) < TAPPING_TERM) {
             tap_code(code);
         } else {
             register_code(mod_code);
@@ -63,11 +41,11 @@ bool mod_key_press_timer (uint16_t code, uint16_t mod_code, bool pressed) {
     return false;
 }
 
-bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer) {
-    if(pressed) {
-        this_timer= timer_read();
+bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer) {
+    if (pressed) {
+        this_timer = timer_read();
     } else {
-        if (timer_elapsed(this_timer) < TAPPING_TERM){
+        if (timer_elapsed(this_timer) < TAPPING_TERM) {
             tap_code(code);
         } else {
             register_code(mod_code);
@@ -80,90 +58,85 @@ bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t thi
 
 void bootmagic_lite(void) {
     matrix_scan();
-    #if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
-        wait_ms(DEBOUNCING_DELAY * 2);
-    #elif defined(DEBOUNCE) && DEBOUNCE > 0
-        wait_ms(DEBOUNCE * 2);
-    #else
-        wait_ms(30);
-    #endif
+#if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
+    wait_ms(DEBOUNCING_DELAY * 2);
+#elif defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+#else
+    wait_ms(30);
+#endif
     matrix_scan();
     if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
         bootloader_jump();
     }
 }
 
+__attribute__((weak)) void keyboard_pre_init_keymap(void) {}
+
+void keyboard_pre_init_user(void) {
+    userspace_config.raw = eeconfig_read_user();
+    keyboard_pre_init_keymap();
+}
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
 // customization of the keymap.  Use _keymap instead of _user
 // functions in the keymaps
-__attribute__ ((weak))
-void matrix_init_keymap(void) {}
+__attribute__((weak)) void matrix_init_keymap(void) {}
 
 // Call user matrix init, set default RGB colors and then
 // call the keymap's init function
 void matrix_init_user(void) {
-    userspace_config.raw = eeconfig_read_user();
-
-    #ifdef BOOTLOADER_CATERINA
-        DDRD &= ~(1<<5);
-        PORTD &= ~(1<<5);
+#if defined(BOOTLOADER_CATERINA) && defined(__AVR__)
+    DDRD &= ~(1 << 5);
+    PORTD &= ~(1 << 5);
 
-        DDRB &= ~(1<<0);
-        PORTB &= ~(1<<0);
-    #endif
+    DDRB &= ~(1 << 0);
+    PORTB &= ~(1 << 0);
+#endif
 
-    #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-        set_unicode_input_mode(DRASHNA_UNICODE_MODE);
-        get_unicode_input_mode();
-    #endif //UNICODE_ENABLE
+#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
+    set_unicode_input_mode(DRASHNA_UNICODE_MODE);
+    get_unicode_input_mode();
+#endif  // UNICODE_ENABLE
     matrix_init_keymap();
 }
 
-__attribute__((weak))
-void keyboard_post_init_keymap(void){ }
+__attribute__((weak)) void keyboard_post_init_keymap(void) {}
 
-void keyboard_post_init_user(void){
-#ifdef RGBLIGHT_ENABLE
+void keyboard_post_init_user(void) {
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
     keyboard_post_init_rgb();
 #endif
     keyboard_post_init_keymap();
 }
 
-__attribute__ ((weak))
-void shutdown_keymap(void) {}
-
-void shutdown_user (void) {
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_enable_noeeprom();
-        rgblight_mode_noeeprom(1);
-        rgblight_setrgb_red();
-    #endif // RGBLIGHT_ENABLE
-    #ifdef RGB_MATRIX_ENABLE
-        // uint16_t timer_start = timer_read();
-        // rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 );
-        // while(timer_elapsed(timer_start) < 250) { wait_ms(1); }
-    #endif //RGB_MATRIX_ENABLE
-    shutdown_keymap();
-}
+__attribute__((weak)) void shutdown_keymap(void) {}
 
-__attribute__ ((weak))
-void suspend_power_down_keymap(void) {}
+void rgb_matrix_update_pwm_buffers(void);
 
-void suspend_power_down_user(void) {
-    suspend_power_down_keymap();
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(1);
+    rgblight_setrgb_red();
+#endif  // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
+    rgb_matrix_update_pwm_buffers();
+
+#endif  // RGB_MATRIX_ENABLE
+    shutdown_keymap();
 }
 
-__attribute__ ((weak))
-void suspend_wakeup_init_keymap(void) {}
+__attribute__((weak)) void suspend_power_down_keymap(void) {}
 
-void suspend_wakeup_init_user(void) {
-    suspend_wakeup_init_keymap();
-}
+void suspend_power_down_user(void) { suspend_power_down_keymap(); }
 
+__attribute__((weak)) void suspend_wakeup_init_keymap(void) {}
 
-__attribute__ ((weak))
-void matrix_scan_keymap(void) {}
+void suspend_wakeup_init_user(void) { suspend_wakeup_init_keymap(); }
+
+__attribute__((weak)) void matrix_scan_keymap(void) {}
 
 // No global matrix scan code, so just run keymap's matrix
 // scan function
@@ -176,69 +149,66 @@ void matrix_scan_user(void) {
 
 #ifdef TAP_DANCE_ENABLE  // Run Diablo 3 macro checking code.
     run_diablo_macro_check();
-#endif // TAP_DANCE_ENABLE
+#endif  // TAP_DANCE_ENABLE
 
-#ifdef RGBLIGHT_ENABLE
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
     matrix_scan_rgb();
-#endif // RGBLIGHT_ENABLE
+#endif  // RGBLIGHT_ENABLE
 
     matrix_scan_keymap();
 }
 
-
-__attribute__ ((weak))
-layer_state_t layer_state_set_keymap (layer_state_t state) {
-    return state;
-}
+__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
 
 // on layer change, no matter where the change was initiated
 // Then runs keymap's layer change check
 layer_state_t layer_state_set_user(layer_state_t state) {
     state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-#ifdef RGBLIGHT_ENABLE
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
     state = layer_state_set_rgb(state);
-#endif // RGBLIGHT_ENABLE
-    return layer_state_set_keymap (state);
+#endif  // RGBLIGHT_ENABLE
+    return layer_state_set_keymap(state);
 }
 
-
-__attribute__ ((weak))
-layer_state_t default_layer_state_set_keymap (layer_state_t state) {
-    return state;
-}
+__attribute__((weak)) layer_state_t default_layer_state_set_keymap(layer_state_t state) { return state; }
 
 // Runs state check and changes underglow color and animation
 layer_state_t default_layer_state_set_user(layer_state_t state) {
     state = default_layer_state_set_keymap(state);
 #if 0
-#ifdef RGBLIGHT_ENABLE
+#    if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
   state = default_layer_state_set_rgb(state);
-#endif // RGBLIGHT_ENABLE
+#    endif  // RGBLIGHT_ENABLE
 #endif
     return state;
 }
 
-__attribute__ ((weak))
-void led_set_keymap(uint8_t usb_led) {}
+__attribute__((weak)) void led_set_keymap(uint8_t usb_led) {}
 
 // Any custom LED code goes here.
 // So far, I only have keyboard specific code,
 // So nothing goes here.
-void led_set_user(uint8_t usb_led) {
-    led_set_keymap(usb_led);
-}
+void led_set_user(uint8_t usb_led) { led_set_keymap(usb_led); }
 
-__attribute__ ((weak))
-void eeconfig_init_keymap(void) {}
+__attribute__((weak)) void eeconfig_init_keymap(void) {}
 
 void eeconfig_init_user(void) {
-    userspace_config.raw = 0;
+    userspace_config.raw              = 0;
     userspace_config.rgb_layer_change = true;
     eeconfig_update_user(userspace_config.raw);
-  #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
+#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
     set_unicode_input_mode(DRASHNA_UNICODE_MODE);
     get_unicode_input_mode();
-  #else
+#else
     eeprom_update_byte(EECONFIG_UNICODEMODE, DRASHNA_UNICODE_MODE);
-  #endif
+#endif
+    eeconfig_init_keymap();
+    keyboard_init();
+}
+
+bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
+    value &= 0xF;
+    mask &= 0xF;
+
+    return (value & mask) == mask;
 }