Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						52d6f07a82
					
				
					 14 changed files with 1247 additions and 0 deletions
				
			
		
							
								
								
									
										13
									
								
								keyboards/splitkb/kyria/keymaps/uqs/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								keyboards/splitkb/kyria/keymaps/uqs/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
// Copyright 2022 Ulrich Spörlein (@uqs)
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#ifdef RGBLIGHT_ENABLE
 | 
			
		||||
  //#define RGBLIGHT_ANIMATIONS
 | 
			
		||||
  #define RGBLIGHT_HUE_STEP 8
 | 
			
		||||
  #define RGBLIGHT_SAT_STEP 8
 | 
			
		||||
  #define RGBLIGHT_VAL_STEP 8
 | 
			
		||||
  #define RGBLIGHT_LIMIT_VAL 150
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define EE_HANDS
 | 
			
		||||
							
								
								
									
										158
									
								
								keyboards/splitkb/kyria/keymaps/uqs/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										158
									
								
								keyboards/splitkb/kyria/keymaps/uqs/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,158 @@
 | 
			
		|||
// Copyright 2022 Ulrich Spörlein (@uqs)
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
// vi:et sw=4 cc=5,15,25,35,45,55,65:
 | 
			
		||||
 | 
			
		||||
#include "uqs.h"
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * My custom layout macro that allows for easy diff(1) operations between
 | 
			
		||||
 * various keyboards. It probably doesn't make sense to you.
 | 
			
		||||
 */
 | 
			
		||||
#define LAYOUT_uqs(               \
 | 
			
		||||
    L00, L01, L02, L03, L04, L05, \
 | 
			
		||||
    L12, L13, L14, L15, L16, L17, \
 | 
			
		||||
    L24, L25, L26, L27, L28, L29, \
 | 
			
		||||
              L40, L41,           \
 | 
			
		||||
         L42, L43, L44,           \
 | 
			
		||||
         L30, L31,                \
 | 
			
		||||
    R06, R07, R08, R09, R10, R11, \
 | 
			
		||||
    R18, R19, R20, R21, R22, R23, \
 | 
			
		||||
    R34, R35, R36, R37, R38, R39, \
 | 
			
		||||
              R48, R49,           \
 | 
			
		||||
         R45, R46, R47,           \
 | 
			
		||||
         R32, R33                 \
 | 
			
		||||
)                                 \
 | 
			
		||||
LAYOUT_stack(                     \
 | 
			
		||||
    L00, L01, L02, L03, L04, L05,                   \
 | 
			
		||||
    L12, L13, L14, L15, L16, L17,                   \
 | 
			
		||||
    L24, L25, L26, L27, L28, L29, L30, L31,         \
 | 
			
		||||
                   L40, L41, L42, L43, L44,         \
 | 
			
		||||
                                                    \
 | 
			
		||||
                  R06, R07, R08, R09, R10, R11,     \
 | 
			
		||||
                  R18, R19, R20, R21, R22, R23,     \
 | 
			
		||||
        R32, R33, R34, R35, R36, R37, R38, R39,     \
 | 
			
		||||
        R45, R46, R47, R48, R49                     \
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
  [L_QWER] = LAYOUT_uqs(
 | 
			
		||||
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
 | 
			
		||||
     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
 | 
			
		||||
     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
 | 
			
		||||
                         KC_LBRC,  KC_RBRC,
 | 
			
		||||
     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
 | 
			
		||||
      /*aux*/  OSM_GUI,  KC_LALT,
 | 
			
		||||
     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
 | 
			
		||||
     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
 | 
			
		||||
     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
 | 
			
		||||
                         KC_MINS,  KC_EQL,
 | 
			
		||||
     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
 | 
			
		||||
      /*aux*/  KC_RALT,  KC_APP
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [L_WASD] = LAYOUT_uqs(
 | 
			
		||||
     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
 | 
			
		||||
     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
 | 
			
		||||
     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
 | 
			
		||||
                         KC_LBRC,  KC_RBRC,
 | 
			
		||||
     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
 | 
			
		||||
      /*aux*/  OSM_GUI,  KC_LALT,
 | 
			
		||||
     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
 | 
			
		||||
     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
 | 
			
		||||
     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
 | 
			
		||||
                         KC_MINS,  KC_EQL,
 | 
			
		||||
     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
 | 
			
		||||
      /*aux*/  KC_RALT,  KC_APP
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [L_COLM] = LAYOUT_uqs(
 | 
			
		||||
     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
 | 
			
		||||
     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
 | 
			
		||||
     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
 | 
			
		||||
                         MS_WHUP,  MS_WHDN,
 | 
			
		||||
     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
 | 
			
		||||
      /*aux*/  OSM_GUI,  KC_LALT,
 | 
			
		||||
     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
 | 
			
		||||
     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
 | 
			
		||||
     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
 | 
			
		||||
                         KC_NO,    KC_NO,
 | 
			
		||||
     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
 | 
			
		||||
      /*aux*/  KC_RALT,  KC_APP
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
 | 
			
		||||
  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
 | 
			
		||||
  [L_EXTD] = LAYOUT_uqs(
 | 
			
		||||
     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
 | 
			
		||||
     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
 | 
			
		||||
     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
 | 
			
		||||
                         _______,  _______,
 | 
			
		||||
     /*thumb*/ _______,  _______,  _______,
 | 
			
		||||
      /*aux*/  _______,  _______,
 | 
			
		||||
               /* ^^^^ can't be used */
 | 
			
		||||
     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
 | 
			
		||||
     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
 | 
			
		||||
     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
 | 
			
		||||
                         _______,  _______,
 | 
			
		||||
     /*thumb*/ _______,  _______,  KC_BSPC,
 | 
			
		||||
      /*aux*/  _______,  _______
 | 
			
		||||
               /* ^^^^ use these */
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
 | 
			
		||||
  // often ... probably better to add a combo?
 | 
			
		||||
  [L_NUM] = LAYOUT_uqs(
 | 
			
		||||
     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
 | 
			
		||||
     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
 | 
			
		||||
     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
 | 
			
		||||
                         KC_GRV,   KC_TILDE,
 | 
			
		||||
     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
 | 
			
		||||
      /*aux*/  _______,_______,
 | 
			
		||||
               /* ^^^^ use these */
 | 
			
		||||
 | 
			
		||||
     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
 | 
			
		||||
     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
 | 
			
		||||
     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
 | 
			
		||||
                         KC_0,     KC_KP_DOT,
 | 
			
		||||
     /*thumb*/ _______,  _______,  _______,
 | 
			
		||||
      /*aux*/  _______,  _______
 | 
			
		||||
               /* ^^^^ can't be used */
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [L_FUNC] = LAYOUT_uqs(
 | 
			
		||||
     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
 | 
			
		||||
     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
 | 
			
		||||
     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
 | 
			
		||||
                         KC_NO,    KC_NO,
 | 
			
		||||
     /*thumb*/ KC_NO,    KC_NO,    KC_NO,
 | 
			
		||||
      /*aux*/  _______,  _______,
 | 
			
		||||
               /* ^^^^ use these */
 | 
			
		||||
 | 
			
		||||
     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
 | 
			
		||||
     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
 | 
			
		||||
     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
 | 
			
		||||
                         KC_NO,    KC_NO,
 | 
			
		||||
     /*thumb*/ _______,  _______,  _______,
 | 
			
		||||
      /*aux*/  _______,  _______
 | 
			
		||||
               /* ^^^^ can't be used */
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [L_MOUSE] = LAYOUT_uqs(
 | 
			
		||||
     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
 | 
			
		||||
     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
 | 
			
		||||
     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
 | 
			
		||||
                         KC_NO,    KC_NO,
 | 
			
		||||
     /*thumb*/ _______,  _______,  _______,
 | 
			
		||||
      /*aux*/  _______,  _______,
 | 
			
		||||
               /* ^^^^ can't be used */
 | 
			
		||||
 | 
			
		||||
     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
 | 
			
		||||
     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
 | 
			
		||||
     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
 | 
			
		||||
                         KC_NO,    KC_NO,
 | 
			
		||||
     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
 | 
			
		||||
      /*aux*/  _______,  _______
 | 
			
		||||
               /* use these ^^^^ */
 | 
			
		||||
  ),
 | 
			
		||||
};
 | 
			
		||||
							
								
								
									
										1
									
								
								keyboards/splitkb/kyria/keymaps/uqs/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/splitkb/kyria/keymaps/uqs/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
OLED_ENABLE = no
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue