aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIBNobody <IBNobody@users.noreply.github.com>2016-09-12 19:54:52 -0500
committerGitHub <noreply@github.com>2016-09-12 19:54:52 -0500
commite9a093451ea13b18b5dc60d427244efeba593da5 (patch)
treebc4f5fe1c10ebb378e6d69696ad35709a7a55ab2
parent658db40df9639baf25b3975d690703a79b0ee289 (diff)
downloadqmk_firmware-e9a093451ea13b18b5dc60d427244efeba593da5.tar.gz
qmk_firmware-e9a093451ea13b18b5dc60d427244efeba593da5.zip
Clean up atomic keymap (#9)
* Added keyboard help macros * Fixing Atomic PVC keymap / adding print help
-rw-r--r--keyboards/atomic/keymaps/pvc/Makefile2
-rw-r--r--keyboards/atomic/keymaps/pvc/config.h11
-rw-r--r--keyboards/atomic/keymaps/pvc/keymap.c458
-rw-r--r--keyboards/planck/keymaps/pvc/keymap.c106
4 files changed, 336 insertions, 241 deletions
diff --git a/keyboards/atomic/keymaps/pvc/Makefile b/keyboards/atomic/keymaps/pvc/Makefile
index 278407e6c..ebd75e313 100644
--- a/keyboards/atomic/keymaps/pvc/Makefile
+++ b/keyboards/atomic/keymaps/pvc/Makefile
@@ -1,7 +1,7 @@
1BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) 1BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
2MOUSEKEY_ENABLE = yes # Mouse keys(+4700) 2MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
3EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 3EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
4CONSOLE_ENABLE = no # Console for debug(+400) 4CONSOLE_ENABLE = yes # Console for debug(+400)
5COMMAND_ENABLE = yes # Commands for debug and configuration 5COMMAND_ENABLE = yes # Commands for debug and configuration
6NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 6NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
7BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 7BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
diff --git a/keyboards/atomic/keymaps/pvc/config.h b/keyboards/atomic/keymaps/pvc/config.h
index 70353323b..18a7253f2 100644
--- a/keyboards/atomic/keymaps/pvc/config.h
+++ b/keyboards/atomic/keymaps/pvc/config.h
@@ -150,10 +150,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
150 */ 150 */
151 151
152/* disable debug print */ 152/* disable debug print */
153//#define NO_DEBUG 153#ifndef NO_DEBUG
154# define NO_DEBUG
155#endif
154 156
155/* disable print */ 157/* disable print */
156//#define NO_PRINT 158// #ifndef NO_PRINT
159// # define NO_PRINT
160// #endif
161
162/* Only print user print statements */
163#define USER_PRINT
157 164
158/* disable action features */ 165/* disable action features */
159//#define NO_ACTION_LAYER 166//#define NO_ACTION_LAYER
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
index b02e89d2c..d10bfe3bf 100644
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -2,48 +2,59 @@
2#include "action_layer.h" 2#include "action_layer.h"
3#include "eeconfig.h" 3#include "eeconfig.h"
4#include "led.h" 4#include "led.h"
5#include "mousekey.h"
5 6
6#ifdef AUDIO_ENABLE 7#ifdef AUDIO_ENABLE
7 #include "audio.h" 8 #include "audio.h"
8 #include "song_list.h" 9 #include "song_list.h"
9#endif 10#endif
10 11
11#define LAYER_QWERTY 0 12enum keyboard_layers {
12#define LAYER_COLEMAK 1 13 LAYER_QWERTY = 0,
13#define LAYER_DVORAK 2 14 LAYER_UPPER,
14#define LAYER_UPPER 3 15 LAYER_LOWER,
15#define LAYER_LOWER 4 16 LAYER_FUNCTION,
16#define LAYER_FUNCTION 5 17 LAYER_MOUSE,
17#define LAYER_MOUSE 6 18 LAYER_ADJUST,
18#define LAYER_ADJUST 7 19};
19 20enum keyboard_macros {
20#define MACRO_QWERTY 0 21 MACRO_QWERTY = 0,
21#define MACRO_COLEMAK 1 22 MACRO_UPPER,
22#define MACRO_DVORAK 2 23 MACRO_LOWER,
23#define MACRO_UPPER 3 24 MACRO_FUNCTION,
24#define MACRO_LOWER 4 25 MACRO_MOUSE,
25#define MACRO_FUNCTION 5 26 MACRO_TIMBRE_1,
26#define MACRO_MOUSE 6 27 MACRO_TIMBRE_2,
27#define MACRO_TIMBRE_1 7 28 MACRO_TIMBRE_3,
28#define MACRO_TIMBRE_2 8 29 MACRO_TIMBRE_4,
29#define MACRO_TIMBRE_3 9 30 MACRO_TEMPO_U,
30#define MACRO_TIMBRE_4 10 31 MACRO_TEMPO_D,
31#define MACRO_TEMPO_U 11 32 MACRO_TONE_DEFAULT,
32#define MACRO_TEMPO_D 12 33 MACRO_MUSIC_TOGGLE,
33#define MACRO_TONE_DEFAULT 13 34 MACRO_AUDIO_TOGGLE,
34#define MACRO_MUSIC_TOGGLE 14 35 MACRO_INC_VOICE,
35#define MACRO_AUDIO_TOGGLE 16 36 MACRO_DEC_VOICE,
36#define MACRO_INC_VOICE 18 37 MACRO_BACKLIGHT,
37#define MACRO_DEC_VOICE 19 38 MACRO_BREATH_TOGGLE,
38#define MACRO_BACKLIGHT 20 39 MACRO_BREATH_SPEED_INC,
39#define MACRO_BREATH_TOGGLE 21 40 MACRO_BREATH_SPEED_DEC,
40#define MACRO_BREATH_SPEED_INC 23 41 MACRO_BREATH_DEFAULT,
41#define MACRO_BREATH_SPEED_DEC 24 42 MACRO_MOUSE_MOVE_UL,
42#define MACRO_BREATH_DEFAULT 25 43 MACRO_MOUSE_MOVE_UR,
44 MACRO_MOUSE_MOVE_DL,
45 MACRO_MOUSE_MOVE_DR,
46 MACRO_HELP_1,
47 MACRO_HELP_2,
48 MACRO_HELP_3,
49 MACRO_HELP_4,
50 MACRO_HELP_5,
51 MACRO_HELP_6,
52 MACRO_HELP_7,
53 MACRO_HELP_8,
54 MACRO_HELP_9,
55};
43 56
44#define M_QWRTY M(MACRO_QWERTY) 57#define M_QWRTY M(MACRO_QWERTY)
45#define M_COLMK M(MACRO_COLEMAK)
46#define M_DVORK M(MACRO_DVORAK)
47#define M_UPPER M(MACRO_UPPER) 58#define M_UPPER M(MACRO_UPPER)
48#define M_LOWER M(MACRO_LOWER) 59#define M_LOWER M(MACRO_LOWER)
49#define M_FUNCT M(MACRO_FUNCTION) 60#define M_FUNCT M(MACRO_FUNCTION)
@@ -60,6 +71,19 @@
60#define M_BSPDU M(MACRO_BREATH_SPEED_INC) 71#define M_BSPDU M(MACRO_BREATH_SPEED_INC)
61#define M_BSPDD M(MACRO_BREATH_SPEED_DEC) 72#define M_BSPDD M(MACRO_BREATH_SPEED_DEC)
62#define M_BDFLT M(MACRO_BREATH_DEFAULT) 73#define M_BDFLT M(MACRO_BREATH_DEFAULT)
74#define M_MS_UL M(MACRO_MOUSE_MOVE_UL)
75#define M_MS_UR M(MACRO_MOUSE_MOVE_UR)
76#define M_MS_DL M(MACRO_MOUSE_MOVE_DL)
77#define M_MS_DR M(MACRO_MOUSE_MOVE_DR)
78#define M_HELP1 M(MACRO_HELP_1)
79#define M_HELP2 M(MACRO_HELP_2)
80#define M_HELP3 M(MACRO_HELP_3)
81#define M_HELP4 M(MACRO_HELP_4)
82#define M_HELP5 M(MACRO_HELP_5)
83#define M_HELP6 M(MACRO_HELP_6)
84#define M_HELP7 M(MACRO_HELP_7)
85#define M_HELP8 M(MACRO_HELP_8)
86#define M_HELP9 M(MACRO_HELP_9)
63 87
64 88
65#define VC_UP M(MACRO_INC_VOICE) 89#define VC_UP M(MACRO_INC_VOICE)
@@ -77,6 +101,7 @@
77#define SC_ACLS LALT(KC_F4) 101#define SC_ACLS LALT(KC_F4)
78#define SC_CCLS LCTL(KC_F4) 102#define SC_CCLS LCTL(KC_F4)
79 103
104#define TG_NKRO MAGIC_TOGGLE_NKRO
80#define OS_SHFT KC_FN0 105#define OS_SHFT KC_FN0
81 106
82#define _______ KC_TRNS 107#define _______ KC_TRNS
@@ -86,169 +111,126 @@
86 111
87const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 112const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
88 113
89/* QWERTY 114/* LAYER = LAYER_QWERTY
90 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 115 .--------------------------------------------------------------------------------------------------------------------------------------.
91 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | 116 | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BACKSP . BACKSP |
92 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 117 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
93 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | 118 | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL |
94 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 119 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
95 * | CAPS | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | 120 | CAP LK | A | S | D | F | G | H | J | K | L | ; | ' | ENTER . ENTER | PG UP |
96 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 121 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
97 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | 122 | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT . RSHIFT | UP | PG DN |
98 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 123 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
99 * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | 124 | LCTRL | LWIN | FN | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT |
100 * '--------------------------------------------------------------------------------------------------------------------------------------' 125 '--------------------------------------------------------------------------------------------------------------------------------------'
101 */ 126*/
102 127[LAYER_QWERTY] = {
103 [LAYER_QWERTY] = { // QWERTY 128 { KC_ESC , 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_BSPC, KC_BSPC },
104 { KC_ESC, 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_BSPC, KC_BSPC }, 129 { 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_BSLS, KC_DEL },
105 { 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_BSLS, KC_DEL }, 130 { KC_CAPS, 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_ENT , KC_PGUP },
106 { KC_CAPS, 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_ENT, KC_PGUP }, 131 { KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_RSFT, KC_UP , KC_PGDN },
107 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, 132 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }
108 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
109 },
110
111 /* COLEMAK
112 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
113 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
114 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
115 * | TAB | Q | W | F | P | G | J | L | U | Y | ; | [ | ] | \ | DEL |
116 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
117 * | BACKSP | A | R | S | T | D | H | N | E | I | O | ' | XXXXXX . ENTER | PG UP |
118 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
119 * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN |
120 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
121 * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT |
122 * '--------------------------------------------------------------------------------------------------------------------------------------'
123 */
124
125 [LAYER_COLEMAK] = { // COLEMAK
126 { KC_ESC, 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_BSPC, KC_BSPC },
127 { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL },
128 { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP },
129 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN },
130 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
131}, 133},
132 134/* LAYER = LAYER_UPPER
133/* DVORAK 135 .--------------------------------------------------------------------------------------------------------------------------------------.
134 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 136 | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | KP / | KP * | KP - | XXXXXX | XXXXXX | ______ . ______ |
135 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | [ | ] | XXXXXX . BACKSP | 137 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
136 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 138 | PAUSE | F1 | F2 | F3 | F4 | NUM LK | KP / | KP 7 | KP 8 | KP 9 | KP - | ______ | ______ | ______ | INS |
137 * | TAB | ' | , | . | P | Y | F | G | C | R | L | / | = | \ | DEL | 139 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
138 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 140 | ______ | F5 | F6 | F7 | F8 | CAP LK | KP * | KP 4 | KP 5 | KP 6 | KP + | ______ | ______ . ______ | HOME |
139 * | CAPS | A | O | E | U | I | D | H | T | N | S | - | XXXXXX . ENTER | PG UP | 141 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
140 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 142 | ______ | F9 | F10 | F11 | F12 | SCR LK | KP 0 | KP 1 | KP 2 | KP 3 | KP ENT | ______ . ______ | ______ | END |
141 * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN | 143 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
142 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 144 | ______ | ______ | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP ENT | ______ | ______ | ______ | ______ |
143 * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | 145 '--------------------------------------------------------------------------------------------------------------------------------------'
144 * '--------------------------------------------------------------------------------------------------------------------------------------'
145 */
146
147 [LAYER_DVORAK] = { // DVORAK
148 { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_BSPC },
149 { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL },
150 { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_ENT, KC_PGUP },
151 { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN },
152 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
153 },
154
155/* UPPER
156 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
157 * | PRINT | BR TOG | BR SP+ | BR SP- | BR RST | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE |
158 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
159 * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS |
160 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
161 * | CAP LK | F5 | F6 | F7 | F8 | | | 4 | 5 | 6 | + | | XXXXXX . | HOME |
162 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
163 * | | F9 | F10 | F11 | F12 | | | 1 | 2 | 3 | ENTER | XXXXXX . | | END |
164 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
165 * | | | | | | 0 | | RALT | . | ENTER | | | | |
166 * '--------------------------------------------------------------------------------------------------------------------------------------'
167 */
168
169 [LAYER_UPPER] = { // UPPER
170 { KC_PSCR, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, XXXXXXX, XXXXXXX, KC_SLCK, KC_PAUS, KC_PAUS },
171 { _______, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS },
172 { KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, ________________, KC_HOME },
173 { _______, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, ________________, _______, KC_END },
174 { _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______ },
175 },
176
177/* LOWER
178 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
179 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . BACKSP |
180 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
181 * | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS |
182 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
183 * | | ^ | * | + | - | / | \ | _ | ' | " | ` | | XXXXXX . | HOME |
184 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
185 * | | | | & | ! | ~ | ; | : | = | < | > | ? | XXXXXX . | | END |
186 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
187 * | | | | | | | | | | | | | | |
188 * '--------------------------------------------------------------------------------------------------------------------------------------'
189 */
190
191 [LAYER_LOWER] = { // LOWER
192 { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
193 { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS },
194 { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME },
195 { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END },
196 { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ },
197 },
198
199/* FUNCTION
200 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
201 * | NUM LK | | | | | | | | | | | | | XXXXXX . |
202 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
203 * | SCR LK | F13 | F14 | F15 | F16 | | | | | | | | | | |
204 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
205 * | CAP LK | F17 | F18 | F19 | F20 | | | | | | | | XXXXXX . | |
206 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
207 * | | F21 | F22 | F23 | F24 | | | | | | | XXXXXX . | VOL UP | MUTE |
208 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
209 * | | | | | | PLAY/PAUSE | | | | | | PTRACK | VOL DN | NTRACK |
210 * '--------------------------------------------------------------------------------------------------------------------------------------'
211 */
212
213 [LAYER_FUNCTION] = { // FUNCTION
214 { KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX },
215 { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
216 { KC_CAPS, KC_F17, KC_F18, KC_F19, KC_F20, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, XXXXXXX },
217 { _______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_VOLU, KC_MUTE },
218 { _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT },
219 },
220
221#ifdef MOUSEKEY_ENABLE
222
223 [LAYER_MOUSE] = { // MOUSE
224 { _______, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX },
225 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
226 { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, KC_WH_U },
227 { _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_MS_U, KC_WH_D },
228 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },
229 },
230
231#endif
232
233 [LAYER_ADJUST] = { // ADJUST
234 { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, _______, _______, MU_TOG, AU_TOG, ________________ },
235 { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
236 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______ },
237 { _______, _______, _______, _______, M_BACKL, RESET, _______, M_MOUSE, _______, _______, _______, ________________, MUV_IN, _______ },
238 { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, MUV_DE, _______ },
239 },
240
241
242/*
243 [LAYER_EMPTY] = { // LAYER
244 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________ },
245 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
246 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______ },
247 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______, _______ },
248 { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ },
249 },
250*/ 146*/
251 147[LAYER_UPPER] = {
148 { KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, _______, _______ },
149 { KC_PAUS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS },
150 { _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, KC_HOME },
151 { _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_SLCK, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______, _______, KC_END },
152 { _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______ }
153},
154/* LAYER = LAYER_LOWER
155 .--------------------------------------------------------------------------------------------------------------------------------------.
156 | PRINT | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | ______ . ______ |
157 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
158 | ______ | $ | { | [ | ( | % | # | ) | ] | } | @ | ______ | ______ | ______ | INS |
159 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
160 | ______ | ^ | * | + | - | / | \ | _ | ' | " | ` | ______ | ______ . ______ | HOME |
161 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
162 | ______ | | | & | ! | ~ | ; | : | = | < | > | ? | ______ . ______ | ______ | END |
163 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
164 | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | ______ | ______ | ______ | ______ |
165 '--------------------------------------------------------------------------------------------------------------------------------------'
166*/
167[LAYER_LOWER] = {
168 { KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______ },
169 { _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, KC_INS },
170 { _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, KC_HOME },
171 { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT , KC_GT , KC_QUES, _______, _______, _______, KC_END },
172 { _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, _______, _______, _______, _______ }
173},
174/* LAYER = LAYER_FUNCTION
175 .--------------------------------------------------------------------------------------------------------------------------------------.
176 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX |
177 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
178 | XXXXXX | F13 | F14 | F15 | F16 | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
179 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
180 | XXXXXX | F17 | F18 | F19 | F20 | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
181 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
182 | ______ | F21 | F22 | F23 | F24 | CAP LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ______ . ______ | VOL UP | MUTE |
183 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
184 | ______ | ______ | FN | ______ | ______ | PLAY . PLAY | ______ | ______ | ______ | ______ | ______ | PREV | VOL DN | NEXT |
185 '--------------------------------------------------------------------------------------------------------------------------------------'
186*/
187[LAYER_FUNCTION] = {
188 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
189 { XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
190 { XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
191 { _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_VOLU, KC_MUTE },
192 { _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT }
193},
194/* LAYER = LAYER_MOUSE
195 .--------------------------------------------------------------------------------------------------------------------------------------.
196 | ESC | MS AC0 | MS AC1 | MS AC2 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX |
197 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
198 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL | MS U | MS UR | XXXXXX | XXXXXX | XXXXXX | MS WHL | MS WHR |
199 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
200 | XXXXXX | MS BT5 | MS BT4 | MS BT3 | MS BT2 | XXXXXX | XXXXXX | MS L | XXXXXX | MS R | XXXXXX | XXXXXX | XXXXXX . XXXXXX | MS WHU |
201 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
202 | ______ | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS DL | MS D | MS DR | XXXXXX | ______ . ______ | MS U | MS WHD |
203 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
204 | ______ | ______ | ______ | ______ | ______ | MS BT1 . MS BT1 | ______ | ______ | ______ | ______ | ______ | MS L | MS D | MS R |
205 '--------------------------------------------------------------------------------------------------------------------------------------'
206*/
207[LAYER_MOUSE] = {
208 { KC_ESC , KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
209 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_R },
210 { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U },
211 { _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, XXXXXXX, _______, _______, KC_MS_U, KC_WH_D },
212 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }
213},
214/* LAYER = LAYER_ADJUST
215 .--------------------------------------------------------------------------------------------------------------------------------------.
216 | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | XXXXXX | MUSIC | AUDIO | XXXXXX . XXXXXX |
217 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
218 | XXXXXX | BRTOG | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
219 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
220 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
221 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
222 | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET | XXXXXX | MOUSE | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | VOICE+ | XXXXXX |
223 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
224 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX . XXXXXX | LOWER | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
225 '--------------------------------------------------------------------------------------------------------------------------------------'
226*/
227[LAYER_ADJUST] = {
228 { XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX },
229 { XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
230 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
231 { XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX },
232 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP }
233},
252}; 234};
253 235
254#ifdef AUDIO_ENABLE 236#ifdef AUDIO_ENABLE
@@ -290,61 +272,101 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
290 switch(id) 272 switch(id)
291 { 273 {
292 274
293 case MACRO_BREATH_TOGGLE: 275 case MACRO_HELP_1:
294 if (record->event.pressed) 276 if (record->event.pressed)
295 { 277 {
296 breathing_toggle(); 278 uprintf("1");
297 } 279 }
298 break; 280 break;
299 281
300 case MACRO_BREATH_SPEED_INC: 282 case MACRO_HELP_2:
301 if (record->event.pressed) 283 if (record->event.pressed)
302 { 284 {
303 breathing_speed_inc(1); 285 uprintf("2");
304 } 286 }
305 break; 287 break;
306 288
307 case MACRO_BREATH_SPEED_DEC: 289 case MACRO_HELP_3:
308 if (record->event.pressed) 290 if (record->event.pressed)
309 { 291 {
310 breathing_speed_dec(1); 292 uprintf("3");
311 } 293 }
312 break; 294 break;
313 295
314 case MACRO_BREATH_DEFAULT: 296 case MACRO_HELP_4:
315 if (record->event.pressed) 297 if (record->event.pressed)
316 { 298 {
317 breathing_defaults(); 299 uprintf("4");
318 } 300 }
319 break; 301 break;
320 302
321 case MACRO_QWERTY: 303 case MACRO_HELP_5:
322 if (record->event.pressed) 304 if (record->event.pressed)
323 { 305 {
324 persistant_default_layer_set(1UL<<LAYER_QWERTY); 306 uprintf("5");
325 #ifdef AUDIO_ENABLE
326 PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
327 #endif /* AUDIO_ENABLE */
328 } 307 }
329 break; 308 break;
330 309
331 case MACRO_COLEMAK: 310 case MACRO_HELP_6:
332 if (record->event.pressed) 311 if (record->event.pressed)
333 { 312 {
334 persistant_default_layer_set(1UL<<LAYER_COLEMAK); 313 uprintf("6");
335 #ifdef AUDIO_ENABLE
336 PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
337 #endif /* AUDIO_ENABLE */
338 } 314 }
339 break; 315 break;
340 316
341 case MACRO_DVORAK: 317 case MACRO_HELP_7:
342 if (record->event.pressed) 318 if (record->event.pressed)
343 { 319 {
344 persistant_default_layer_set(1UL<<LAYER_DVORAK); 320 uprintf("7");
345 #ifdef AUDIO_ENABLE 321 }
346 PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO); 322 break;
347 #endif /* AUDIO_ENABLE */ 323
324 case MACRO_HELP_8:
325 if (record->event.pressed)
326 {
327 uprintf("8");
328 }
329 break;
330
331 case MACRO_HELP_9:
332 if (record->event.pressed)
333 {
334 uprintf("9");
335 }
336 break;
337
338 case MACRO_BREATH_TOGGLE:
339 if (record->event.pressed)
340 {
341 breathing_toggle();
342 }
343 break;
344
345 case MACRO_BREATH_SPEED_INC:
346 if (record->event.pressed)
347 {
348 breathing_speed_inc(1);
349 }
350 break;
351
352 case MACRO_BREATH_SPEED_DEC:
353 if (record->event.pressed)
354 {
355 breathing_speed_dec(1);
356 }
357 break;
358
359 case MACRO_BREATH_DEFAULT:
360 if (record->event.pressed)
361 {
362 breathing_defaults();
363 }
364 break;
365
366 case MACRO_QWERTY:
367 if (record->event.pressed)
368 {
369 persistant_default_layer_set(1UL<<LAYER_QWERTY);
348 } 370 }
349 break; 371 break;
350 372
diff --git a/keyboards/planck/keymaps/pvc/keymap.c b/keyboards/planck/keymaps/pvc/keymap.c
index 23aedfc99..6ad95832d 100644
--- a/keyboards/planck/keymaps/pvc/keymap.c
+++ b/keyboards/planck/keymaps/pvc/keymap.c
@@ -43,6 +43,15 @@ enum keyboard_macros {
43 MACRO_MOUSE_MOVE_UR, 43 MACRO_MOUSE_MOVE_UR,
44 MACRO_MOUSE_MOVE_DL, 44 MACRO_MOUSE_MOVE_DL,
45 MACRO_MOUSE_MOVE_DR, 45 MACRO_MOUSE_MOVE_DR,
46 MACRO_HELP_1,
47 MACRO_HELP_2,
48 MACRO_HELP_3,
49 MACRO_HELP_4,
50 MACRO_HELP_5,
51 MACRO_HELP_6,
52 MACRO_HELP_7,
53 MACRO_HELP_8,
54 MACRO_HELP_9,
46}; 55};
47 56
48#define M_QWRTY M(MACRO_QWERTY) 57#define M_QWRTY M(MACRO_QWERTY)
@@ -66,6 +75,15 @@ enum keyboard_macros {
66#define M_MS_UR M(MACRO_MOUSE_MOVE_UR) 75#define M_MS_UR M(MACRO_MOUSE_MOVE_UR)
67#define M_MS_DL M(MACRO_MOUSE_MOVE_DL) 76#define M_MS_DL M(MACRO_MOUSE_MOVE_DL)
68#define M_MS_DR M(MACRO_MOUSE_MOVE_DR) 77#define M_MS_DR M(MACRO_MOUSE_MOVE_DR)
78#define M_HELP1 M(MACRO_HELP_1)
79#define M_HELP2 M(MACRO_HELP_2)
80#define M_HELP3 M(MACRO_HELP_3)
81#define M_HELP4 M(MACRO_HELP_4)
82#define M_HELP5 M(MACRO_HELP_5)
83#define M_HELP6 M(MACRO_HELP_6)
84#define M_HELP7 M(MACRO_HELP_7)
85#define M_HELP8 M(MACRO_HELP_8)
86#define M_HELP9 M(MACRO_HELP_9)
69 87
70 88
71#define VC_UP M(MACRO_INC_VOICE) 89#define VC_UP M(MACRO_INC_VOICE)
@@ -104,14 +122,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | OSHIFT | LEFT | DOWN | RIGHT | 122 | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | OSHIFT | LEFT | DOWN | RIGHT |
105 '-----------------------------------------------------------------------------------------------------------' 123 '-----------------------------------------------------------------------------------------------------------'
106*/ 124*/
107
108[LAYER_QWERTY] = { 125[LAYER_QWERTY] = {
109 { KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC }, 126 { KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC },
110 { KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT }, 127 { KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT },
111 { KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_UP , KC_ENT }, 128 { KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_UP , KC_ENT },
112 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT } 129 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT }
113}, 130},
114
115/* LAYER = LAYER_UPPER 131/* LAYER = LAYER_UPPER
116 .-----------------------------------------------------------------------------------------------------------. 132 .-----------------------------------------------------------------------------------------------------------.
117 | PRINT | F1 | F2 | F3 | F4 | NUM LK | KP / | KP 7 | KP 8 | KP 9 | KP - | DEL | 133 | PRINT | F1 | F2 | F3 | F4 | NUM LK | KP / | KP 7 | KP 8 | KP 9 | KP - | DEL |
@@ -123,14 +139,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
123 | ______ | ______ | ______ | ______ | UPPER | KP 0 | KP 0 | ______ | RALT | KP . | KP ENT | END | 139 | ______ | ______ | ______ | ______ | UPPER | KP 0 | KP 0 | ______ | RALT | KP . | KP ENT | END |
124 '-----------------------------------------------------------------------------------------------------------' 140 '-----------------------------------------------------------------------------------------------------------'
125*/ 141*/
126
127[LAYER_UPPER] = { 142[LAYER_UPPER] = {
128 { KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, KC_DEL }, 143 { KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, KC_DEL },
129 { KC_PAUS, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_SLCK, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_INS }, 144 { KC_PAUS, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_SLCK, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_INS },
130 { _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PAUS, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_HOME }, 145 { _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PAUS, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_HOME },
131 { _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, KC_END } 146 { _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, KC_END }
132}, 147},
133
134/* LAYER = LAYER_LOWER 148/* LAYER = LAYER_LOWER
135 .-----------------------------------------------------------------------------------------------------------. 149 .-----------------------------------------------------------------------------------------------------------.
136 | ______ | $ | { | [ | ( | % | # | ) | ] | } | @ | PG UP | 150 | ______ | $ | { | [ | ( | % | # | ) | ] | } | @ | PG UP |
@@ -142,14 +156,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
142 | ______ | ______ | ______ | ______ | ______ | ______ | ______ | LOWER | ______ | ______ | ______ | END | 156 | ______ | ______ | ______ | ______ | ______ | ______ | ______ | LOWER | ______ | ______ | ______ | END |
143 '-----------------------------------------------------------------------------------------------------------' 157 '-----------------------------------------------------------------------------------------------------------'
144*/ 158*/
145
146[LAYER_LOWER] = { 159[LAYER_LOWER] = {
147 { _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , KC_PGUP }, 160 { _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , KC_PGUP },
148 { _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , KC_PGDN }, 161 { _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , KC_PGDN },
149 { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT , KC_GT , KC_QUES, KC_HOME }, 162 { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT , KC_GT , KC_QUES, KC_HOME },
150 { _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, KC_END } 163 { _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, KC_END }
151}, 164},
152
153/* LAYER = LAYER_FUNCTION 165/* LAYER = LAYER_FUNCTION
154 .-----------------------------------------------------------------------------------------------------------. 166 .-----------------------------------------------------------------------------------------------------------.
155 | XXXXXX | F13 | F14 | F15 | F16 | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | 167 | XXXXXX | F13 | F14 | F15 | F16 | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
@@ -161,16 +173,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
161 | ______ | ______ | FN | ______ | ______ | PLAY | PLAY | ______ | ______ | PREV | VOL DN | NEXT | 173 | ______ | ______ | FN | ______ | ______ | PLAY | PLAY | ______ | ______ | PREV | VOL DN | NEXT |
162 '-----------------------------------------------------------------------------------------------------------' 174 '-----------------------------------------------------------------------------------------------------------'
163*/ 175*/
164
165[LAYER_FUNCTION] = { 176[LAYER_FUNCTION] = {
166 { XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 177 { XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
167 { XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 178 { XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
168 { _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE }, 179 { _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE },
169 { _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT } 180 { _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT }
170}, 181},
171
172#ifdef MOUSEKEY_ENABLE
173
174/* LAYER = LAYER_MOUSE 182/* LAYER = LAYER_MOUSE
175 .-----------------------------------------------------------------------------------------------------------. 183 .-----------------------------------------------------------------------------------------------------------.
176 | ESC | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL | MS U | MS UR | MS WHL | MS WHR | 184 | ESC | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL | MS U | MS UR | MS WHL | MS WHR |
@@ -182,32 +190,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
182 | ______ | ______ | ______ | ______ | ______ | MS BT1 | MS BT1 | ______ | ______ | MS L | MS D | MS R | 190 | ______ | ______ | ______ | ______ | ______ | MS BT1 | MS BT1 | ______ | ______ | MS L | MS D | MS R |
183 '-----------------------------------------------------------------------------------------------------------' 191 '-----------------------------------------------------------------------------------------------------------'
184*/ 192*/
185
186[LAYER_MOUSE] = { 193[LAYER_MOUSE] = {
187 { KC_ESC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, KC_WH_L, KC_WH_R }, 194 { KC_ESC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, KC_WH_L, KC_WH_R },
188 { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, KC_WH_U }, 195 { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, KC_WH_U },
189 { _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, KC_MS_U, KC_WH_D }, 196 { _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, KC_MS_U, KC_WH_D },
190 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R } 197 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }
191}, 198},
192
193#endif
194
195/* LAYER = LAYER_ADJUST 199/* LAYER = LAYER_ADJUST
196 .-----------------------------------------------------------------------------------------------------------. 200 .-----------------------------------------------------------------------------------------------------------.
197 | XXXXXX | BRTOG | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MUSIC | AUDIO | 201 | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | MUSIC | AUDIO |
198 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 202 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
199 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | 203 | XXXXXX | BRTOG | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
200 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 204 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
201 | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET | XXXXXX | MOUSE | XXXXXX | XXXXXX | VOICE+ | XXXXXX | 205 | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET | XXXXXX | MOUSE | XXXXXX | XXXXXX | VOICE+ | XXXXXX |
202 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 206 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
203 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX | XXXXXX | LOWER | XXXXXX | TEMPO- | VOICE- | TEMPO+ | 207 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX | XXXXXX | LOWER | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
204 '-----------------------------------------------------------------------------------------------------------' 208 '-----------------------------------------------------------------------------------------------------------'
205*/ 209*/
206
207[LAYER_ADJUST] = { 210[LAYER_ADJUST] = {
208 { XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG , AU_TOG }, 211 { XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, MU_TOG , AU_TOG },
209 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 212 { XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
210 { XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET , TG_NKRO, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX }, 213 { XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX },
211 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP } 214 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP }
212}, 215},
213 216
@@ -247,6 +250,69 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
247 switch(id) 250 switch(id)
248 { 251 {
249 252
253 case MACRO_HELP_1:
254 if (record->event.pressed)
255 {
256 uprintf("1");
257 }
258 break;
259
260 case MACRO_HELP_2:
261 if (record->event.pressed)
262 {
263 uprintf("2");
264 }
265 break;
266
267 case MACRO_HELP_3:
268 if (record->event.pressed)
269 {
270 uprintf("3");
271 }
272 break;
273
274 case MACRO_HELP_4:
275 if (record->event.pressed)
276 {
277 uprintf("4");
278 }
279 break;
280
281 case MACRO_HELP_5:
282 if (record->event.pressed)
283 {
284 uprintf("5");
285 }
286 break;
287
288 case MACRO_HELP_6:
289 if (record->event.pressed)
290 {
291 uprintf("6");
292 }
293 break;
294
295 case MACRO_HELP_7:
296 if (record->event.pressed)
297 {
298 uprintf("7");
299 }
300 break;
301
302 case MACRO_HELP_8:
303 if (record->event.pressed)
304 {
305 uprintf("8");
306 }
307 break;
308
309 case MACRO_HELP_9:
310 if (record->event.pressed)
311 {
312 uprintf("9");
313 }
314 break;
315
250 case MACRO_BREATH_TOGGLE: 316 case MACRO_BREATH_TOGGLE:
251 if (record->event.pressed) 317 if (record->event.pressed)
252 { 318 {