summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2015-02-19 19:35:57 -0500
committerJack Humbert <jack.humb@gmail.com>2015-02-19 19:35:57 -0500
commita4d091eb525d574ab24a545ecb22dfdb0b26fc1e (patch)
tree2efed984cf7872c978bf01ffa912c89da53981ce
parent4a3c0839f9df1dea8520dee6e420cb27b5337876 (diff)
joe
-rw-r--r--keyboard/planck/Makefile3
-rw-r--r--keyboard/planck/keymap_jack.c16
-rw-r--r--keyboard/planck/keymap_joe.c107
3 files changed, 117 insertions, 9 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index 22101096e9..3bc12da023 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -55,12 +55,11 @@ SRC = keymap_common.c \
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
else
- SRC := keymap_sean.c $(SRC)
+ SRC := keymap_joe.c $(SRC)
endif
CONFIG_H = config.h
-
# MCU name
#MCU = at90usb1287
MCU = atmega32u4
diff --git a/keyboard/planck/keymap_jack.c b/keyboard/planck/keymap_jack.c
index fd30069ed2..5b226813d0 100644
--- a/keyboard/planck/keymap_jack.c
+++ b/keyboard/planck/keymap_jack.c
@@ -2,23 +2,23 @@
const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = KEYMAP( /* Jack */
- ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC,
- TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT,
+ TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC,
+ ESC, A, S, D, F, G, H, J, K, L, SCLN, QUOT,
LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT,
RSFT, LCTL, LALT, LGUI, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT),
[1] = KEYMAP( /* Jack colemak */
- ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC,
- TAB, A, R, S, T, D, H, N, E, I, O, QUOT,
+ TAB, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC,
+ ESC, A, R, S, T, D, H, N, E, I, O, QUOT,
LSFT, Z, X, C, V, B, K, M, COMM, DOT, SLSH, ENT,
FN3, LCTL, LALT, LGUI, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT),
[2] = KEYMAP( /* Jack RAISE */
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC,
- TRNS, FN3, FN4, TRNS, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS,
+ TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS,
TRNS, F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, TRNS,
TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY),
[3] = KEYMAP( /* Jack LOWER */
FN22, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC,
- TRNS, FN3, FN4, TRNS, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
+ TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS,
TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY),
};
@@ -28,7 +28,7 @@ const uint16_t PROGMEM fn_actions[] = {
// [1] = ACTION_LAYER_ON_OFF(1),
// [2] = ACTION_LAYER_ON_OFF(2),
[3] = ACTION_DEFAULT_LAYER_SET(0),
- [4] = ACTION_DEFAULT_LAYER_SET(1),
+ [4] = ACTION_DEFAULT_LAYER_SET(1),
[10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
[11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
@@ -46,4 +46,6 @@ const uint16_t PROGMEM fn_actions[] = {
[23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
[24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
[28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
+
+ [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
};
diff --git a/keyboard/planck/keymap_joe.c b/keyboard/planck/keymap_joe.c
new file mode 100644
index 0000000000..5e89792180
--- /dev/null
+++ b/keyboard/planck/keymap_joe.c
@@ -0,0 +1,107 @@
+#include "keymap_common.h"
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = KEYMAP( /* Joe */
+ ESC, Q, W, E, R, T, Y, U, I, O, P, MINS,
+ BSPC, A, S, D, F, G, H, J, K, L, SCLN, ENT,
+ TAB, Z, X, C, V, B, N, M, COMM, DOT, SLSH, QUOT,
+ LCTL, LGUI, LALT, LSFT, FN1, SPC, FN0, LEFT, DOWN, UP, RGHT),
+[1] = KEYMAP( /* Joe colemak */
+ ESC, Q, W, F, P, G, J, L, U, Y, SCLN, MINS,
+ BSPC, A, R, S, T, D, H, N, E, I, O, ENT,
+ TAB, Z, X, C, V, B, K, M, COMM, DOT, SLSH, QUOT,
+ LCTL, LGUI, LALT, LSFT, FN1, SPC, FN0, LEFT, DOWN, UP, RGHT),
+[2] = KEYMAP( /* Joe RAISE */
+ F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,
+ DEL, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, TRNS,
+ BSLS, FN5, FN6, FN3, FN4, MENU, CAPS, INS, PSCR, LBRC, RBRC, FN21,
+ TRNS, TRNS, TRNS, TRNS, FN2, TRNS, FN0, FN26, FN27, FN28, FN29),
+[3] = KEYMAP( /* Joe LOWER */
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN7, FN8, FN9, FN30, FN31,
+ DEL, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS,
+ FN25, LSFT, RSFT, PAUS, TRNS, TRNS, TRNS, TRNS, TRNS, FN23, FN24, EQL,
+ TRNS, TRNS, TRNS, TRNS, FN1, TRNS, FN2, HOME, PGDN, PGUP, END),
+[4] = KEYMAP( /* Joe LOWER + RAISE */
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
+ TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY),
+};
+
+enum macro_id {
+ M_Q0,
+ M_Q1,
+ M_Q2,
+ M_Q3,
+ M_Q4
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+ [0] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay
+ [1] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay
+ [2] = ACTION_LAYER_MOMENTARY(4), // to Fn overlay
+
+ [3] = ACTION_DEFAULT_LAYER_SET(0),
+ [4] = ACTION_DEFAULT_LAYER_SET(1),
+
+ [5] = ACTION_MODS_KEY(MOD_LCTL, KC_PGDN),
+ [6] = ACTION_MODS_KEY(MOD_LCTL, KC_PGUP),
+
+ [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
+ [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
+ [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
+ [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
+ [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
+ [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
+ [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
+ [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
+ [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
+ [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
+ [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
+ [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
+ [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
+ [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
+ [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
+ [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
+
+ [7] = ACTION_MACRO(M_Q0),
+ [8] = ACTION_MACRO(M_Q1),
+ [9] = ACTION_MACRO(M_Q2),
+ [30] = ACTION_MACRO(M_Q3),
+ [31] = ACTION_MACRO(M_Q4),
+
+ [26] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_LEFT),
+ [27] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_DOWN),
+ [28] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_UP),
+ [29] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_RGHT),
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+ keyevent_t event = record->event;
+ switch (id) {
+ case M_Q0:
+ return event.pressed ?
+ MACRO( D(LSFT), T(SCLN), U(LSFT), T(SLSH), END ) :
+ MACRO_NONE;
+ case M_Q1:
+ return event.pressed ?
+ MACRO( D(LSFT), T(SCLN), T(9), U(LSFT), END ) :
+ MACRO_NONE;
+ case M_Q2:
+ return event.pressed ?
+ MACRO( D(LSFT), T(0), T(SCLN), U(LSFT), END ) :
+ MACRO_NONE;
+ case M_Q3:
+ return event.pressed ?
+ MACRO( D(LSFT), T(9), T(SCLN), U(LSFT), END ) :
+ MACRO_NONE;
+ case M_Q4:
+ return event.pressed ?
+ MACRO( D(LSFT), T(SCLN), T(0), U(LSFT), END ) :
+ MACRO_NONE;
+
+ }
+ return MACRO_NONE;
+} \ No newline at end of file