Updates to Talljoe's Keymaps (#10115)
* Minor Tweak * Refactor spacebar defines. * Add TMO50 layout * Rename Atreus keymap. * Refactor Atreus for readability. * Eliminate tapdance quote and tweak maltroff. * Factor out tapdance. * Add some fancy combos and keys. * Remove combos for now because they cause pain. * WIP visualizer * Alternate method for reset * WIP2 visualizer * Layer text tweak. * Add made-up layout Nortron as a combination of Norman and Maltron. * Add backspace. * Add Talljoe keymap to Prime E. * Fix double-colon so it doesn't press enter if shift is released early. * Use new make command. * Bring some modern standards into code and add licenses. * Remove QMK_KEYBOARD_CONFIG_H and fixup QMK_KEYBOARD_H. * Move from `biton32` to `get_highest_layer`. * Remove PREVENT_STUCK_MODIFIERS * Update keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
This commit is contained in:
		
							parent
							
								
									b5ebdf1b3a
								
							
						
					
					
						commit
						7ce5402417
					
				
					 34 changed files with 875 additions and 318 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,24 @@
 | 
			
		|||
#ifndef USERSPACE
 | 
			
		||||
#define USERSPACE
 | 
			
		||||
/* Copyright 2020 Joseph Wasson
 | 
			
		||||
 *
 | 
			
		||||
 * 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 "quantum.h"
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "tapdance/tapdance.h"
 | 
			
		||||
#include "macros.h"
 | 
			
		||||
 | 
			
		||||
enum userspace_custom_keycodes {
 | 
			
		||||
  KC_MAKE = SAFE_RANGE, // can always be here
 | 
			
		||||
| 
						 | 
				
			
			@ -22,6 +39,7 @@ enum layers {
 | 
			
		|||
    _DVORAK,
 | 
			
		||||
    _COLMAK,
 | 
			
		||||
    _MALTROFF,
 | 
			
		||||
    _NORTRON,
 | 
			
		||||
    _GAME,
 | 
			
		||||
    _NAV,
 | 
			
		||||
    _NUM,
 | 
			
		||||
| 
						 | 
				
			
			@ -29,14 +47,12 @@ enum layers {
 | 
			
		|||
    _RESET = RESET_LAYER,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum tap_dancers {
 | 
			
		||||
  TD_SEMICOLON,
 | 
			
		||||
  TD_GRAVE,
 | 
			
		||||
  TD_QUOTE,
 | 
			
		||||
};
 | 
			
		||||
#ifdef VISUALIZER_ENABLE
 | 
			
		||||
  extern const char layer_names[][16];
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define MO_NAV    MO(_NAV)
 | 
			
		||||
#define MO_ADJ    MO(_ADJUST)
 | 
			
		||||
#define MO_ADJ    TD(TD_FUNCTION)
 | 
			
		||||
#define MO_RST    MO(_RESET)
 | 
			
		||||
#define TG_ADJ    TG(_ADJUST)
 | 
			
		||||
#define TG_NUM    TG(_NUM)
 | 
			
		||||
| 
						 | 
				
			
			@ -52,8 +68,10 @@ enum tap_dancers {
 | 
			
		|||
#define LY_CLMK   DF(_COLMAK)
 | 
			
		||||
#if SPACE_COUNT >= 2
 | 
			
		||||
  #define LY_MALT DF(_MALTROFF)
 | 
			
		||||
  #define LY_NTRN DF(_NORTRON)
 | 
			
		||||
#else
 | 
			
		||||
  #define LY_MALT KC_NO
 | 
			
		||||
  #define LY_NTRN KC_NO
 | 
			
		||||
#endif
 | 
			
		||||
#define TG_NKRO   MAGIC_TOGGLE_NKRO
 | 
			
		||||
#define KC_PTT    KC_F24
 | 
			
		||||
| 
						 | 
				
			
			@ -66,60 +84,28 @@ enum tap_dancers {
 | 
			
		|||
#define US_BSLS   LCA_T(KC_BSLS)
 | 
			
		||||
#define US_SCLN   TD(TD_SEMICOLON)
 | 
			
		||||
#define US_GRV    TD(TD_GRAVE)
 | 
			
		||||
#define US_QUOT   TD(TD_QUOTE)
 | 
			
		||||
#define US_TAB    C_S_T(KC_TAB)
 | 
			
		||||
#define SH_LBRC   LSFT_T(KC_LBRC)
 | 
			
		||||
#define SH_RBRC   RSFT_T(KC_RBRC)
 | 
			
		||||
#define US_LOCK   TD(TD_LOCK)
 | 
			
		||||
 | 
			
		||||
#define MLT_E     LT(_NUM, KC_E)
 | 
			
		||||
 | 
			
		||||
#ifndef SPACE_COUNT
 | 
			
		||||
  #define SPACE_COUNT 1
 | 
			
		||||
#ifndef SWAP_HANDS_ENABLE
 | 
			
		||||
#define SH_T
 | 
			
		||||
#endif
 | 
			
		||||
#if (SPACE_COUNT == 1)
 | 
			
		||||
  #define KC_SPC1   LT(_NAV, KC_SPC)
 | 
			
		||||
  #define KC_SPC2   XXXXXXX
 | 
			
		||||
  #define KC_SPC3   XXXXXXX
 | 
			
		||||
 | 
			
		||||
  #define NV_SPC1   _______
 | 
			
		||||
  #define NV_SPC2   _______
 | 
			
		||||
  #define NV_SPC3   _______
 | 
			
		||||
#define KC_SPC1   LT(_NAV,KC_SPC)
 | 
			
		||||
#define KC_SPC2   LT(_NUM,KC_ENT)
 | 
			
		||||
#define KC_SPC3   SH_T(KC_BSPC)
 | 
			
		||||
 | 
			
		||||
  #define NM_SPC1   _______
 | 
			
		||||
  #define NM_SPC2   _______
 | 
			
		||||
  #define NM_SPC3   _______
 | 
			
		||||
#elif (SPACE_COUNT == 2)
 | 
			
		||||
  #define KC_SPC1   LT(_NAV,KC_SPC)
 | 
			
		||||
  #define KC_SPC2   LT(_NUM,KC_ENT)
 | 
			
		||||
#define NV_SPC1   KC_SPC
 | 
			
		||||
#define NV_SPC2   KC_ENT
 | 
			
		||||
#define NV_SPC3   KC_SPC
 | 
			
		||||
 | 
			
		||||
  #define NV_SPC1   KC_SPC
 | 
			
		||||
  #define NV_SPC2   KC_ENT
 | 
			
		||||
 | 
			
		||||
  #define NM_SPC1   KC_0
 | 
			
		||||
  #define NM_SPC2   KC_SPC
 | 
			
		||||
 | 
			
		||||
  #define KC_SPC3   XXXXXXX
 | 
			
		||||
  #define NV_SPC3   XXXXXXX
 | 
			
		||||
  #define NM_SPC3   XXXXXXX
 | 
			
		||||
#elif (SPACE_COUNT == 3)
 | 
			
		||||
  #ifdef SWAP_HANDS_ENABLE
 | 
			
		||||
    #define KC_SPC1 SH_T(KC_BSPC)
 | 
			
		||||
  #else
 | 
			
		||||
    #define KC_SPC1 KC_BSPC
 | 
			
		||||
  #endif
 | 
			
		||||
  #define KC_SPC2   LT(_NUM,KC_ENT)
 | 
			
		||||
  #define KC_SPC3   LT(_NAV,KC_SPC)
 | 
			
		||||
 | 
			
		||||
  #define NV_SPC1   KC_SPC
 | 
			
		||||
  #define NV_SPC2   KC_ENT
 | 
			
		||||
  #define NV_SPC3   KC_SPC
 | 
			
		||||
 | 
			
		||||
  #define NM_SPC1   KC_SPC
 | 
			
		||||
  #define NM_SPC2   XXXXXXX
 | 
			
		||||
  #define NM_SPC3   KC_0
 | 
			
		||||
#else
 | 
			
		||||
  #error "Unsupported space count:" SPACE_COUNT
 | 
			
		||||
#endif
 | 
			
		||||
#define NM_SPC1   KC_0
 | 
			
		||||
#define NM_SPC2   XXXXXXX
 | 
			
		||||
#define NM_SPC3   KC_SPC
 | 
			
		||||
 | 
			
		||||
#ifndef ZEAL_RGB
 | 
			
		||||
  #define BR_INC KC_NO
 | 
			
		||||
| 
						 | 
				
			
			@ -195,5 +181,3 @@ enum tap_dancers {
 | 
			
		|||
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,           \
 | 
			
		||||
      RESET  , XXXXXXX, XXXXXXX,                   XXXXXXX, RESET  , XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue