Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
09e5885e45
12 changed files with 368 additions and 9 deletions
8
Makefile
8
Makefile
|
@ -19,6 +19,11 @@ endif
|
||||||
# Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
|
# Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
|
||||||
override SILENT := false
|
override SILENT := false
|
||||||
|
|
||||||
|
QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
|
||||||
|
ifneq ($(QMK_VERSION),)
|
||||||
|
$(info QMK Firmware v$(QMK_VERSION))
|
||||||
|
endif
|
||||||
|
|
||||||
ON_ERROR := error_occurred=1
|
ON_ERROR := error_occurred=1
|
||||||
|
|
||||||
BREAK_ON_ERRORS = no
|
BREAK_ON_ERRORS = no
|
||||||
|
@ -390,7 +395,6 @@ endef
|
||||||
define BUILD
|
define BUILD
|
||||||
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
|
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
|
||||||
COMMANDS += $$(COMMAND)
|
COMMANDS += $$(COMMAND)
|
||||||
MAKE_MSG = QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$(MAKE_MSG)
|
|
||||||
COMMAND_true_$$(COMMAND) := \
|
COMMAND_true_$$(COMMAND) := \
|
||||||
printf "$$(MAKE_MSG)" | \
|
printf "$$(MAKE_MSG)" | \
|
||||||
$$(MAKE_MSG_FORMAT); \
|
$$(MAKE_MSG_FORMAT); \
|
||||||
|
@ -421,7 +425,7 @@ define BUILD_TEST
|
||||||
COMMAND := $1
|
COMMAND := $1
|
||||||
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
|
||||||
MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)"
|
MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)"
|
||||||
MAKE_MSG := QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$$(MSG_MAKE_TEST)
|
MAKE_MSG := $$(MSG_MAKE_TEST)
|
||||||
$$(eval $$(call BUILD))
|
$$(eval $$(call BUILD))
|
||||||
ifneq ($$(MAKE_TARGET),clean)
|
ifneq ($$(MAKE_TARGET),clean)
|
||||||
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
|
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
|
||||||
|
|
|
@ -116,7 +116,9 @@ https://github.com/tekezo/Karabiner/issues/403
|
||||||
|
|
||||||
## Esc and `~ on a key
|
## Esc and `~ on a key
|
||||||
|
|
||||||
Use `GRAVE_ESC` or `KC_GESC` in your keymap.
|
Use `GRAVE_ESC` or `KC_GESC` in your keymap. `GUI`+`GRAVE_ESC` results in `\`` and `SHIFT`+`GRAVE_ESC` results in `~`.
|
||||||
|
|
||||||
|
Note that this will break the CTRL+SHIFT+ESC shortcut to the Windows task manager. Use `#define GRAVE_ESC_CTRL_OVERRIDE` in your `config.h` to get the shortcut back. With this option, `ESC_GRAVE` results in `ESC` if `CTRL` is held, even if `SHIFT` or `GUI` are also held.
|
||||||
|
|
||||||
## Arrow on Right Modifier keys with Dual-Role
|
## Arrow on Right Modifier keys with Dual-Role
|
||||||
This turns right modifer keys into arrow keys when the keys are tapped while still modifiers when the keys are hold. In TMK the dual-role function is dubbed **TAP**.
|
This turns right modifer keys into arrow keys when the keys are tapped while still modifiers when the keys are hold. In TMK the dual-role function is dubbed **TAP**.
|
||||||
|
|
|
@ -20,5 +20,6 @@
|
||||||
#include "../../config.h"
|
#include "../../config.h"
|
||||||
|
|
||||||
// place overrides here
|
// place overrides here
|
||||||
|
#define GRAVE_ESC_CTRL_OVERRIDE
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
31
keyboards/lets_split/keymaps/piemod/README.md
Normal file
31
keyboards/lets_split/keymaps/piemod/README.md
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
PieMod
|
||||||
|
======
|
||||||
|
|
||||||
|
A keymap for users that need:
|
||||||
|
|
||||||
|
- *P*: Programming symbols.
|
||||||
|
|
||||||
|
- *I*: i3wm.
|
||||||
|
|
||||||
|
- *E*: Emacs.
|
||||||
|
|
||||||
|
- *M*: Macros.
|
||||||
|
|
||||||
|
- *O*: Ortholinear.
|
||||||
|
|
||||||
|
- *D*: Dvorak.
|
||||||
|
|
||||||
|
Still a work-in-progress. Suggestions welcome @ https://github.com/dwrz/piemod.
|
||||||
|
|
||||||
|
### Keymap
|
||||||
|
|
||||||
|
![PieMod Keymap](./keymap.png)
|
||||||
|
|
||||||
|
### TODO
|
||||||
|
|
||||||
|
- [ ] Add Emacs layer.
|
||||||
|
- [ ] Add Macro layer.
|
||||||
|
- [ ] Add system control keys (rotation, brightness).
|
||||||
|
- [ ] Switch " and ' quotes (or function to toggle default).
|
||||||
|
- [ ] Add capslock.
|
||||||
|
.
|
37
keyboards/lets_split/keymaps/piemod/config.h
Normal file
37
keyboards/lets_split/keymaps/piemod/config.h
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
This is the c configuration file for the keymap
|
||||||
|
|
||||||
|
Copyright 2012 Jun Wako <wakojun@gmail.com>
|
||||||
|
Copyright 2015 Jack Humbert
|
||||||
|
|
||||||
|
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.h"
|
||||||
|
|
||||||
|
/* Use I2C or Serial, not both */
|
||||||
|
|
||||||
|
#define USE_SERIAL
|
||||||
|
// #define USE_I2C
|
||||||
|
|
||||||
|
/* Select hand configuration */
|
||||||
|
|
||||||
|
#define MASTER_LEFT
|
||||||
|
// #define _MASTER_RIGHT
|
||||||
|
// #define EE_HANDS
|
||||||
|
|
||||||
|
#endif
|
121
keyboards/lets_split/keymaps/piemod/keymap.c
Normal file
121
keyboards/lets_split/keymaps/piemod/keymap.c
Normal file
|
@ -0,0 +1,121 @@
|
||||||
|
#include "lets_split.h"
|
||||||
|
#include "action_layer.h"
|
||||||
|
#include "eeconfig.h"
|
||||||
|
|
||||||
|
extern keymap_config_t keymap_config;
|
||||||
|
|
||||||
|
#define _DVORAK 0
|
||||||
|
#define _ARROW 1 //F(1)
|
||||||
|
#define _SYMBOL 2 // F(2)
|
||||||
|
#define _NUMBER 3 // F(3)
|
||||||
|
#define _FUNCTION 4 // F(4)
|
||||||
|
#define _EMACS 5 // F(5)
|
||||||
|
#define _MACROS 6 // F(6)
|
||||||
|
#define _MOUSE 7 // F(7)
|
||||||
|
|
||||||
|
enum custom_keycodes {
|
||||||
|
DVORAK = SAFE_RANGE,
|
||||||
|
ARROW,
|
||||||
|
SYMBOL,
|
||||||
|
NUMBER,
|
||||||
|
FUNCTION,
|
||||||
|
EMACS,
|
||||||
|
MACROS,
|
||||||
|
MOUSE,
|
||||||
|
};
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
|
[_DVORAK] = KEYMAP( \
|
||||||
|
KC_ESC, KC_QUOTE, F(7), KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DELETE, \
|
||||||
|
KC_TAB, F(1), F(2), F(3), F(4), KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER, \
|
||||||
|
KC_LSHIFT, KC_SCOLON, F(5), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_MINUS, \
|
||||||
|
F(10), F(6), KC_MENU, KC_LALT, KC_LGUI, KC_BSPACE, KC_SPACE, KC_RCTRL, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_ARROW] = KEYMAP( \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_END, KC_PGUP, \
|
||||||
|
KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_SYMBOL] = KEYMAP( \
|
||||||
|
KC_TILD, KC_GRAVE, KC_NO, KC_EQUAL, KC_PLUS, KC_NO, KC_LBRACKET, KC_RBRACKET, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \
|
||||||
|
KC_NO, KC_NO, KC_TRNS, KC_SCOLON, KC_COLN, KC_NO, KC_LCBR, KC_RCBR, KC_DLR, KC_PERC, KC_CIRC, F(21), \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLASH, KC_SLASH, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ASTR, KC_SLASH, KC_MINUS, KC_PLUS, KC_EQUAL \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_NUMBER] = KEYMAP( \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_4, KC_5, KC_6, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_0, KC_1, KC_2, KC_3, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ASTR, KC_SLASH, KC_MINUS, KC_PLUS, KC_EQUAL \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_FUNCTION] = KEYMAP( \
|
||||||
|
KC_PSCREEN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE, \
|
||||||
|
RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DELETE, KC_INSERT, KC_HOME, KC_PGDN, KC_PGUP, KC_END \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_EMACS] = KEYMAP( \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_MACROS] = KEYMAP( \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \
|
||||||
|
),
|
||||||
|
|
||||||
|
[_MOUSE] = KEYMAP( \
|
||||||
|
KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
||||||
|
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, KC_NO, KC_NO, KC_NO \
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
enum function_id {
|
||||||
|
TEENSY_KEY,
|
||||||
|
CUSTOM_KEY,
|
||||||
|
L_CTRL_ALT_ENT,
|
||||||
|
R_CTRL_ALT_ENT,
|
||||||
|
};
|
||||||
|
|
||||||
|
int CAPSLOCKED = 0;
|
||||||
|
|
||||||
|
const uint16_t PROGMEM fn_actions[] = {
|
||||||
|
|
||||||
|
// DVORAK 0
|
||||||
|
// ARROW 1, F(1)
|
||||||
|
// SYMBOL 2, F(2)
|
||||||
|
// NUMBER 3, F(3)
|
||||||
|
// FUNCTION 4, F(4)
|
||||||
|
// EMACS 5, F(5)
|
||||||
|
// MACROS 6, F(6)
|
||||||
|
// MOUSE 7, F(7)
|
||||||
|
|
||||||
|
// Layers
|
||||||
|
[1] = ACTION_LAYER_TAP_KEY(1, KC_A), // FN1 = Momentary Arrow layer on A.
|
||||||
|
[2] = ACTION_LAYER_TAP_KEY(2, KC_O), // FN2 = Momentary symbOl layer on O.
|
||||||
|
[3] = ACTION_LAYER_TAP_KEY(3, KC_E), // FN3 = Momentary numbEr layer on E.
|
||||||
|
[4] = ACTION_LAYER_TAP_KEY(4, KC_U), // FN4 = Momentary fUnction layer on U.
|
||||||
|
[5] = ACTION_LAYER_TAP_KEY(5, KC_Q), // FN5 = Momentary emaQs layer on Q.
|
||||||
|
[6] = ACTION_LAYER_TAP_KEY(6, KC_LCTRL), // FN6 = Momentary MACROS on ??? key.
|
||||||
|
[7] = ACTION_LAYER_TAP_KEY(7, KC_COMMA), // FN7 = Momentary MOUSE on , key.
|
||||||
|
|
||||||
|
// Special Keys
|
||||||
|
[10] = ACTION_MODS_KEY(KC_LCTRL, KC_LALT), // FN10 = Ctrl + Alt.
|
||||||
|
|
||||||
|
// Symbols
|
||||||
|
[21] = ACTION_MODS_KEY(MOD_LSFT, KC_SLASH), // FN21 = Question mark.
|
||||||
|
|
||||||
|
};
|
10
keyboards/planck/keymaps/piemod/Makefile
Executable file
10
keyboards/planck/keymaps/piemod/Makefile
Executable file
|
@ -0,0 +1,10 @@
|
||||||
|
SUBPROJECT_DEFAULT = rev4
|
||||||
|
|
||||||
|
MOUSEKEY_ENABLE = yes
|
||||||
|
BLUETOOTH_ENABLE = yes
|
||||||
|
EXTRAKEY_ENABLE = yes
|
||||||
|
AUDIO_ENABLE = yes
|
||||||
|
|
||||||
|
ifndef QUANTUM_DIR
|
||||||
|
include ../../../../Makefile
|
||||||
|
endif
|
31
keyboards/planck/keymaps/piemod/README.md
Normal file
31
keyboards/planck/keymaps/piemod/README.md
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
PieMod
|
||||||
|
======
|
||||||
|
|
||||||
|
A keymap for users that need:
|
||||||
|
|
||||||
|
- *P*: Programming symbols.
|
||||||
|
|
||||||
|
- *I*: i3wm.
|
||||||
|
|
||||||
|
- *E*: Emacs.
|
||||||
|
|
||||||
|
- *M*: Macros.
|
||||||
|
|
||||||
|
- *O*: Ortholinear.
|
||||||
|
|
||||||
|
- *D*: Dvorak.
|
||||||
|
|
||||||
|
Still a work-in-progress. Suggestions welcome @ https://github.com/dwrz/piemod.
|
||||||
|
|
||||||
|
### Keymap
|
||||||
|
|
||||||
|
![PieMod Keymap](./keymap.png)
|
||||||
|
|
||||||
|
### TODO
|
||||||
|
|
||||||
|
- [ ] Add Emacs layer.
|
||||||
|
- [ ] Add Macro layer.
|
||||||
|
- [ ] Add system control keys (rotation, brightness).
|
||||||
|
- [ ] Switch " and ' quotes (or function to toggle default).
|
||||||
|
- [ ] Add capslock.
|
||||||
|
.
|
111
keyboards/planck/keymaps/piemod/keymap.c
Normal file
111
keyboards/planck/keymaps/piemod/keymap.c
Normal file
|
@ -0,0 +1,111 @@
|
||||||
|
#include "planck.h"
|
||||||
|
#include "action_layer.h"
|
||||||
|
#ifdef AUDIO_ENABLE
|
||||||
|
#include "audio.h"
|
||||||
|
#endif
|
||||||
|
#include "eeconfig.h"
|
||||||
|
|
||||||
|
#define DVORAK 0
|
||||||
|
#define ARROW 1 //F(1)
|
||||||
|
#define SYMBOL 2 // F(2)
|
||||||
|
#define NUMBER 3 // F(3)
|
||||||
|
#define FUNCTION 4 // F(4)
|
||||||
|
#define EMACS 5 // F(5)
|
||||||
|
#define CUSTOM_MACROS 6 // F(6)
|
||||||
|
#define MOUSE 7 // F(7)
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[DVORAK] = {
|
||||||
|
{KC_ESC, KC_QUOTE, F(7), KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DELETE},
|
||||||
|
{KC_TAB, F(1), F(2), F(3), F(4), KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENTER},
|
||||||
|
{KC_LSHIFT, KC_SCOLON, F(5), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_MINUS},
|
||||||
|
{F(10), F(6), KC_MENU, KC_LALT, KC_LGUI, KC_BSPACE, KC_SPACE, KC_RCTRL, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT},
|
||||||
|
},
|
||||||
|
|
||||||
|
[ARROW] = {
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_END, KC_PGUP},
|
||||||
|
{KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}
|
||||||
|
},
|
||||||
|
|
||||||
|
[SYMBOL] = {
|
||||||
|
{KC_TILD, KC_GRAVE, KC_NO, KC_EQUAL, KC_PLUS, KC_NO, KC_LBRACKET, KC_RBRACKET, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN},
|
||||||
|
{KC_NO, KC_NO, KC_TRNS, KC_SCOLON, KC_COLN, KC_NO, KC_LCBR, KC_RCBR, KC_DLR, KC_PERC, KC_CIRC, F(21)},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLASH, KC_SLASH, KC_EXLM, KC_AT, KC_HASH, KC_PIPE},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ASTR, KC_SLASH, KC_MINUS, KC_PLUS, KC_EQUAL}
|
||||||
|
},
|
||||||
|
|
||||||
|
[NUMBER] = {
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_4, KC_5, KC_6, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_0, KC_1, KC_2, KC_3, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ASTR, KC_SLASH, KC_MINUS, KC_PLUS, KC_EQUAL}
|
||||||
|
},
|
||||||
|
|
||||||
|
[FUNCTION] = {
|
||||||
|
{KC_PSCREEN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE},
|
||||||
|
{RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DELETE, KC_INSERT, KC_HOME, KC_PGDN, KC_PGUP, KC_END}
|
||||||
|
},
|
||||||
|
|
||||||
|
[EMACS] = {
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}
|
||||||
|
},
|
||||||
|
|
||||||
|
[CUSTOM_MACROS] = {
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}
|
||||||
|
},
|
||||||
|
|
||||||
|
[MOUSE] = {
|
||||||
|
{KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
|
||||||
|
{KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, KC_NO, KC_NO, KC_NO}
|
||||||
|
},
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
enum function_id {
|
||||||
|
TEENSY_KEY,
|
||||||
|
CUSTOM_KEY,
|
||||||
|
L_CTRL_ALT_ENT,
|
||||||
|
R_CTRL_ALT_ENT,
|
||||||
|
};
|
||||||
|
|
||||||
|
int CAPSLOCKED = 0;
|
||||||
|
|
||||||
|
const uint16_t PROGMEM fn_actions[] = {
|
||||||
|
|
||||||
|
// DVORAK 0
|
||||||
|
// ARROW 1, F(1)
|
||||||
|
// SYMBOL 2, F(2)
|
||||||
|
// NUMBER 3, F(3)
|
||||||
|
// FUNCTION 4, F(4)
|
||||||
|
// EMACS 5, F(5)
|
||||||
|
// MACROS 6, F(6)
|
||||||
|
// MOUSE 7, F(7)
|
||||||
|
|
||||||
|
// Layers
|
||||||
|
[1] = ACTION_LAYER_TAP_KEY(1, KC_A), // FN1 = Momentary Arrow layer on A.
|
||||||
|
[2] = ACTION_LAYER_TAP_KEY(2, KC_O), // FN2 = Momentary symbOl layer on O.
|
||||||
|
[3] = ACTION_LAYER_TAP_KEY(3, KC_E), // FN3 = Momentary numbEr layer on E.
|
||||||
|
[4] = ACTION_LAYER_TAP_KEY(4, KC_U), // FN4 = Momentary fUnction layer on U.
|
||||||
|
[5] = ACTION_LAYER_TAP_KEY(5, KC_Q), // FN5 = Momentary emaQs layer on Q.
|
||||||
|
[6] = ACTION_LAYER_TAP_KEY(6, KC_LCTRL), // FN6 = Momentary MACROS on ??? key.
|
||||||
|
[7] = ACTION_LAYER_TAP_KEY(7, KC_COMMA), // FN7 = Momentary MOUSE on , key.
|
||||||
|
|
||||||
|
// Special Keys
|
||||||
|
[10] = ACTION_MODS_KEY(KC_LCTRL, KC_LALT), // FN10 = Ctrl + Alt.
|
||||||
|
|
||||||
|
// Symbols
|
||||||
|
[21] = ACTION_MODS_KEY(MOD_LSFT, KC_SLASH), // FN21 = Question mark.
|
||||||
|
|
||||||
|
};
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7
|
Subproject commit d34e8eb83101a95f98892bf68605fe545821f320
|
|
@ -40,14 +40,13 @@ extern backlight_config_t backlight_config;
|
||||||
#ifndef AG_SWAP_SONG
|
#ifndef AG_SWAP_SONG
|
||||||
#define AG_SWAP_SONG SONG(AG_SWAP_SOUND)
|
#define AG_SWAP_SONG SONG(AG_SWAP_SOUND)
|
||||||
#endif
|
#endif
|
||||||
#ifndef DEFAULT_LAYER_SONGS
|
|
||||||
#define DEFAULT_LAYER_SONGS { }
|
|
||||||
#endif
|
|
||||||
float goodbye_song[][2] = GOODBYE_SONG;
|
float goodbye_song[][2] = GOODBYE_SONG;
|
||||||
float ag_norm_song[][2] = AG_NORM_SONG;
|
float ag_norm_song[][2] = AG_NORM_SONG;
|
||||||
float ag_swap_song[][2] = AG_SWAP_SONG;
|
float ag_swap_song[][2] = AG_SWAP_SONG;
|
||||||
|
#ifdef DEFAULT_LAYER_SONGS
|
||||||
float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
|
float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
|
static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
|
@ -480,6 +479,13 @@ bool process_record_quantum(keyrecord_t *record) {
|
||||||
uint8_t shifted = get_mods() & ((MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)
|
uint8_t shifted = get_mods() & ((MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)
|
||||||
|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)));
|
|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)));
|
||||||
|
|
||||||
|
#ifdef GRAVE_ESC_CTRL_OVERRIDE
|
||||||
|
// if CTRL is pressed, ESC is always read as ESC, even if SHIFT or GUI is pressed.
|
||||||
|
// this is handy for the ctrl+shift+esc shortcut on windows, among other things.
|
||||||
|
if (get_mods() & (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)))
|
||||||
|
shifted = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
method(shifted ? KC_GRAVE : KC_ESCAPE);
|
method(shifted ? KC_GRAVE : KC_ESCAPE);
|
||||||
send_keyboard_report();
|
send_keyboard_report();
|
||||||
}
|
}
|
||||||
|
@ -560,7 +566,7 @@ void send_string_with_delay(const char *str, uint8_t interval) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_single_persistent_default_layer(uint8_t default_layer) {
|
void set_single_persistent_default_layer(uint8_t default_layer) {
|
||||||
#ifdef AUDIO_ENABLE
|
#if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
|
||||||
PLAY_SONG(default_layer_songs[default_layer]);
|
PLAY_SONG(default_layer_songs[default_layer]);
|
||||||
#endif
|
#endif
|
||||||
eeconfig_update_default_layer(1U<<default_layer);
|
eeconfig_update_default_layer(1U<<default_layer);
|
||||||
|
|
|
@ -67,6 +67,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
/* Locking resynchronize hack */
|
/* Locking resynchronize hack */
|
||||||
#define LOCKING_RESYNC_ENABLE
|
#define LOCKING_RESYNC_ENABLE
|
||||||
|
|
||||||
|
/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
|
||||||
|
* This is userful for the Windows task manager shortcut (ctrl+shift+esc).
|
||||||
|
*/
|
||||||
|
// #define GRAVE_ESC_CTRL_OVERRIDE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Force NKRO
|
* Force NKRO
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue