Yet another update to drashna keymaps and userspace (#3787)
* Make tap function inline * Use better makefile keyboard detection * Remove Copy-Paste macro * Add F11/F12 to Iris * Minor tweaks to userspace config * Set audio clicky randomness to 1.5 * Set NO_DEBUG to only be set if console is not enabled * Move NO_MUSIC_MODE to userspace config.h * Reduce Ergodox Debounce * Add Planck Light config * Use OSM for ortho 4x12 * Music Mode changes for planck light * Cleanup do to shutdown user and other fixes in Master * Add and use 'shutdown_user' fzunction * Remove global NO_MUSIC_MODE define * Add NO_MUSIC_MODE to individual keymaps * Change layer colors * Remove NO_PRINT and NO_DEBUG from userspace config.h Since these are automatically disabled if the console isn't enabled. * Remove backlight code if backlight isn't enabled * Remove Twinkle from Ergodox * Disable RGB twinkling and enable PSM * Clean up RGB matrix code * Clean up planck light indicators * Clean up tap code * Rules cleanup for ortho 4x12 * Fix up userspace template * Revert "Clean up tap code" This reverts commit 09f64d6d67aa021c3b5ac86a9a739a5ca2b9c1ec. * Organize includes * userspace cleanup * Fix modifier spelling error * Fix userspace rules * Disable Permissive Hold again * Minor clean up * Fix Tap stuff * Viterbi Updates for file size
This commit is contained in:
		
							parent
							
								
									661ca4440c
								
							
						
					
					
						commit
						e4bbe057f2
					
				
					 19 changed files with 280 additions and 222 deletions
				
			
		| 
						 | 
				
			
			@ -13,3 +13,6 @@
 | 
			
		|||
 | 
			
		||||
#undef PRODUCT
 | 
			
		||||
#define PRODUCT         DrashnaDox - Hacked ErgoDox EZ Shine
 | 
			
		||||
 | 
			
		||||
#undef DEBOUNCE
 | 
			
		||||
#define DEBOUNCE 5
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
             KC_TAB,  _________________QWERTY_L1_________________, TG(_DIABLO),         TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS,
 | 
			
		||||
             KC_C1R3, _________________QWERTY_L2_________________,                                   _________________QWERTY_R2_________________, KC_QUOT,
 | 
			
		||||
             KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD),       TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_NO,
 | 
			
		||||
                                                    __________________ERGODOX_THUMB_CLUSTER_____________________
 | 
			
		||||
    ),
 | 
			
		||||
/* Keymap 0: COLEMAK layer
 | 
			
		||||
| 
						 | 
				
			
			@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
             KC_TAB,  _________________COLEMAK_L1________________, TG(_DIABLO),         TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
 | 
			
		||||
             KC_C1R3, _________________COLEMAK_L2________________,                                   _________________COLEMAK_R2________________, KC_QUOT,
 | 
			
		||||
             KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD),       TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_NO,
 | 
			
		||||
                                                    __________________ERGODOX_THUMB_CLUSTER_____________________
 | 
			
		||||
    ),
 | 
			
		||||
/* Keymap 0: DVORAK Layout
 | 
			
		||||
| 
						 | 
				
			
			@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
             KC_TAB,  _________________DVORAK_L1_________________, TG(_DIABLO),         TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
 | 
			
		||||
             KC_C1R3, _________________DVORAK_L2_________________,                                   _________________DVORAK_R2_________________, KC_MINS,
 | 
			
		||||
             KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD),       TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_NO,
 | 
			
		||||
                                                    __________________ERGODOX_THUMB_CLUSTER_____________________
 | 
			
		||||
    ),
 | 
			
		||||
/* Keymap 0: WORKMAN layer
 | 
			
		||||
| 
						 | 
				
			
			@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
             KC_TAB,  _________________WORKMAN_L1________________, TG(_DIABLO),         TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
 | 
			
		||||
             KC_C1R3, _________________WORKMAN_L2________________,                                   _________________WORKMAN_R2________________, KC_QUOT,
 | 
			
		||||
             KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD),       TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
 | 
			
		||||
             KC_GRV,  ___________ERGODOX_BOTTOM_LEFT_____________,                                   ___________ERGODOX_BOTTOM_RIGHT____________, KC_NO,
 | 
			
		||||
                                                    __________________ERGODOX_THUMB_CLUSTER_____________________
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -294,7 +294,7 @@ void matrix_init_keymap(void) { // Runs boot tasks for keyboard
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
void matrix_scan_keymap(void) {  // runs frequently to update info
 | 
			
		||||
  uint8_t modifiders = get_mods();
 | 
			
		||||
  uint8_t modifiers = get_mods();
 | 
			
		||||
  uint8_t led_usb_state = host_keyboard_leds();
 | 
			
		||||
  uint8_t one_shot = get_oneshot_mods();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -307,15 +307,15 @@ void matrix_scan_keymap(void) {  // runs frequently to update info
 | 
			
		|||
    // Since we're not using the LEDs here for layer indication anymore,
 | 
			
		||||
    // then lets use them for modifier indicators.  Shame we don't have 4...
 | 
			
		||||
    // Also, no "else", since we want to know each, independently.
 | 
			
		||||
    if (modifiders & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
 | 
			
		||||
    if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
 | 
			
		||||
      ergodox_right_led_2_on();
 | 
			
		||||
      ergodox_right_led_2_set( 50 );
 | 
			
		||||
    }
 | 
			
		||||
    if (modifiders & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) {
 | 
			
		||||
    if (modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) {
 | 
			
		||||
      ergodox_right_led_1_on();
 | 
			
		||||
      ergodox_right_led_1_set( 10 );
 | 
			
		||||
    }
 | 
			
		||||
    if (modifiders & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
 | 
			
		||||
    if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
 | 
			
		||||
      ergodox_right_led_3_on();
 | 
			
		||||
      ergodox_right_led_3_set( 10 );
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
TAP_DANCE_ENABLE  = yes
 | 
			
		||||
SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
 | 
			
		||||
COMMAND_ENABLE    = yes  # Commands for debug and configuration
 | 
			
		||||
ifeq ("$(KEYBOARD)","ergodox_ez")
 | 
			
		||||
ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
 | 
			
		||||
  RGBLIGHT_ENABLE = yes
 | 
			
		||||
  RGB_MATRIX_ENABLE = no
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			@ -12,7 +12,5 @@ UNICODE_ENABLE    = no
 | 
			
		|||
UNICDOEMAP_ENABLE = yes
 | 
			
		||||
 | 
			
		||||
MACROS_ENABLED    = no
 | 
			
		||||
RGBLIGHT_TWINKLE  = no
 | 
			
		||||
INDICATOR_LIGHTS  = no
 | 
			
		||||
ifdef RGBLIGHT_ENABLE
 | 
			
		||||
  RGBLIGHT_TWINKLE  = yes
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,6 +14,15 @@
 | 
			
		|||
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 | 
			
		||||
#endif // RGBLIGHT_ENABLE
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 | 
			
		||||
// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 | 
			
		||||
// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 | 
			
		||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
 | 
			
		||||
// #define RGB_MATRIX_SKIP_FRAMES 1 // number of frames to skip when displaying animations (0 is full effect) if not defined defaults to 1
 | 
			
		||||
// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 | 
			
		||||
// #define EECONFIG_RGB_MATRIX (uint32_t *)16
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(KEYBOARD_lets_split_rev2)
 | 
			
		||||
#define USE_SERIAL
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,86 +17,51 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "drashna.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifdef BACKLIGHT_ENABLE
 | 
			
		||||
enum planck_keycodes {
 | 
			
		||||
  BACKLIT = NEW_SAFE_RANGE,
 | 
			
		||||
};
 | 
			
		||||
#else
 | 
			
		||||
  #define BACKLIT OSM(MOD_LSFT)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
/* Qwerty
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_QWERTY] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC,
 | 
			
		||||
  KC_ESC,  _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT,
 | 
			
		||||
  KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT,
 | 
			
		||||
  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
  KC_ESC,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC,
 | 
			
		||||
  KC_TAB,  _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT,
 | 
			
		||||
  KC_MLSF, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT,
 | 
			
		||||
  BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
/* Colemak
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_COLEMAK] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSPC,
 | 
			
		||||
  KC_ESC,  _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_QUOT,
 | 
			
		||||
  KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, KC_ENT,
 | 
			
		||||
  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
  KC_ESC,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSPC,
 | 
			
		||||
  KC_TAB,  _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_QUOT,
 | 
			
		||||
  KC_MLSF, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, KC_ENT,
 | 
			
		||||
  BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
/* Dvorak
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_DVORAK] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  KC_TAB,  _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSPC,
 | 
			
		||||
  KC_ESC,  _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_SLSH,
 | 
			
		||||
  KC_LSFT, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, KC_ENT,
 | 
			
		||||
  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
  KC_ESC,  _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSPC,
 | 
			
		||||
  KC_TAB,  _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_SLSH,
 | 
			
		||||
  KC_MLSF, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, KC_ENT,
 | 
			
		||||
  BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
[_WORKMAN] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  KC_TAB,  _________________WORKMAN_L1________________, _________________WORKMAN_R1________________, KC_BSPC,
 | 
			
		||||
  KC_ESC,  _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, KC_QUOT,
 | 
			
		||||
  KC_LSFT, _________________WORKMAN_L3________________, _________________WORKMAN_R3________________, KC_ENT,
 | 
			
		||||
  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
  KC_MLSF, _________________WORKMAN_L3________________, _________________WORKMAN_R3________________, KC_ENT,
 | 
			
		||||
  BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
[_MODS] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
 | 
			
		||||
  _______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
 | 
			
		||||
  KC_LSFT, ___________________BLANK___________________, ___________________BLANK___________________, _______,
 | 
			
		||||
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
/* Lower
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_LOWER] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC,
 | 
			
		||||
  KC_DEL,  _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE,
 | 
			
		||||
| 
						 | 
				
			
			@ -104,39 +69,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
/* Raise
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_RAISE] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  KC_GRV,  _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_BSPC,
 | 
			
		||||
  KC_DEL,  _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
 | 
			
		||||
  _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
 | 
			
		||||
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
  _______, _______, _______, _______, _______, _______, _______, _________________RAISE_R3__________________
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
/* Adjust (Lower + Raise)
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * |      |      |      |      |      |             |      |      |      |      |      |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_ADJUST] = LAYOUT_ortho_4x12_wrapper(
 | 
			
		||||
  _______, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_DEL,
 | 
			
		||||
  _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, _______,
 | 
			
		||||
  _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, _______,
 | 
			
		||||
  KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
 | 
			
		||||
  VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EPRM,
 | 
			
		||||
  _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
 | 
			
		||||
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -147,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  switch (keycode) {
 | 
			
		||||
 | 
			
		||||
#ifdef KEYBOARD_planck
 | 
			
		||||
#ifdef BACKLIGHT_ENABLE
 | 
			
		||||
    case BACKLIT:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        register_code(KC_RSFT);
 | 
			
		||||
| 
						 | 
				
			
			@ -170,8 +113,86 @@ bool music_mask_user(uint16_t keycode) {
 | 
			
		|||
  switch (keycode) {
 | 
			
		||||
    case RAISE:
 | 
			
		||||
    case LOWER:
 | 
			
		||||
    case BK_LWER:
 | 
			
		||||
    case SP_LWER:
 | 
			
		||||
    case DL_RAIS:
 | 
			
		||||
    case ET_RAIS:
 | 
			
		||||
      return false;
 | 
			
		||||
    default:
 | 
			
		||||
      return true;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
 | 
			
		||||
  rgb_led led;
 | 
			
		||||
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
 | 
			
		||||
    led = g_rgb_leds[i];
 | 
			
		||||
    if (led.matrix_co.raw < 0xFF) {
 | 
			
		||||
      if (led.modifier) {
 | 
			
		||||
          rgb_matrix_set_color( i, red, green, blue );
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void rgb_matrix_indicators_user(void) {
 | 
			
		||||
  uint8_t this_mod = get_mods();
 | 
			
		||||
  uint8_t this_led = host_keyboard_leds();
 | 
			
		||||
  uint8_t this_osm = get_oneshot_mods();
 | 
			
		||||
 | 
			
		||||
  switch (biton32(layer_state)) {
 | 
			
		||||
    case _RAISE:
 | 
			
		||||
      rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
 | 
			
		||||
    case _LOWER:
 | 
			
		||||
      rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
 | 
			
		||||
    case _ADJUST:
 | 
			
		||||
      rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
 | 
			
		||||
    default:
 | 
			
		||||
      switch (biton32(default_layer_state)) {
 | 
			
		||||
        case _QWERTY:
 | 
			
		||||
          rgb_matrix_layer_helper(0x00, 0xFF, 0xFF, true); break;
 | 
			
		||||
        case _COLEMAK:
 | 
			
		||||
          rgb_matrix_layer_helper(0xFF, 0x00, 0xFF, true); break;
 | 
			
		||||
        case _DVORAK:
 | 
			
		||||
          rgb_matrix_layer_helper(0x00, 0xFF, 0x00, true); break;
 | 
			
		||||
        case _WORKMAN:
 | 
			
		||||
          rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, true); break;
 | 
			
		||||
      }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  switch (biton32(default_layer_state)) {
 | 
			
		||||
    case _QWERTY:
 | 
			
		||||
      rgb_matrix_set_color(42, 0x00, 0xFF, 0xFF); break;
 | 
			
		||||
    case _COLEMAK:
 | 
			
		||||
      rgb_matrix_set_color(42, 0xFF, 0x00, 0xFF); break;
 | 
			
		||||
    case _DVORAK:
 | 
			
		||||
      rgb_matrix_set_color(42, 0x00, 0xFF, 0x00); break;
 | 
			
		||||
    case _WORKMAN:
 | 
			
		||||
      rgb_matrix_set_color(42, 0xD9, 0xA5, 0x21); break;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  if (this_mod & MODS_SHIFT_MASK || this_led & (1<<USB_LED_CAPS_LOCK) || this_osm & MODS_SHIFT_MASK) {
 | 
			
		||||
    rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
 | 
			
		||||
    rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
 | 
			
		||||
  }
 | 
			
		||||
  if (this_mod & MODS_CTRL_MASK || this_osm & MODS_CTRL_MASK) {
 | 
			
		||||
    rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
 | 
			
		||||
    rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
 | 
			
		||||
    rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
  if (this_mod & MODS_GUI_MASK || this_osm & MODS_GUI_MASK) {
 | 
			
		||||
    rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
 | 
			
		||||
  }
 | 
			
		||||
  if (this_mod & MODS_ALT_MASK || this_osm & MODS_ALT_MASK) {
 | 
			
		||||
    rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void matrix_init_keymap(void) {
 | 
			
		||||
  rgblight_mode(RGB_MATRIX_MULTISPLASH);
 | 
			
		||||
}
 | 
			
		||||
#endif //RGB_MATRIX_INIT
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,9 +4,16 @@ EXTRAKEY_ENABLE   = yes       # Audio control and System control(+450)
 | 
			
		|||
CONSOLE_ENABLE    = no         # Console for debug(+400)
 | 
			
		||||
COMMAND_ENABLE    = no        # Commands for debug and configuration
 | 
			
		||||
TAP_DANCE_ENABLE  = no
 | 
			
		||||
RGBLIGHT_ENABLE   = yes
 | 
			
		||||
AUDIO_ENABLE      = yes
 | 
			
		||||
 | 
			
		||||
ifeq (,$(findstring planck/rev6,$(KEYBOARD)))
 | 
			
		||||
  RGBLIGHT_ENABLE   = yes
 | 
			
		||||
  INDICATOR_LIGHTS  = yes
 | 
			
		||||
  RGBLIGHT_TWINKLE  = yes
 | 
			
		||||
endif
 | 
			
		||||
ifneq (,$(findstring planck/light,$(KEYBOARD)))
 | 
			
		||||
  RGB_MATRIX_ENABLE   = yes
 | 
			
		||||
  RGBLIGHT_ENABLE     = no
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifeq ($(strip $(PROTOCOL)), VUSB)
 | 
			
		||||
NKRO_ENABLE       = no
 | 
			
		||||
| 
						 | 
				
			
			@ -15,6 +22,5 @@ NKRO_ENABLE       = yes
 | 
			
		|||
endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
INDICATOR_LIGHTS  = yes
 | 
			
		||||
MACROS_ENABLED    = no
 | 
			
		||||
RGBLIGHT_TWINKLE  = yes
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue