Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
fauxpark
commit
2c191e21c2
1875 changed files with 649 additions and 120281 deletions
|
|
@ -1,20 +0,0 @@
|
|||
/* Copyright 2019 Ethan Durrant (emdarcher)
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// place overrides here
|
||||
#define GRAVE_ESC_ALT_OVERRIDE
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
/* Copyright 2019 Ethan Durrant (emdarcher)
|
||||
*
|
||||
* 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 QMK_KEYBOARD_H
|
||||
|
||||
// Defines names for use in layer keycodes and the keymap
|
||||
enum layer_names {
|
||||
_BASE,
|
||||
_FN0,
|
||||
_FN1
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Base */
|
||||
[_BASE] = LAYOUT_60_hhkb(
|
||||
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
|
||||
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN0),
|
||||
KC_LALT, KC_LGUI, /* */ KC_SPC, MO(_FN1), KC_RALT
|
||||
),
|
||||
[_FN0] = LAYOUT_60_hhkb(
|
||||
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
|
||||
KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
|
||||
KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLD, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[_FN1] = LAYOUT_60_hhkb(
|
||||
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSPC,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
)
|
||||
};
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# emdarcher's keymap for lattice60
|
||||
|
||||
|
||||
|
||||
Modified function layer from the default HHKB functions, and added an extra layer for media controls.
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
/* Copyright 2019 Ethan Durrant (emdarcher)
|
||||
*
|
||||
* 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 QMK_KEYBOARD_H
|
||||
|
||||
typedef struct {
|
||||
bool is_press_action;
|
||||
int state;
|
||||
} tap;
|
||||
|
||||
//tap dance states
|
||||
enum {
|
||||
SINGLE_TAP = 1,
|
||||
SINGLE_HOLD = 2,
|
||||
DOUBLE_TAP = 3,
|
||||
TRIPLE_TAP = 4
|
||||
};
|
||||
|
||||
//tap dance keys
|
||||
enum {
|
||||
TAPPY_KEY = 0
|
||||
};
|
||||
|
||||
//function to handle all the tap dances
|
||||
int cur_dance(tap_dance_state_t *state);
|
||||
|
||||
//functions for each tap dance
|
||||
void tk_finished(tap_dance_state_t *state, void *user_data);
|
||||
void tk_reset(tap_dance_state_t *state, void *user_data);
|
||||
|
||||
#define INDICATOR_LED B5
|
||||
#define TX_LED D5
|
||||
#define RX_LED B0
|
||||
|
||||
#define _FN0 1
|
||||
#define _ML1 2
|
||||
#define _CL0 3
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(/* Base */
|
||||
TD(TAPPY_KEY),KC_HOME, KC_PGUP,
|
||||
KC_DEL, KC_END, KC_PGDN,
|
||||
|
||||
KC_UP,
|
||||
KC_LEFT, KC_DOWN, KC_RIGHT),
|
||||
[_FN0] = LAYOUT(/* function layer */
|
||||
KC_TRNS, KC_PAUS, KC_VOLU,
|
||||
KC_ENTER, KC_SCRL, KC_VOLD,
|
||||
|
||||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS),
|
||||
[_ML1] = LAYOUT(/* media function layer on double tap */
|
||||
KC_TRNS, KC_TRNS, KC_VOLU,
|
||||
KC_MUTE, KC_TRNS, KC_VOLD,
|
||||
|
||||
KC_SPC,
|
||||
KC_MRWD, KC_MPLY, KC_MFFD),
|
||||
[_CL0] = LAYOUT(/* control layer on single tap */
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
|
||||
LCTL(KC_UP),
|
||||
LCTL(KC_LEFT), LCTL(KC_DOWN), LCTL(KC_RIGHT) ),
|
||||
};
|
||||
|
||||
void matrix_init_user(void) {
|
||||
//init the Pro Micro on-board LEDs
|
||||
setPinOutput(TX_LED);
|
||||
setPinOutput(RX_LED);
|
||||
//set to off
|
||||
writePinHigh(TX_LED);
|
||||
writePinHigh(RX_LED);
|
||||
}
|
||||
|
||||
//determine the current tap dance state
|
||||
int cur_dance (tap_dance_state_t *state){
|
||||
if(state->count == 1){
|
||||
//if a tap was registered
|
||||
if(!state->pressed){
|
||||
//if not still pressed, then was a single tap
|
||||
return SINGLE_TAP;
|
||||
} else {
|
||||
//if still pressed/held down, then it's a single hold
|
||||
return SINGLE_HOLD;
|
||||
}
|
||||
} else if(state->count == 2){
|
||||
//if tapped twice, set to double tap
|
||||
return DOUBLE_TAP;
|
||||
} else if(state->count == 3){
|
||||
//if tapped thrice, set to triple tap
|
||||
return TRIPLE_TAP;
|
||||
} else {
|
||||
return 8;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//initialize the tap structure for the tap key
|
||||
static tap tk_tap_state = {
|
||||
.is_press_action = true,
|
||||
.state = 0
|
||||
};
|
||||
|
||||
//functions that control what our tap dance key does
|
||||
void tk_finished(tap_dance_state_t *state, void *user_data){
|
||||
tk_tap_state.state = cur_dance(state);
|
||||
switch(tk_tap_state.state){
|
||||
case SINGLE_TAP:
|
||||
//toggle desired layer when tapped:
|
||||
if(layer_state_is(_CL0)){
|
||||
//if already active, toggle it to off
|
||||
layer_off(_CL0);
|
||||
//turn off LEDs
|
||||
writePinHigh(TX_LED);
|
||||
writePinHigh(RX_LED);
|
||||
} else {
|
||||
//turn on the command layer
|
||||
layer_on(_CL0);
|
||||
//turn on the LEDs
|
||||
writePinLow(TX_LED);
|
||||
writePinLow(RX_LED);
|
||||
}
|
||||
break;
|
||||
case SINGLE_HOLD:
|
||||
//set to desired layer when held:
|
||||
//setting to the function layer
|
||||
layer_on(_FN0);
|
||||
break;
|
||||
case DOUBLE_TAP:
|
||||
//set to desired layer when double tapped:
|
||||
//setting to the media layer
|
||||
if(layer_state_is(_ML1)){
|
||||
//if already active, toggle it to off
|
||||
layer_off(_ML1);
|
||||
//turn off the indicator LED
|
||||
//set LED HI to turn it off
|
||||
writePinHigh(INDICATOR_LED);
|
||||
} else {
|
||||
//turn on the media layer
|
||||
layer_on(_ML1);
|
||||
//turn on the indicator LED
|
||||
//set LED pin to LOW to turn it on
|
||||
writePinLow(INDICATOR_LED);
|
||||
}
|
||||
break;
|
||||
case TRIPLE_TAP:
|
||||
//reset all layers
|
||||
layer_clear();
|
||||
//set all LEDs off
|
||||
writePinHigh(TX_LED);
|
||||
writePinHigh(RX_LED);
|
||||
writePinHigh(INDICATOR_LED);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void tk_reset(tap_dance_state_t *state, void *user_data){
|
||||
//if held and released, leave the layer
|
||||
if(tk_tap_state.state == SINGLE_HOLD){
|
||||
layer_off(_FN0);
|
||||
}
|
||||
//reset the state
|
||||
tk_tap_state.state = 0;
|
||||
}
|
||||
|
||||
|
||||
//associate the tap dance key with its functionality
|
||||
tap_dance_action_t tap_dance_actions[] = {
|
||||
[TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
|
||||
};
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# emdarcher's keymap for the Navi10
|
||||
|
||||
This is my personal keymap for the Navi10, developed for the original Rev0 prototype. It uses Tap Dance extensively on the INSERT key to access different layers.
|
||||
|
||||
- Base Layer:
|
||||
* Regular Navigation Cluster except for the INSERT key which is for tapping.
|
||||
- Hold Insert -> Function Layer:
|
||||
* Maps Volume Control on PgUp/PgDN, Pause/Scroll-Lock on Home/End (MacOS brightness), and Delete to Enter.
|
||||
- 2 Taps -> Media Layer:
|
||||
* Has mappings for Audio control on MacOS using the arrow keys, PgUp/PgDn, and Delete.
|
||||
* Lights up the Central 3mm indicator LED.
|
||||
- 1 Tap -> Control Layer:
|
||||
* Binds the arrow keys as LCTRL + Arrow Key for use in changing workspaces in MacOS.
|
||||
* Lights the Pro Micro TX/RX LEDs. These are visible through the board if you use clear PCB mount switch bases.
|
||||
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
TAP_DANCE_ENABLE = yes
|
||||
Loading…
Add table
Add a link
Reference in a new issue