Update sethBarberee Userspace (#12620)
* update for LTO and guard RGBLED_SPLIT * Revert "update for LTO and guard RGBLED_SPLIT" This reverts commit ce81177cbe330ae3e1e14c264dc0cb0946f08d70. * Revert "Revert "update for LTO and guard RGBLED_SPLIT"" This reverts commit 67da0ce9f38777064ad094c1ecba7ce17a40994f. * update iris keymap for keymap_kc removal and overhaul userspace * add licenses * fix tap_dance error when rgblight is disabled and update/clean iris/sinc maps
This commit is contained in:
		
							parent
							
								
									067a6f0174
								
							
						
					
					
						commit
						b7fe24923e
					
				
					 16 changed files with 609 additions and 229 deletions
				
			
		| 
						 | 
				
			
			@ -30,32 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#undef RGBLED_NUM
 | 
			
		||||
#define RGBLED_NUM 8
 | 
			
		||||
#define RGBLIGHT_ANIMATIONS
 | 
			
		||||
#define RGBLIGHT_SLEEP
 | 
			
		||||
#define RGBLIGHT_HUE_STEP 8
 | 
			
		||||
#define RGBLIGHT_SAT_STEP 8
 | 
			
		||||
#define RGBLIGHT_VAL_STEP 8
 | 
			
		||||
 | 
			
		||||
#undef RGBLED_SPLIT
 | 
			
		||||
#define RGBLED_SPLIT { RGBLED_NUM, 0} // defined to sync animations
 | 
			
		||||
 | 
			
		||||
#define FORCE_NKRO // force NKRO on by default
 | 
			
		||||
 | 
			
		||||
#undef TAPPING_TERM
 | 
			
		||||
#define TAPPING_TERM 200
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#if !defined(NO_DEBUG) && !defined(CONSOLE_ENABLE)
 | 
			
		||||
#define NO_DEBUG
 | 
			
		||||
#endif // !NO_DEBUG
 | 
			
		||||
#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
 | 
			
		||||
#define NO_PRINT
 | 
			
		||||
#endif // !NO_PRINT
 | 
			
		||||
 | 
			
		||||
#define NO_MUSIC_MODE
 | 
			
		||||
 | 
			
		||||
// Override caps lock indication from my userspace
 | 
			
		||||
//#undef NORMAL_MODE
 | 
			
		||||
//#define NORMAL_MODE 1
 | 
			
		||||
 | 
			
		||||
//#undef CAPS_LOCK_MODE
 | 
			
		||||
//#define CAPS_LOCK_MODE 28
 | 
			
		||||
#define RGBLED_SPLIT { RGBLED_NUM, 0}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,26 +1,24 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
 /* Copyright 2021 SethBarberee <seth.barberee@gmail.com>
 | 
			
		||||
  *
 | 
			
		||||
  * 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/>.
 | 
			
		||||
  */
 | 
			
		||||
#include "sethBarberee.h"
 | 
			
		||||
 | 
			
		||||
extern backlight_config_t backlight_config;
 | 
			
		||||
 | 
			
		||||
enum layers {
 | 
			
		||||
    _QWERTY,
 | 
			
		||||
    _LOWER,
 | 
			
		||||
    _RAISE,
 | 
			
		||||
    _ADJUST
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum custom_keycodes {
 | 
			
		||||
  QWERTY = SAFE_RANGE,
 | 
			
		||||
  LOWER,
 | 
			
		||||
  RAISE,
 | 
			
		||||
  ADJUST,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#define KC_ KC_TRNS
 | 
			
		||||
 | 
			
		||||
#define KC_LOWR LOWER
 | 
			
		||||
#define KC_RASE RAISE
 | 
			
		||||
#define KC_RST RESET
 | 
			
		||||
#define KC_BL_S BL_STEP
 | 
			
		||||
#define KC_RTOG RGB_TOG
 | 
			
		||||
| 
						 | 
				
			
			@ -33,147 +31,54 @@ enum custom_keycodes {
 | 
			
		|||
#define KC_RVAD RGB_VAD
 | 
			
		||||
#define KC_VK VLK_TOG
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
  [_QWERTY] = LAYOUT_kc(
 | 
			
		||||
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
 | 
			
		||||
     ECAP, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,DEL ,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
 | 
			
		||||
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
 | 
			
		||||
     LCTL, Z  , X  , C  , V  , B  , SPC,      RASE, N  , M  ,COMM,DOT ,SLSH,RSFT,
 | 
			
		||||
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
 | 
			
		||||
                       LGUI,LOWR, SPC,         BSPC ,ENT,LALT
 | 
			
		||||
  //                  `----+----+----'        `----+----+----'
 | 
			
		||||
  [_QWERTY] = LAYOUT_wrapper(
 | 
			
		||||
     KC_ECAP, ________________NUMBER_LEFT________________,                 ________________NUMBER_RIGHT_______________,      KC_MINS,
 | 
			
		||||
     KC_TAB , _________________QWERTY_L1_________________,                 _________________QWERTY_R1_________________,      KC_DEL ,
 | 
			
		||||
     KC_LSFT, _________________QWERTY_L2_________________,                 _________________QWERTY_R2_________________,
 | 
			
		||||
     KC_LCTL, _________________QWERTY_L3_________________, KC_SPC,         KC_RASE, _________________QWERTY_R3_________________,KC_RSFT,
 | 
			
		||||
                                        KC_LGUI, KC_LOWR, KC_SPC,           KC_BSPC , KC_ENT, KC_LALT
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [_LOWER] = LAYOUT_kc(
 | 
			
		||||
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
 | 
			
		||||
     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
     RST ,    ,    , UP ,    ,    ,               GRV , P7 , P8 , P9 ,    ,    ,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
     DEL ,    ,LEFT,DOWN,RGHT,LBRC,               RBRC, P4 , P5 , P6 ,PLUS,PIPE,
 | 
			
		||||
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
 | 
			
		||||
     BL_S,    ,    ,    ,    ,LCBR,LPRN,     RPRN,RCBR, P1 , P2 , P3 ,MINS,    ,
 | 
			
		||||
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
 | 
			
		||||
                           ,    ,LPRN ,         DEL ,    , P0
 | 
			
		||||
  //                  `----+----+----'        `----+----+----'
 | 
			
		||||
  [_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_RST ,_______,_______, KC_UP ,_______,_______,               KC_GRV , KC_P7 , KC_P8 , KC_P9 ,_______,_______,
 | 
			
		||||
     KC_DEL ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_LBRC,               KC_RBRC, KC_P4 , KC_P5 , KC_P6 ,KC_PLUS,KC_PIPE,
 | 
			
		||||
     KC_BL_S,_______,_______,_______,_______,KC_LCBR,KC_LPRN,       KC_RPRN,KC_RCBR, KC_P1 , KC_P2 , KC_P3 ,KC_MINS,_______,
 | 
			
		||||
                                        _______,_______,KC_LPRN,       KC_DEL ,_______, KC_P0
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [_RAISE] = LAYOUT_kc(
 | 
			
		||||
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
 | 
			
		||||
     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
         ,    ,    ,    ,    ,    ,                  ,     ,    ,    ,    ,    ,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
         ,MPRV,MNXT,VOLU,PGUP,UNDS,               EQL ,HOME,    ,    ,    ,BSLS,
 | 
			
		||||
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
 | 
			
		||||
     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,    ,         ,PLUS,END ,    ,    ,    ,    ,
 | 
			
		||||
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
 | 
			
		||||
                           ,    ,    ,             ,    ,
 | 
			
		||||
  //                  `----+----+----'        `----+----+----'
 | 
			
		||||
  [_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_MPRV,KC_MNXT,KC_VOLU,KC_PGUP,KC_UNDS,              KC_EQL ,KC_HOME,_______,_______,_______,KC_BSLS,
 | 
			
		||||
     KC_MUTE,KC_MSTP,KC_MPLY,KC_VOLD,KC_PGDN,KC_MINS,_______,      _______,KC_PLUS,KC_END ,_______,_______,_______,_______,
 | 
			
		||||
                                        _______,_______,_______,         _______,_______, _______
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [_ADJUST] = LAYOUT_kc(
 | 
			
		||||
  [_ADJUST] = LAYOUT(
 | 
			
		||||
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
 | 
			
		||||
         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
 | 
			
		||||
     _______,_______,_______,_______,_______,_______,               _______,_______,_______,_______,_______,_______,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
     RTOG,RMOD,RHUI,RSAI,RVAI,    ,                   ,    ,    ,    ,    ,    ,
 | 
			
		||||
     KC_RTOG,KC_RMOD,KC_RHUI,KC_RSAI,KC_RVAI,_______,               _______,_______,_______,_______,_______,_______,
 | 
			
		||||
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
 | 
			
		||||
     VK,      ,RHUD,RSAD,RVAD,    ,                   ,    ,    ,    ,    ,    ,
 | 
			
		||||
     KC_VK,  _______,KC_RHUD,KC_RSAD,KC_RVAD,_______,               _______,_______,_______,_______,_______,_______,
 | 
			
		||||
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
 | 
			
		||||
     BL_S,RST ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
 | 
			
		||||
     KC_BL_S,KC_RST ,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,_______,
 | 
			
		||||
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
 | 
			
		||||
                           ,    ,    ,             ,    ,
 | 
			
		||||
                       _______,_______,_______,         _______,_______, _______
 | 
			
		||||
  //                  `----+----+----'        `----+----+----'
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void keyboard_pre_init_user(void) {
 | 
			
		||||
    // Make sure the red LEDs don't light
 | 
			
		||||
    setPinOutput(D5);
 | 
			
		||||
    writePinHigh(D5);
 | 
			
		||||
 | 
			
		||||
    setPinOutput(B0);
 | 
			
		||||
    writePinHigh(B0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void keyboard_post_init_user(void){
 | 
			
		||||
    rgblight_enable_noeeprom(); // enable the RGBs
 | 
			
		||||
    rgblight_sethsv_noeeprom_red(); // set to red
 | 
			
		||||
    rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // set to breathing
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void suspend_power_down_user(void){
 | 
			
		||||
void suspend_power_down_keymap(void){
 | 
			
		||||
    backlight_config.enable = false; // disable LED backlight
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void suspend_wakeup_init_user(void){
 | 
			
		||||
void suspend_wakeup_init_keymap(void){
 | 
			
		||||
    backlight_config.enable = true; // enable LED backlight
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  switch (keycode) {
 | 
			
		||||
    case QWERTY:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        set_single_persistent_default_layer(_QWERTY);
 | 
			
		||||
      }
 | 
			
		||||
      return false;
 | 
			
		||||
      break;
 | 
			
		||||
    case LOWER:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        layer_on(_LOWER);
 | 
			
		||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
			
		||||
      } else {
 | 
			
		||||
        layer_off(_LOWER);
 | 
			
		||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
			
		||||
      }
 | 
			
		||||
      return false;
 | 
			
		||||
      break;
 | 
			
		||||
    case RAISE:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        layer_on(_RAISE);
 | 
			
		||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
			
		||||
      } else {
 | 
			
		||||
        layer_off(_RAISE);
 | 
			
		||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
			
		||||
      }
 | 
			
		||||
      return false;
 | 
			
		||||
      break;
 | 
			
		||||
    case ADJUST:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        layer_on(_ADJUST);
 | 
			
		||||
      } else {
 | 
			
		||||
        layer_off(_ADJUST);
 | 
			
		||||
      }
 | 
			
		||||
      return false;
 | 
			
		||||
      break;
 | 
			
		||||
  }
 | 
			
		||||
  return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint32_t layer_state_set_user(uint32_t state){
 | 
			
		||||
    switch(biton32(state)) {
 | 
			
		||||
      case _QWERTY:
 | 
			
		||||
        rgblight_sethsv_noeeprom(HSV_RED);
 | 
			
		||||
        break;
 | 
			
		||||
      case _LOWER:
 | 
			
		||||
        rgblight_sethsv_noeeprom(HSV_GREEN);
 | 
			
		||||
        break;
 | 
			
		||||
      case _RAISE:
 | 
			
		||||
        rgblight_sethsv_noeeprom(HSV_BLUE);
 | 
			
		||||
        break;
 | 
			
		||||
      case _ADJUST:
 | 
			
		||||
        rgblight_sethsv_noeeprom(HSV_ORANGE);
 | 
			
		||||
        break;
 | 
			
		||||
      default:
 | 
			
		||||
        rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
 | 
			
		||||
        break;
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
    return state;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,5 @@
 | 
			
		|||
BOOTMAGIC_ENABLE = no
 | 
			
		||||
CONSOLE_ENABLE = no
 | 
			
		||||
EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
 | 
			
		||||
NKRO_ENABLE = yes       # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
BACKLIGHT_ENABLE = yes  # Enable my Red LEDS
 | 
			
		||||
RGBLIGHT_ENABLE = yes  # Enable my RGBS
 | 
			
		||||
NKRO_ENABLE = yes
 | 
			
		||||
VELOCIKEY_ENABLE = yes # I like RGB
 | 
			
		||||
TAP_DANCE_ENABLE = yes # fancy fancy Caps
 | 
			
		||||
LTO_ENABLE = yes # Enable link time optimization
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue