aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/ergodox/keymaps/dvorak_programmer/Makefile2
-rw-r--r--keyboards/ergodox/keymaps/dvorak_programmer/README.md16
-rw-r--r--keyboards/ergodox/keymaps/dvorak_programmer/keymap.c71
-rw-r--r--keyboards/planck/keymaps/priyadi/Makefile8
-rw-r--r--tmk_core/avr.mk2
-rw-r--r--tmk_core/protocol/lufa/adafruit_ble.cpp2
6 files changed, 66 insertions, 35 deletions
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer/Makefile b/keyboards/ergodox/keymaps/dvorak_programmer/Makefile
index 1fd6cb9ff..3c65e25e1 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer/Makefile
+++ b/keyboards/ergodox/keymaps/dvorak_programmer/Makefile
@@ -5,4 +5,4 @@ FORCE_NKRO ?= yes
5DEBUG_ENABLE = no 5DEBUG_ENABLE = no
6CONSOLE_ENABLE = no 6CONSOLE_ENABLE = no
7TAP_DANCE_ENABLE = yes 7TAP_DANCE_ENABLE = yes
8MOUSEKEY_ENABLE = no 8MOUSEKEY_ENABLE = yes
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer/README.md b/keyboards/ergodox/keymaps/dvorak_programmer/README.md
index a4580fe06..3e4a2545b 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer/README.md
+++ b/keyboards/ergodox/keymaps/dvorak_programmer/README.md
@@ -11,5 +11,19 @@ Layers
11* KEY_NAV: arrow key movement with backward/forward word support, and copy/paste. 11* KEY_NAV: arrow key movement with backward/forward word support, and copy/paste.
12* KEY_SEL: same as above, but every movement shift-selects. 12* KEY_SEL: same as above, but every movement shift-selects.
13* NUMBER: keypad layer. 13* NUMBER: keypad layer.
14* SYMBOL: all the symbols as well as brackets at the bottom. 14* SYMBOL: all the symbols.
15* BRACKET: special brackets-only layer for programming
15* SHORTCUTS: sends Hyper keys for Autohotkey to interpret. I use this to switch between specific apps. 16* SHORTCUTS: sends Hyper keys for Autohotkey to interpret. I use this to switch between specific apps.
17* MOUSE: use mouse keys
18
19Updates
20-------
21
222016/12/10:
23* toggle for brackets layer is now on left thumb cluster.
24
252016/11/05:
26* removed brackets anywhere but in brackets layer
27* added mouse layer back in
28* put semicolon-newline and end-newline on symbol layer
29* replaced all HYPR with MEH, added more shortcut keys \ No newline at end of file
diff --git a/keyboards/ergodox/keymaps/dvorak_programmer/keymap.c b/keyboards/ergodox/keymaps/dvorak_programmer/keymap.c
index 5100115a6..f3d02f688 100644
--- a/keyboards/ergodox/keymaps/dvorak_programmer/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_programmer/keymap.c
@@ -13,6 +13,7 @@
13#define SYMBOL 6 13#define SYMBOL 6
14#define BRACKETS 7 14#define BRACKETS 7
15#define SHORTCUTS 8 15#define SHORTCUTS 8
16#define MOUSE 9
16 17
17// macros 18// macros
18#define MC_COPY_LINE 0 19#define MC_COPY_LINE 0
@@ -57,13 +58,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57[BASE] = KEYMAP( // layer 0 : default 58[BASE] = KEYMAP( // layer 0 : default
58 // left hand 59 // left hand
59 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 60 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
60 LT(BRACKETS,KC_TAB), KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, MO(KEY_SEL), 61 LT(MOUSE,KC_TAB), KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, MO(KEY_SEL),
61 MO(SHELL_NAV), KC_A, KC_O, KC_E, KC_U, KC_I, 62 MO(SHELL_NAV), KC_A, KC_O, KC_E, KC_U, KC_I,
62 KC_FN3, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, MO(KEY_NAV), 63 KC_FN3, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, MO(KEY_NAV),
63 OSL(SHORTCUTS),KC_FN4, KC_FN5,OSL(SYMBOL),MO(NUMBER), 64 OSL(SHORTCUTS),KC_FN4, KC_FN5,OSL(SYMBOL),MO(NUMBER),
64 // thumb cluster 65 // thumb cluster
65 RCTL(KC_F), RCTL(KC_S), 66 MO(BRACKETS), RCTL(KC_S),
66 RCTL(KC_DEL), 67 RCTL(KC_DEL),
67 KC_BSPC,RCTL(KC_BSPC),KC_DEL, 68 KC_BSPC,RCTL(KC_BSPC),KC_DEL,
68 // right hand 69 // right hand
69 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSLS, 70 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSLS,
@@ -71,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, 72 KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
72 KC_PGDN, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(TD_SHIFT_CAPSLOCK), 73 KC_PGDN, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(TD_SHIFT_CAPSLOCK),
73 // lower keys - browser tab control 74 // lower keys - browser tab control
74 RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), RCTL(KC_K), RCTL(KC_W), 75 RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), LALT(KC_LEFT), RCTL(KC_W),
75 // thumb cluster 76 // thumb cluster
76 M(SEMICOLON_NEWLINE), M(END_NEWLINE), 77 KC_HOME,KC_END,
77 KC_UP, 78 KC_UP,
78 KC_DOWN,KC_ENT, KC_SPC 79 KC_DOWN,KC_ENT, KC_SPC
79 ), 80 ),
@@ -96,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
96 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 97 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
97 RCTL(KC_L), RCTL(KC_W), KC_HOME, KC_UP, KC_END, LALT(KC_D), RCTL(KC_R), 98 RCTL(KC_L), RCTL(KC_W), KC_HOME, KC_UP, KC_END, LALT(KC_D), RCTL(KC_R),
98 LALT(KC_B), KC_LEFT, KC_DOWN, KC_RIGHT, LALT(KC_F), LALT(KC_DOT), 99 LALT(KC_B), KC_LEFT, KC_DOWN, KC_RIGHT, LALT(KC_F), LALT(KC_DOT),
99 RCTL(KC_C), RCTL(KC_U), M(SCREEN_COPY_MODE), M(SCREEN_PASTE), HYPR(KC_V), RCTL(KC_K), M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND), 100 RCTL(KC_C), RCTL(KC_U), M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V), RCTL(KC_K), M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
100 // bottom row 101 // bottom row
101 M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB), KC_TRNS, KC_TRNS, 102 M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB), KC_TRNS, KC_TRNS,
102 // thumb cluster 103 // thumb cluster
@@ -187,21 +188,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
187 188
188[SYMBOL] = KEYMAP( 189[SYMBOL] = KEYMAP(
189 // left hand 190 // left hand
190 KC_NO,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 191 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
191 KC_TRNS,KC_TRNS, M(OPEN_CLOSE_PAREN), KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, 192 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
192 KC_TRNS,KC_TRNS, M(OPEN_CLOSE_BRACKET), KC_LBRC, KC_RBRC, M(OPEN_CLOSE_DOUBLE_QUOTE), 193 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
193 KC_TRNS,M(SEMICOLON_NEWLINE),M(OPEN_CLOSE_CURLY), KC_LCBR, KC_RCBR, M(OPEN_CLOSE_SINGLE_QUOTE),KC_TRNS, 194 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
194 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 195 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
195 KC_TRNS,KC_TRNS, 196 KC_TRNS,KC_TRNS,
196 KC_TRNS, 197 KC_TRNS,
197 KC_TRNS,KC_TRNS,KC_TRNS, 198 KC_TRNS,KC_TRNS,KC_TRNS,
198 // right hand 199 // right hand
199 KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_TRNS, 200 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
200 KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS, 201 KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS,
201 KC_MINS, KC_DLR, KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS, 202 KC_MINS, KC_DLR, KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS,
202 KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT, KC_HASH, KC_TRNS, KC_TRNS, 203 KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT, KC_HASH, KC_TRNS, KC_TRNS,
203 KC_LBRC, KC_RBRC, TD(TD_BRK_LEFT), TD(TD_BRK_RIGHT), KC_TRNS, 204 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
204 KC_TRNS, KC_TRNS, 205 M(SEMICOLON_NEWLINE), M(END_NEWLINE),
205 KC_TRNS, 206 KC_TRNS,
206 KC_TRNS, KC_TRNS, KC_TRNS 207 KC_TRNS, KC_TRNS, KC_TRNS
207), 208),
@@ -229,26 +230,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
229 230
230[SHORTCUTS] = KEYMAP( 231[SHORTCUTS] = KEYMAP(
231 // left hand 232 // left hand
232 KC_NO, HYPR(KC_F1), HYPR(KC_F2), HYPR(KC_F3), HYPR(KC_F4), HYPR(KC_F5), HYPR(KC_F6), 233 KC_NO, MEH(KC_F1), MEH(KC_F2), MEH(KC_F3), MEH(KC_F4), MEH(KC_F5), MEH(KC_F6),
233 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 234 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
234 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 235 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
235 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 236 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
236 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 237 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
237 KC_TRNS,KC_TRNS, 238 MEH(KC_0),MEH(KC_1),
238 KC_TRNS, 239 MEH(KC_2),
239 KC_TRNS,KC_TRNS,KC_TRNS, 240 MEH(KC_3),MEH(KC_4),MEH(KC_5),
240 // right hand 241 // right hand
241 HYPR(KC_F7), HYPR(KC_F8), HYPR(KC_F9), HYPR(KC_F10), HYPR(KC_F11), HYPR(KC_F12), M(SWITCH_NDS), 242 MEH(KC_F7), MEH(KC_F8), MEH(KC_F9), MEH(KC_F10), MEH(KC_F11), MEH(KC_F12), M(SWITCH_NDS),
242 KC_TRNS, HYPR(KC_A), HYPR(KC_B), HYPR(KC_C), HYPR(KC_D), HYPR(KC_E), HYPR(KC_F), 243 KC_TRNS, MEH(KC_A), MEH(KC_B), MEH(KC_C), MEH(KC_D), MEH(KC_E), MEH(KC_F),
243 HYPR(KC_G), HYPR(KC_H), HYPR(KC_I), HYPR(KC_J), HYPR(KC_K), HYPR(KC_L), 244 MEH(KC_G), MEH(KC_H), MEH(KC_I), MEH(KC_J), MEH(KC_K), MEH(KC_L),
244 KC_TRNS, HYPR(KC_M), HYPR(KC_N), HYPR(KC_O), HYPR(KC_P), HYPR(KC_Q), HYPR(KC_R), 245 KC_TRNS, MEH(KC_M), MEH(KC_N), MEH(KC_O), MEH(KC_P), MEH(KC_Q), MEH(KC_R),
245 LALT(KC_LEFT),LALT(KC_RIGHT),KC_F5, LCTL(LGUI(KC_LEFT)), LCTL(LGUI(KC_RIGHT)), 246 MEH(KC_S), MEH(KC_T), MEH(KC_U), MEH(KC_V), MEH(KC_X),
247 MEH(KC_6), MEH(KC_7),
248 MEH(KC_8),
249 MEH(KC_9), MEH(KC_Y), MEH(KC_Z)
250),
251
252
253[MOUSE] = KEYMAP(
254 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
255 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
256 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
257 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
258 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
259 KC_TRNS, KC_TRNS,
260 KC_TRNS,
261 KC_TRNS, KC_TRNS, KC_TRNS,
262 // right hand
263 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
264 KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
265 KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
266 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
267 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
246 KC_TRNS, KC_TRNS, 268 KC_TRNS, KC_TRNS,
247 KC_TRNS, 269 KC_TRNS,
248 KC_TRNS, KC_TRNS, KC_TRNS 270 KC_TRNS, KC_BTN1, KC_BTN2
249), 271),
250 272
251
252}; 273};
253 274
254 275
diff --git a/keyboards/planck/keymaps/priyadi/Makefile b/keyboards/planck/keymaps/priyadi/Makefile
index f113f496c..d9d4f3d1d 100644
--- a/keyboards/planck/keymaps/priyadi/Makefile
+++ b/keyboards/planck/keymaps/priyadi/Makefile
@@ -1,8 +1,3 @@
1# Please remove if no longer applicable
2$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD)
3$(warning Please disable some options in the Makefile to resolve)
4
5
6# Build Options 1# Build Options
7# change to "no" to disable the options, or define them in the Makefile in 2# change to "no" to disable the options, or define them in the Makefile in
8# the appropriate keymap folder that will get included automatically 3# the appropriate keymap folder that will get included automatically
@@ -11,7 +6,7 @@ BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
11MOUSEKEY_ENABLE = no # Mouse keys(+4700) 6MOUSEKEY_ENABLE = no # Mouse keys(+4700)
12EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 7EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
13CONSOLE_ENABLE = no # Console for debug(+400) 8CONSOLE_ENABLE = no # Console for debug(+400)
14COMMAND_ENABLE = yes # Commands for debug and configuration 9COMMAND_ENABLE = no # Commands for debug and configuration
15NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
16BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 11BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
17MIDI_ENABLE = no # MIDI controls 12MIDI_ENABLE = no # MIDI controls
@@ -20,6 +15,7 @@ UNICODE_ENABLE = no # Unicode
20UNICODEMAP_ENABLE = yes # Unicode map 15UNICODEMAP_ENABLE = yes # Unicode map
21BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 16BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
22RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. 17RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
18API_SYSEX_ENABLE = no
23 19
24# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 20# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
25SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 21SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index b48173341..5df539def 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -26,7 +26,7 @@ CFLAGS += -fno-inline-small-functions
26CFLAGS += -fno-strict-aliasing 26CFLAGS += -fno-strict-aliasing
27 27
28CPPFLAGS += $(COMPILEFLAGS) 28CPPFLAGS += $(COMPILEFLAGS)
29CPPFLAGS += -fno-exceptions 29CPPFLAGS += -fno-exceptions -std=c++11
30 30
31LDFLAGS +=-Wl,--gc-sections 31LDFLAGS +=-Wl,--gc-sections
32 32
diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/tmk_core/protocol/lufa/adafruit_ble.cpp
index 37194e77a..fd6edd42c 100644
--- a/tmk_core/protocol/lufa/adafruit_ble.cpp
+++ b/tmk_core/protocol/lufa/adafruit_ble.cpp
@@ -86,7 +86,7 @@ struct queue_item {
86 86
87 uint16_t consumer; 87 uint16_t consumer;
88 struct __attribute__((packed)) { 88 struct __attribute__((packed)) {
89 uint8_t x, y, scroll, pan; 89 int8_t x, y, scroll, pan;
90 } mousemove; 90 } mousemove;
91 }; 91 };
92}; 92};
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 04:48:16 +0000