[Keymap] Drashna's Feature madness (#6128)
* Fix my Tap Dance issues after I broke them * Cleanup and organization of userspace documentation As well as some additional cleanup of functions due to review of documentation. * Enable Tapdance on Glow and remove more animations * Revert to Eager PR debouncing * Add better check for startup animation * Move where RGB Matrix defines are listed * Limit RGB Matrix max val * Update keyboard for Iris Rev 3 conflicts * Enable encoder support on planck ez * Remove is_master check from corne\'s OLED code * Overhaul OLED screens for my Corne * One last removal * Show RGB valu On both sides * Updates for OLED display info * Fix compile issues for rgb config * Disabled Space Cadet for all drashna keymaps * Fix OLED Screen configs * Minor OLED Tweaks * Revert some Iris changes * Fix song include * Handle MAKE macro for the Corne boards better * Add super hacky-hack for eeconfig initialization * Add audio support for Fractal since Elite Cs support it * Add defines for keycode steps * Add White layout * Update Corne RGB info * Add fun effects to layer indication for RGB Matrix enabled boards * Use proper define for product name detection * Update formatting * Use custom timeout mechanism for OLED timeout * Fix up OLED screen HSV code for new HSV structure * Better handle turning off RGB Matrix when sleeping * Disable MultiSplash Animation * Change Iris back to using serial * Why was RGB disabled?!?!?! * Limit val in rgb_matrix_layer_helper function * Remove EECONFIG setting for RGB matrix
This commit is contained in:
		
							parent
							
								
									840b9090a0
								
							
						
					
					
						commit
						d41961c9ed
					
				
					 38 changed files with 1451 additions and 1190 deletions
				
			
		| 
						 | 
				
			
			@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* Select hand configuration */
 | 
			
		||||
 | 
			
		||||
// #define MASTER_LEFT
 | 
			
		||||
| 
						 | 
				
			
			@ -36,52 +35,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
// #define TAPPING_TERM 100
 | 
			
		||||
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#   undef RGBLED_NUM
 | 
			
		||||
#   define RGBLED_NUM 27
 | 
			
		||||
#    undef RGBLED_NUM
 | 
			
		||||
#    define RGBLED_NUM 27
 | 
			
		||||
 | 
			
		||||
#   define RGBLIGHT_HUE_STEP 8
 | 
			
		||||
#   define RGBLIGHT_SAT_STEP 8
 | 
			
		||||
#   define RGBLIGHT_VAL_STEP 8
 | 
			
		||||
#   define RGBLIGHT_LIMIT_VAL 100
 | 
			
		||||
#    define RGBLIGHT_HUE_STEP 8
 | 
			
		||||
#    define RGBLIGHT_SAT_STEP 8
 | 
			
		||||
#    define RGBLIGHT_VAL_STEP 5
 | 
			
		||||
#    define RGBLIGHT_LIMIT_VAL 150
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 | 
			
		||||
#   define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 | 
			
		||||
#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 | 
			
		||||
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_ALPHAS_MODS
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_BREATHING
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_CYCLE_ALL
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_DUAL_BEACON
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_RAINBOW_BEACON
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_RAINDROPS
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_TYPING_HEATMAP
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_DIGITAL_RAIN
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SPLASH
 | 
			
		||||
// #   define DISABLE_RGB_MATRIX_MULTISPLASH
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_SPLASH
 | 
			
		||||
#   define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
 | 
			
		||||
#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 | 
			
		||||
// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 | 
			
		||||
// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 | 
			
		||||
#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
 | 
			
		||||
// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 | 
			
		||||
// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 | 
			
		||||
#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 | 
			
		||||
#    define RGB_MATRIX_HUE_STEP 8
 | 
			
		||||
#    define RGB_MATRIX_SAT_STEP 8
 | 
			
		||||
#    define RGB_MATRIX_VAL_STEP 5
 | 
			
		||||
#    define RGB_MATRIX_SPD_STEP 10
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
#   define B6_AUDIO
 | 
			
		||||
#    define B6_AUDIO
 | 
			
		||||
// #define NO_MUSIC_MODE
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -92,4 +70,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
// #define OLED_FONT_WIDTH 5
 | 
			
		||||
// #define OLED_FONT_HEIGHT 7
 | 
			
		||||
 | 
			
		||||
#define OLED_DISABLE_TIMEOUT
 | 
			
		||||
#define TAPPING_TERM_PER_KEY
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,17 +2,16 @@
 | 
			
		|||
#include "drashna.h"
 | 
			
		||||
 | 
			
		||||
extern keymap_config_t keymap_config;
 | 
			
		||||
extern uint8_t is_master;
 | 
			
		||||
extern uint8_t         is_master;
 | 
			
		||||
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
//Following line allows macro to read current RGB settings
 | 
			
		||||
// Following line allows macro to read current RGB settings
 | 
			
		||||
extern rgblight_config_t rgblight_config;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
enum crkbd_keycodes {
 | 
			
		||||
    RGBRST = NEW_SAFE_RANGE
 | 
			
		||||
};
 | 
			
		||||
enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE };
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
#define LAYOUT_crkbd_base( \
 | 
			
		||||
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
 | 
			
		||||
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
 | 
			
		||||
| 
						 | 
				
			
			@ -103,60 +102,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
                                     _______, KC_NUKE, _______,        _______, TG_MODS, _______
 | 
			
		||||
  )
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void matrix_init_keymap(void) {
 | 
			
		||||
#ifndef CONVERT_TO_PROTON_C
 | 
			
		||||
    setPinOutput(D5);
 | 
			
		||||
    writePinHigh(D5);
 | 
			
		||||
 | 
			
		||||
    setPinOutput(B0);
 | 
			
		||||
    writePinHigh(B0);
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// clang-format on
 | 
			
		||||
 | 
			
		||||
#ifdef OLED_DRIVER_ENABLE
 | 
			
		||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 | 
			
		||||
    if (is_master) {
 | 
			
		||||
        return OLED_ROTATION_270;
 | 
			
		||||
    } else {
 | 
			
		||||
        return rotation;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
 | 
			
		||||
uint16_t        oled_timer;
 | 
			
		||||
 | 
			
		||||
void render_crkbd_logo(void) {
 | 
			
		||||
    static const char PROGMEM crkbd_logo[] = {
 | 
			
		||||
        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
 | 
			
		||||
        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
 | 
			
		||||
        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
 | 
			
		||||
        0};
 | 
			
		||||
    oled_write_P(crkbd_logo, false);
 | 
			
		||||
}
 | 
			
		||||
char     keylog_str[5]   = {};
 | 
			
		||||
uint8_t  keylogs_str_idx = 0;
 | 
			
		||||
uint16_t log_timer       = 0;
 | 
			
		||||
 | 
			
		||||
#define KEYLOG_LEN (int)(32 / OLED_FONT_WIDTH)
 | 
			
		||||
char keylog_str[KEYLOG_LEN] = {};
 | 
			
		||||
uint8_t keylogs_str_idx = 0;
 | 
			
		||||
uint16_t log_timer = 0;
 | 
			
		||||
 | 
			
		||||
const char code_to_name[60] = {
 | 
			
		||||
    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
 | 
			
		||||
    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
 | 
			
		||||
    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
 | 
			
		||||
    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
 | 
			
		||||
    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
 | 
			
		||||
    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
 | 
			
		||||
const char code_to_name[60] = {' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\', '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
 | 
			
		||||
 | 
			
		||||
void add_keylog(uint16_t keycode) {
 | 
			
		||||
    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
 | 
			
		||||
        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
 | 
			
		||||
    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
 | 
			
		||||
        keycode = keycode & 0xFF;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    for (uint8_t i = KEYLOG_LEN - 1; i > 0; i--) {
 | 
			
		||||
    for (uint8_t i = 4; i > 0; i--) {
 | 
			
		||||
        keylog_str[i] = keylog_str[i - 1];
 | 
			
		||||
    }
 | 
			
		||||
    if (keycode < 60) {
 | 
			
		||||
        keylog_str[0] = code_to_name[keycode];
 | 
			
		||||
    }
 | 
			
		||||
    keylog_str[KEYLOG_LEN] = 0;
 | 
			
		||||
    keylog_str[5] = 0;
 | 
			
		||||
 | 
			
		||||
    log_timer = timer_read();
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -167,94 +136,153 @@ void update_log(void) {
 | 
			
		|||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
    if (record->event.pressed) {  add_keylog(keycode); }
 | 
			
		||||
    if (record->event.pressed) {
 | 
			
		||||
        add_keylog(keycode);
 | 
			
		||||
        oled_timer = timer_read();
 | 
			
		||||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void render_status(void) {
 | 
			
		||||
void render_rgb_status(void) {
 | 
			
		||||
    oled_write_ln("RGB:", false);
 | 
			
		||||
    static char temp[20] = {0};
 | 
			
		||||
    snprintf(temp, sizeof(temp) + 1, "M:%3dH:%3dS:%3dV:%3d", rgb_matrix_config.mode, rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v);
 | 
			
		||||
    oled_write(temp, false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
    oled_write_P(PSTR("Layer"), false);
 | 
			
		||||
    switch (biton32(layer_state)) {
 | 
			
		||||
        case 0:
 | 
			
		||||
            oled_write_P(PSTR("Base "), false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _RAISE:
 | 
			
		||||
            oled_write_P(PSTR("Raise"), false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _LOWER:
 | 
			
		||||
            oled_write_P(PSTR("Lower"), false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _ADJUST:
 | 
			
		||||
            oled_write_P(PSTR("Adjst"), false);
 | 
			
		||||
            break;
 | 
			
		||||
        default:
 | 
			
		||||
            oled_write_P(PSTR("Unkn "), false);
 | 
			
		||||
            break;
 | 
			
		||||
    }
 | 
			
		||||
    oled_write_P(PSTR("Lyout"), false);
 | 
			
		||||
void render_status_main(void) {
 | 
			
		||||
    /* Show Keyboard Layout  */
 | 
			
		||||
    oled_write("Lyout", false);
 | 
			
		||||
    switch (biton32(default_layer_state)) {
 | 
			
		||||
        case _QWERTY:
 | 
			
		||||
            oled_write_P(PSTR("QWRTY"), false);
 | 
			
		||||
            oled_write(" QRTY", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _COLEMAK:
 | 
			
		||||
            oled_write_P(PSTR("COLMK"), false);
 | 
			
		||||
            oled_write(" COLE", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _DVORAK:
 | 
			
		||||
            oled_write_P(PSTR("DVRAK"), false);
 | 
			
		||||
            oled_write(" DVRK", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _WORKMAN:
 | 
			
		||||
            oled_write_P(PSTR("WRKMN"), false);
 | 
			
		||||
            oled_write(" WKMN", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _NORMAN:
 | 
			
		||||
            oled_write_P(PSTR("NORMN"), false);
 | 
			
		||||
            oled_write(" NORM", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _MALTRON:
 | 
			
		||||
            oled_write_P(PSTR("MLTRN"), false);
 | 
			
		||||
            oled_write(" MLTN", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _EUCALYN:
 | 
			
		||||
            oled_write_P(PSTR("ECLYN"), false);
 | 
			
		||||
            oled_write(" ECLN", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _CARPLAX:
 | 
			
		||||
            oled_write_P(PSTR("CRPLX"), false);
 | 
			
		||||
            oled_write(" CRPX", false);
 | 
			
		||||
            break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    uint8_t modifiers = get_mods();
 | 
			
		||||
    uint8_t one_shot = get_oneshot_mods();
 | 
			
		||||
 | 
			
		||||
    oled_write_P(PSTR("Mods:"), false);
 | 
			
		||||
    oled_write_P( (modifiers & MOD_MASK_SHIFT || one_shot & MOD_MASK_SHIFT) ? PSTR(" SFT ") : PSTR("     "), false);
 | 
			
		||||
    oled_write_P( (modifiers & MOD_MASK_CTRL  || one_shot & MOD_MASK_CTRL ) ? PSTR(" CTL ") : PSTR("     "), false);
 | 
			
		||||
    oled_write_P( (modifiers & MOD_MASK_ALT   || one_shot & MOD_MASK_ALT  ) ? PSTR(" ALT ") : PSTR("     "), false);
 | 
			
		||||
    oled_write_P( (modifiers & MOD_MASK_GUI   || one_shot & MOD_MASK_GUI  ) ? PSTR(" GUI ") : PSTR("     "), false);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    oled_write_P(PSTR("BTMGK"), false);
 | 
			
		||||
 | 
			
		||||
    if (keymap_config.swap_lalt_lgui) {
 | 
			
		||||
        oled_write_P(PSTR(" Mac "), false);
 | 
			
		||||
    } else {
 | 
			
		||||
        oled_write_P(PSTR(" Win "), false);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* Show Lock Status (only work on master side) */
 | 
			
		||||
    uint8_t led_usb_state = host_keyboard_leds();
 | 
			
		||||
    oled_write_P(PSTR("Lock:"), false);
 | 
			
		||||
    oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK)    ? PSTR(" NUM ") : PSTR("     "), false);
 | 
			
		||||
    oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK)   ? PSTR(" CAPS") : PSTR("     "), false);
 | 
			
		||||
    oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR(" SCRL") : PSTR("     "), false);
 | 
			
		||||
    oled_write("Lock:", false);
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("NUM", led_usb_state & (1 << USB_LED_NUM_LOCK));
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write("CAPS", led_usb_state & (1 << USB_LED_CAPS_LOCK));
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write("SCRL", led_usb_state & (1 << USB_LED_SCROLL_LOCK));
 | 
			
		||||
 | 
			
		||||
    /* Show Alt-Gui Swap options */
 | 
			
		||||
    oled_write("BTMGK", false);
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("Win", !keymap_config.swap_lalt_lgui);
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("Mac", keymap_config.swap_lalt_lgui);
 | 
			
		||||
 | 
			
		||||
#    if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
 | 
			
		||||
    /* Show RGB Options */
 | 
			
		||||
    render_rgb_status();
 | 
			
		||||
#    endif
 | 
			
		||||
 | 
			
		||||
    oled_write(keylog_str, false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void render_status_secondary(void) {
 | 
			
		||||
    /* Show Keyboard Layout  */
 | 
			
		||||
    oled_write("Lyout", false);
 | 
			
		||||
    switch (biton32(default_layer_state)) {
 | 
			
		||||
        case _QWERTY:
 | 
			
		||||
            oled_write(" QRTY", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _COLEMAK:
 | 
			
		||||
            oled_write(" COLE", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _DVORAK:
 | 
			
		||||
            oled_write(" DVRK", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _WORKMAN:
 | 
			
		||||
            oled_write(" WKMN", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _NORMAN:
 | 
			
		||||
            oled_write(" NORM", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _MALTRON:
 | 
			
		||||
            oled_write(" MLTN", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _EUCALYN:
 | 
			
		||||
            oled_write(" ECLN", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _CARPLAX:
 | 
			
		||||
            oled_write(" CRPX", false);
 | 
			
		||||
            break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* Show Activate layer */
 | 
			
		||||
    oled_write("Layer", false);
 | 
			
		||||
    switch (biton32(layer_state)) {
 | 
			
		||||
        case _RAISE:
 | 
			
		||||
            oled_write("Raise", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _LOWER:
 | 
			
		||||
            oled_write("Lower", false);
 | 
			
		||||
            break;
 | 
			
		||||
        case _ADJUST:
 | 
			
		||||
            oled_write("Adjst", false);
 | 
			
		||||
            break;
 | 
			
		||||
        default:
 | 
			
		||||
            oled_write("Dflt ", false);
 | 
			
		||||
            break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* Show Mod  */
 | 
			
		||||
    uint8_t modifiers = get_mods() | get_oneshot_mods();
 | 
			
		||||
 | 
			
		||||
    oled_write("Mods:", false);
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("SFT", (modifiers & MOD_MASK_SHIFT));
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("CTL", (modifiers & MOD_MASK_CTRL));
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("ALT", (modifiers & MOD_MASK_ALT));
 | 
			
		||||
    oled_write(" ", false);
 | 
			
		||||
    oled_write_ln("GUI", (modifiers & MOD_MASK_GUI));
 | 
			
		||||
 | 
			
		||||
#    if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
 | 
			
		||||
    render_rgb_status();
 | 
			
		||||
#    endif
 | 
			
		||||
 | 
			
		||||
    /* Show logged Keys */
 | 
			
		||||
    oled_write(keylog_str, false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void oled_task_user(void) {
 | 
			
		||||
    if (timer_elapsed(oled_timer) > 60000) {
 | 
			
		||||
        oled_off();
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
    if (is_master) {
 | 
			
		||||
        render_status();     // Renders the current keyboard state (layer, lock, caps, scroll, etc)
 | 
			
		||||
        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
 | 
			
		||||
    } else {
 | 
			
		||||
        render_crkbd_logo();
 | 
			
		||||
        oled_scroll_left();  // Turns on scrolling
 | 
			
		||||
        render_status_secondary();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -272,57 +300,82 @@ uint16_t get_tapping_term(uint16_t keycode) {
 | 
			
		|||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
 | 
			
		||||
static bool is_suspended;
 | 
			
		||||
static bool rgb_matrix_enabled;
 | 
			
		||||
 | 
			
		||||
void suspend_power_down_keymap(void) {
 | 
			
		||||
    rgb_matrix_set_suspend_state(true);
 | 
			
		||||
    if (!is_suspended) {
 | 
			
		||||
        is_suspended = true;
 | 
			
		||||
        rgb_matrix_enabled = (bool)rgb_matrix_config.enable;
 | 
			
		||||
        rgb_matrix_disable_noeeprom();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void suspend_wakeup_init_keymap(void) {
 | 
			
		||||
    rgb_matrix_set_suspend_state(false);
 | 
			
		||||
    is_suspended = false;
 | 
			
		||||
    if (rgb_matrix_enabled) {
 | 
			
		||||
        rgb_matrix_enable_noeeprom();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void rgb_matrix_indicators_user(void) {
 | 
			
		||||
    if ( userspace_config.rgb_layer_change &&
 | 
			
		||||
#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
    if (userspace_config.rgb_layer_change &&
 | 
			
		||||
#    ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
			
		||||
        !g_suspend_state &&
 | 
			
		||||
#endif
 | 
			
		||||
#if defined(RGBLIGHT_ENABLE)
 | 
			
		||||
#    endif
 | 
			
		||||
#    if defined(RGBLIGHT_ENABLE)
 | 
			
		||||
        (!rgblight_config.enable && rgb_matrix_config.enable)
 | 
			
		||||
#else
 | 
			
		||||
#    else
 | 
			
		||||
        rgb_matrix_config.enable
 | 
			
		||||
#endif
 | 
			
		||||
#    endif
 | 
			
		||||
    ) {
 | 
			
		||||
        switch (biton32(layer_state)) {
 | 
			
		||||
            case _MODS:
 | 
			
		||||
                rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
            case _GAMEPAD:
 | 
			
		||||
                rgb_matrix_layer_helper(0xFF, 0x80, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                break;
 | 
			
		||||
            case _DIABLO:
 | 
			
		||||
                rgb_matrix_layer_helper(0xFF, 0x00, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                break;
 | 
			
		||||
            case _RAISE:
 | 
			
		||||
                rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                break;
 | 
			
		||||
            case _LOWER:
 | 
			
		||||
                rgb_matrix_layer_helper(0x00, 0xFF, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                break;
 | 
			
		||||
            case _ADJUST:
 | 
			
		||||
                rgb_matrix_layer_helper(0xFF, 0x00, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
            default:
 | 
			
		||||
                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                break;
 | 
			
		||||
            default: {
 | 
			
		||||
                bool mods_enabled = IS_LAYER_ON(_MODS);
 | 
			
		||||
                switch (biton32(default_layer_state)) {
 | 
			
		||||
                    case _QWERTY:
 | 
			
		||||
                        rgb_matrix_layer_helper(0x00, 0xFF, 0xFF, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_CYAN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _COLEMAK:
 | 
			
		||||
                        rgb_matrix_layer_helper(0xFF, 0x00, 0xFF, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_MAGENTA, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _DVORAK:
 | 
			
		||||
                        rgb_matrix_layer_helper(0x00, 0xFF, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_SPRINGGREEN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _WORKMAN:
 | 
			
		||||
                        rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_GOLDENROD, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _NORMAN:
 | 
			
		||||
                        rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_CORAL, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _MALTRON:
 | 
			
		||||
                        rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_YELLOW, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _EUCALYN:
 | 
			
		||||
                        rgb_matrix_layer_helper(0xFF, 0x80, 0xBF, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_PINK, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case _CARPLAX:
 | 
			
		||||
                        rgb_matrix_layer_helper(0x00, 0x00, 0xFF, LED_FLAG_UNDERGLOW); break;
 | 
			
		||||
                        rgb_matrix_layer_helper(HSV_BLUE, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
 | 
			
		||||
                        break;
 | 
			
		||||
                }
 | 
			
		||||
                break;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,6 @@ UNICODE_ENABLE             = no  # Unicode
 | 
			
		|||
BLUETOOTH_ENABLE           = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
			
		||||
RGBLIGHT_ENABLE            = no  # Enable WS2812 RGB underlight.
 | 
			
		||||
SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
 | 
			
		||||
RGBLIGHT_STARTUP_ANIMATION = yes
 | 
			
		||||
RGB_MATRIX_ENABLE = WS2812
 | 
			
		||||
 | 
			
		||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
			
		||||
| 
						 | 
				
			
			@ -25,7 +24,3 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
			
		|||
BOOTLOADER = qmk-dfu
 | 
			
		||||
 | 
			
		||||
OLED_DRIVER_ENABLE = yes
 | 
			
		||||
 | 
			
		||||
ifneq ($(strip $(OLED_DRIVER_ENABLE)), yes)
 | 
			
		||||
    RGB_MATRIX_SPLIT_RIGHT=yes
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "drashna.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
#define LAYOUT_gergo_base( \
 | 
			
		||||
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
 | 
			
		||||
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
 | 
			
		||||
| 
						 | 
				
			
			@ -111,3 +111,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
        ),
 | 
			
		||||
 | 
			
		||||
    */
 | 
			
		||||
// clang-format on
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
/* Use I2C or Serial, not both */
 | 
			
		||||
 | 
			
		||||
// #define USE_SERIAL
 | 
			
		||||
#define USE_I2C
 | 
			
		||||
#define USE_SERIAL
 | 
			
		||||
// #define USE_I2C
 | 
			
		||||
 | 
			
		||||
/* Select hand configuration */
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -29,33 +29,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define EE_HANDS
 | 
			
		||||
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#   undef RGBLED_NUM
 | 
			
		||||
#   define RGBLED_NUM 18     // Number of LEDs
 | 
			
		||||
#   define RGBLED_SPLIT { 9, 9 }
 | 
			
		||||
#   define RGBLIGHT_HUE_STEP 12
 | 
			
		||||
#   define RGBLIGHT_SAT_STEP 12
 | 
			
		||||
#   define RGBLIGHT_VAL_STEP 12
 | 
			
		||||
#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 | 
			
		||||
#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
 | 
			
		||||
#    undef RGBLED_NUM
 | 
			
		||||
#    define RGBLED_NUM 18  // Number of LEDs
 | 
			
		||||
#    undef RGBLED_SPLIT
 | 
			
		||||
#    define RGBLED_SPLIT { 9, 9 }
 | 
			
		||||
#    define RGBLIGHT_HUE_STEP 8
 | 
			
		||||
#    define RGBLIGHT_SAT_STEP 8
 | 
			
		||||
#    define RGBLIGHT_VAL_STEP 8
 | 
			
		||||
#    define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 | 
			
		||||
#    define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
 | 
			
		||||
 | 
			
		||||
#   define RGBLIGHT_LIMIT_VAL 225
 | 
			
		||||
#endif // RGBLIGHT_ENABLE
 | 
			
		||||
#    define RGBLIGHT_LIMIT_VAL 225
 | 
			
		||||
#endif  // RGBLIGHT_ENABLE
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
#   define C6_AUDIO
 | 
			
		||||
#   ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#       define NO_MUSIC_MODE
 | 
			
		||||
#   endif //RGBLIGHT_ENABLE
 | 
			
		||||
#endif //AUDIO_ENABLE
 | 
			
		||||
#    define C6_AUDIO
 | 
			
		||||
#    ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#        define NO_MUSIC_MODE
 | 
			
		||||
#    endif  // RGBLIGHT_ENABLE
 | 
			
		||||
#endif      // AUDIO_ENABLE
 | 
			
		||||
 | 
			
		||||
#define QMK_ESC_OUTPUT F6 // usually COL
 | 
			
		||||
#define QMK_ESC_INPUT D7 // usually ROW
 | 
			
		||||
#define QMK_LED B0
 | 
			
		||||
#define QMK_SPEAKER C6
 | 
			
		||||
#ifndef KEYBOARD_keebio_iris_rev3
 | 
			
		||||
#    define QMK_ESC_OUTPUT F6  // usually COL
 | 
			
		||||
#    define QMK_ESC_INPUT D7   // usually ROW
 | 
			
		||||
#    define QMK_LED B0
 | 
			
		||||
#    define QMK_SPEAKER C6
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#undef PRODUCT
 | 
			
		||||
#ifdef KEYBOARD_keebio_iris_rev2
 | 
			
		||||
#   define PRODUCT         Drashna Hacked Iris Rev.2
 | 
			
		||||
#    define PRODUCT Drashna Hacked Iris Rev .2
 | 
			
		||||
#elif defined(KEYBOARD_keebio_iris_rev3)
 | 
			
		||||
#    define PRODUCT Drashna Hacked Iris Rev .3
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define SHFT_LED1 6
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "drashna.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
#define LAYOUT_iris_base( \
 | 
			
		||||
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
 | 
			
		||||
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
 | 
			
		||||
| 
						 | 
				
			
			@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
   )
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// clang-format on
 | 
			
		||||
 | 
			
		||||
void matrix_init_keymap(void) {
 | 
			
		||||
#ifndef CONVERT_TO_PROTON_C
 | 
			
		||||
| 
						 | 
				
			
			@ -122,13 +122,12 @@ void matrix_init_keymap(void) {
 | 
			
		|||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void keyboard_post_init_keymap(void) {
 | 
			
		||||
#if BACKLIGHT_ENABLE
 | 
			
		||||
    backlight_enable();
 | 
			
		||||
    backlight_level(5);
 | 
			
		||||
    #ifdef BACKLIGHT_BREATHING
 | 
			
		||||
        breathing_enable();
 | 
			
		||||
    #endif
 | 
			
		||||
#    ifdef BACKLIGHT_BREATHING
 | 
			
		||||
    breathing_enable();
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,6 +14,6 @@ SPACE_CADET_ENABLE = no
 | 
			
		|||
INDICATOR_LIGHTS  = no
 | 
			
		||||
MACROS_ENABLED    = no
 | 
			
		||||
RGBLIGHT_TWINKLE  = no
 | 
			
		||||
RGBLIGHT_STARTUP_ANIMATION = yes
 | 
			
		||||
RGBLIGHT_STARTUP_ANIMATION = no
 | 
			
		||||
 | 
			
		||||
BOOTLOADER        = qmk-dfu
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@ uint8_t last_led;
 | 
			
		|||
uint8_t last_osm;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
#define LAYOUT_orthodox_base( \
 | 
			
		||||
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
 | 
			
		||||
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
 | 
			
		||||
| 
						 | 
				
			
			@ -121,6 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  )
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
// clang-format on
 | 
			
		||||
 | 
			
		||||
void matrix_init_keymap(void) {
 | 
			
		||||
#ifndef CONVERT_TO_PROTON_C
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue