Update to drashna keymaps and userspace (#2876)
* Fix Unicode sample * Add irony mark * Remove unpretty keymaps * Add QMK DFU and Conditional Music Mode * Unicode fixes * Unicode fixes * Make layer indication more modular * Finish removing Faux Click * Cleanup of UserSpace and addition of 'update_tri_layer_state' function * Add modifier status indicators to Orthodox * Remove tri layer function * Minor tweaks * Remove the Orthodox's Indicator's reliance on layer_state_set * Add custom EEPROM settings * Make EEPROM config more efficient * Viterbi Config * Add Iris Keyboard layout and Userspace cleanup * Iris keyboard tweaks * Use Grave Escape on Iris * Update Readmes
This commit is contained in:
		
							parent
							
								
									9b8fc6f1c0
								
							
						
					
					
						commit
						e5540dd055
					
				
					 16 changed files with 623 additions and 268 deletions
				
			
		
							
								
								
									
										59
									
								
								keyboards/iris/keymaps/drashna/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								keyboards/iris/keymaps/drashna/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,59 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2017 Danny Nguyen <danny@keeb.io>
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
(at your option) any later version.
 | 
			
		||||
 | 
			
		||||
This program is distributed in the hope that it will be useful,
 | 
			
		||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
You should have received a copy of the GNU General Public License
 | 
			
		||||
along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#ifndef CONFIG_USER_H
 | 
			
		||||
#define CONFIG_USER_H
 | 
			
		||||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
/* Use I2C or Serial, not both */
 | 
			
		||||
 | 
			
		||||
#define USE_SERIAL
 | 
			
		||||
#undef USE_I2C
 | 
			
		||||
 | 
			
		||||
/* Select hand configuration */
 | 
			
		||||
 | 
			
		||||
// #define MASTER_LEFT
 | 
			
		||||
// #define MASTER_RIGHT
 | 
			
		||||
#define EE_HANDS
 | 
			
		||||
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#undef RGBLED_NUM
 | 
			
		||||
#define RGBLED_NUM 16     // Number of LEDs
 | 
			
		||||
#define RGBLIGHT_ANIMATIONS
 | 
			
		||||
#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
 | 
			
		||||
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 | 
			
		||||
#endif // RGBLIGHT_ENABLE
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
#define C6_AUDIO
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
#define NO_MUSIC_MODE
 | 
			
		||||
#endif //RGBLIGHT_ENABLE
 | 
			
		||||
#endif //AUDIO_ENABLE
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#undef PRODUCT
 | 
			
		||||
#ifdef KEYBOARD_iris_rev2
 | 
			
		||||
#define PRODUCT         Drashna Hacked Iris Rev.2
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										141
									
								
								keyboards/iris/keymaps/drashna/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										141
									
								
								keyboards/iris/keymaps/drashna/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,141 @@
 | 
			
		|||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "drashna.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define KC_ALAP ALT_T(KC_APP)
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
  [_QWERTY] = LAYOUT_wrapper(
 | 
			
		||||
     KC_GESC, ________________NUMBER_LEFT________________,                       ________________NUMBER_RIGHT_______________, KC_MINS,
 | 
			
		||||
     KC_TAB , _________________QWERTY_L1_________________,                       _________________QWERTY_R1_________________, KC_BSLS,
 | 
			
		||||
     KC_C1R3, _________________QWERTY_L2_________________,                       _________________QWERTY_R2_________________, KC_QUOT,
 | 
			
		||||
     KC_MLSF, _________________QWERTY_L3_________________, KC_ALAP,     KC_LGUI, _________________QWERTY_R3_________________, KC_MRSF,
 | 
			
		||||
                                       LOWER,   KC_SPC,  KC_BSPC,         KC_DEL,  KC_ENT,  RAISE
 | 
			
		||||
  ),
 | 
			
		||||
  [_COLEMAK] = LAYOUT_wrapper(
 | 
			
		||||
     KC_GESC, ________________NUMBER_LEFT________________,                       ________________NUMBER_RIGHT_______________, KC_MINS,
 | 
			
		||||
     KC_TAB , _________________COLEMAK_L1________________,                       _________________COLEMAK_R1________________, KC_BSLS,
 | 
			
		||||
     KC_C1R3, _________________COLEMAK_L2________________,                       _________________COLEMAK_R2________________, KC_QUOT,
 | 
			
		||||
     KC_MLSF, _________________COLEMAK_L3________________, KC_ALAP,     KC_LGUI, _________________COLEMAK_R3________________, KC_MRSF,
 | 
			
		||||
                                       LOWER,   KC_SPC,  KC_BSPC,         KC_DEL,  KC_ENT,  RAISE
 | 
			
		||||
  ),
 | 
			
		||||
  [_DVORAK] = LAYOUT_wrapper(
 | 
			
		||||
     KC_GESC, ________________NUMBER_LEFT________________,                       ________________NUMBER_RIGHT_______________, KC_MINS,
 | 
			
		||||
     KC_TAB , _________________DVORAK_L1_________________,                       _________________DVORAK_R1_________________, KC_BSLS,
 | 
			
		||||
     KC_C1R3, _________________DVORAK_L2_________________,                       _________________DVORAK_R2_________________, KC_QUOT,
 | 
			
		||||
     KC_MLSF, _________________DVORAK_L3_________________, KC_ALAP,     KC_LGUI, _________________DVORAK_R3_________________, KC_MRSF,
 | 
			
		||||
                                       LOWER,   KC_SPC,  KC_BSPC,         KC_DEL,  KC_ENT,  RAISE
 | 
			
		||||
  ),
 | 
			
		||||
  [_WORKMAN] = LAYOUT_wrapper(
 | 
			
		||||
     KC_GESC, ________________NUMBER_LEFT________________,                       ________________NUMBER_RIGHT_______________, KC_MINS,
 | 
			
		||||
     KC_TAB , _________________WORKMAN_L1________________,                       _________________WORKMAN_R1________________, KC_BSLS,
 | 
			
		||||
     KC_C1R3, _________________WORKMAN_L2________________,                       _________________WORKMAN_R2________________, KC_QUOT,
 | 
			
		||||
     KC_MLSF, _________________WORKMAN_L3________________, KC_ALAP,     KC_LGUI, _________________WORKMAN_R3________________, KC_MRSF,
 | 
			
		||||
                                       LOWER,   KC_SPC,  KC_BSPC,         KC_DEL,  KC_ENT,  RAISE
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [_MODS] = LAYOUT(
 | 
			
		||||
     _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
     _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
     _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
     KC_LSFT, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
                                       _______, _______, _______,         _______, _______, _______
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  [_LOWER] = LAYOUT(
 | 
			
		||||
     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
 | 
			
		||||
     _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                         KC_RBRC, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
 | 
			
		||||
     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_LPRN,      KC_RPRN, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
 | 
			
		||||
                                       _______, _______, KC_DEL,          _______, _______, _______
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [_RAISE] = LAYOUT(
 | 
			
		||||
      KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,                        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
 | 
			
		||||
      _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
      _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_UNDS,                       KC_EQL , KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
 | 
			
		||||
      _______, _______, _______, _______, _______, _______, _______,     _______, KC_PLUS, KC_END, _______, _______, _______, _______,
 | 
			
		||||
                                        _______, _______, _______,         _______, _______, _______
 | 
			
		||||
   ),
 | 
			
		||||
 | 
			
		||||
  [_ADJUST] = LAYOUT(
 | 
			
		||||
      KC_MAKE, KC_RST,  EPRM,    _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                       _______, _______, _______, _______, _______, _______,
 | 
			
		||||
      RGB_SMOD,RGB_HUI, CK_TOGG, AU_ON,   AU_OFF,  AG_NORM,                       AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, TG(_MODS),
 | 
			
		||||
      KC_RGB_T,RGB_SMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,     _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY,
 | 
			
		||||
                                        _______, _______, _______,         _______, _______, _______
 | 
			
		||||
   )
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifdef INDICATOR_LIGHT
 | 
			
		||||
uint32_t layer_state_set_keymap (uint32_t state) {
 | 
			
		||||
  uint8_t modifiders = get_mods();
 | 
			
		||||
  uint8_t led_usb_state = host_keyboard_leds();
 | 
			
		||||
  uint8_t one_shot = get_oneshot_mods();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  if (modifiders & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
 | 
			
		||||
    rgblight_sethsv_at(0, 255, 255, 5);
 | 
			
		||||
    rgblight_sethsv_at(0, 255, 255, 10);
 | 
			
		||||
  }
 | 
			
		||||
  if (modifiders & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) {
 | 
			
		||||
    rgblight_sethsv_at(51, 255, 255, 6);
 | 
			
		||||
    rgblight_sethsv_at(51, 255, 255, 9);
 | 
			
		||||
  }
 | 
			
		||||
  if (modifiders & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
 | 
			
		||||
    rgblight_sethsv_at(120, 255, 255, 7);
 | 
			
		||||
    rgblight_sethsv_at(120, 255, 255, 8);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return state;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void matrix_scan_keymap (void) {
 | 
			
		||||
  static uint8_t current_mods;
 | 
			
		||||
  static uint8_t current_host_leds;
 | 
			
		||||
  static uint8_t current_oneshot_mods;
 | 
			
		||||
  static bool has_status_changed = true;
 | 
			
		||||
 | 
			
		||||
  if ( current_mods != get_mods() || current_host_leds != host_keyboard_leds() || current_oneshot_mods != get_oneshot_mods()) {
 | 
			
		||||
    has_status_changed = true;
 | 
			
		||||
    current_mods = get_mods();
 | 
			
		||||
    current_host_leds = host_keyboard_leds();
 | 
			
		||||
    current_oneshot_mods = get_oneshot_mods();
 | 
			
		||||
  }
 | 
			
		||||
  if (has_status_changed) {
 | 
			
		||||
    has_status_changed = false;
 | 
			
		||||
 | 
			
		||||
    if (current_mods & MODS_SHIFT_MASK || current_host_leds & (1<<USB_LED_CAPS_LOCK) || current_oneshot_mods & MODS_SHIFT_MASK) {
 | 
			
		||||
      rgblight_sethsv_at(0, 255, 255, 5);
 | 
			
		||||
      rgblight_sethsv_at(0, 255, 255, 10);
 | 
			
		||||
    } else {
 | 
			
		||||
      rgblight_sethsv_default_helper(5);
 | 
			
		||||
      rgblight_sethsv_default_helper(10);
 | 
			
		||||
    }
 | 
			
		||||
    if (current_mods & MODS_CTRL_MASK || current_oneshot_mods & MODS_CTRL_MASK) {
 | 
			
		||||
      rgblight_sethsv_at(51, 255, 255, 6);
 | 
			
		||||
      rgblight_sethsv_at(51, 255, 255, 9);
 | 
			
		||||
    } else {
 | 
			
		||||
      rgblight_sethsv_default_helper(6);
 | 
			
		||||
      rgblight_sethsv_default_helper(9);
 | 
			
		||||
    }
 | 
			
		||||
    if (current_mods & MODS_GUI_MASK || current_oneshot_mods & MODS_GUI_MASK) {
 | 
			
		||||
      rgblight_sethsv_at(120, 255, 255, 7);
 | 
			
		||||
      rgblight_sethsv_at(120, 255, 255, 8);
 | 
			
		||||
    } else {
 | 
			
		||||
      rgblight_sethsv_default_helper(7);
 | 
			
		||||
      rgblight_sethsv_default_helper(8);
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										11
									
								
								keyboards/iris/keymaps/drashna/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								keyboards/iris/keymaps/drashna/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,11 @@
 | 
			
		|||
BOOTMAGIC_ENABLE  = no       # Virtual DIP switch configuration(+1000)
 | 
			
		||||
MOUSEKEY_ENABLE   = no       # Mouse keys(+4700)
 | 
			
		||||
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
 | 
			
		||||
NKRO_ENABLE       = yes
 | 
			
		||||
BACKLIGHT_ENABLE = no
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue