aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Werner <mail@renewerner.net>2016-08-25 12:25:57 +0200
committerRené Werner <mail@renewerner.net>2016-08-25 12:25:57 +0200
commit1bbd3c1eea78abf0b36a289fb37f80dfc4f9c8bb (patch)
tree7c02c2f1c4138de03e893bb02fdad4cbd883981f
parent6a61c89477678e3df9aba9189b3dd67fc24e94ab (diff)
downloadqmk_firmware-1bbd3c1eea78abf0b36a289fb37f80dfc4f9c8bb.tar.gz
qmk_firmware-1bbd3c1eea78abf0b36a289fb37f80dfc4f9c8bb.zip
fixed defaulf keymap, added my own keymap
now the LEDs are working like they should
-rw-r--r--keyboards/kitten_paw/Makefile2
-rw-r--r--keyboards/kitten_paw/keymaps/ickerwx/keymap.c128
-rw-r--r--keyboards/kitten_paw/keymaps/ickerwx/readme.md18
-rw-r--r--keyboards/kitten_paw/kitten_paw.c19
-rw-r--r--keyboards/kitten_paw/kitten_paw.h11
-rw-r--r--keyboards/kitten_paw/led.c47
-rw-r--r--keyboards/kitten_paw/matrix.c3
7 files changed, 123 insertions, 105 deletions
diff --git a/keyboards/kitten_paw/Makefile b/keyboards/kitten_paw/Makefile
index 912292173..3b5585ed6 100644
--- a/keyboards/kitten_paw/Makefile
+++ b/keyboards/kitten_paw/Makefile
@@ -69,7 +69,7 @@ BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
69AUDIO_ENABLE ?= no # Audio output on port C6 69AUDIO_ENABLE ?= no # Audio output on port C6
70 70
71CUSTOM_MATRIX = yes 71CUSTOM_MATRIX = yes
72SRC += matrix.c led.c 72SRC += matrix.c
73 73
74ifndef QUANTUM_DIR 74ifndef QUANTUM_DIR
75 include ../../Makefile 75 include ../../Makefile
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c
index 276fc30a8..9a00c80dc 100644
--- a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c
@@ -3,8 +3,14 @@
3 3
4#define _______ KC_TRNS 4#define _______ KC_TRNS
5#define XXXXXXX KC_NO 5#define XXXXXXX KC_NO
6#define LC LCTL 6#define C(kc) LCTL(KC_##kc)
7#define RA(kc) RALT(KC_##kc)
7#define KC_SLCT KC_SELECT 8#define KC_SLCT KC_SELECT
9#define MEDAPP LT(MEDIA, KC_APP)
10#undef S
11#define S(kc) LSFT(KC_##kc)
12
13uint8_t current_layer_global = 255;
8 14
9enum layers { 15enum layers {
10 DEFAULT, 16 DEFAULT,
@@ -33,75 +39,75 @@ enum macro_id {
33 39
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 40const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 [DEFAULT] = KEYMAP(\ 41 [DEFAULT] = KEYMAP(\
36 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ 42 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \
37 KC_GRV, 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_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ 43 KC_GRV, 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_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \
38 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, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ 44 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, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \
39 F(0), 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_P4, KC_P5, KC_P6, \ 45 F(0), 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_P4, KC_P5, KC_P6, \
40 F(8),KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT, KC_SLSH, F(9), KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ 46 F(8),KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, F(9), KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \
41 F(1),KC_LGUI, F(3), LT(MISC, KC_SPC), F(4), F(5), LT(MEDIA, KC_APP), F(2), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT), 47 F(1),KC_LGUI, F(3), LT(MISC, KC_SPC), F(4), F(5), MEDAPP, F(2), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT),
42 /* Layer 1: Programming Layer 1, emulating US layout */ 48 /* Layer 1: Programming Layer 1, emulating US l ayout */
43 [PROG1] = KEYMAP(\ 49 [PROG1] = KEYMAP(\
44 KC_ESC,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______, \ 50 KC_ESC,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \
45 M(GRV),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, KC_SLSH, S(KC_0), _______, _______,_______,_______, _______,_______,_______,_______, \ 51 M(GRV),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_SLSH, S(0),_______, _______,_______,_______, _______,_______,_______,_______, \
46 _______,_______,_______,_______,_______,_______, KC_Z,_______,_______,_______, _______,RALT(KC_8),RALT(KC_9),RALT(KC_MINS), _______,_______,_______, _______,_______,_______,_______, \ 52 _______,_______,_______,_______,_______,_______, KC_Z,_______,_______,_______,_______, RA(8), RA(9),RA(MINS), _______,_______,_______, _______,_______,_______,_______, \
47 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,S(KC_COMM),S(KC_BSLS), _______, _______,_______,_______, \ 53 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,S(COMM),S(BSLS), _______, _______,_______,_______, \
48 MO(PROG2),_______, KC_Y,_______,_______,_______,_______,_______,_______,_______, _______, S(KC_7), MO(PROG2), _______, _______,_______,_______,_______, \ 54 MO(PROG2),_______, KC_Y,_______,_______,_______,_______,_______,_______,_______,_______, S(7), MO(PROG2), _______, _______,_______,_______,_______, \
49 _______,_______,_______, _______, _______, _______, _______, _______, _______,_______,_______, _______,_______), 55 _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______),
50 /* Layer 2: programming layer 2 56 /* Layer 2: programming layer 2
51 all keys that are not FN keys are sent as LSFT+key on this layer 57 all keys that are not FN keys are sent as LSFT+key on this layer
52 */ 58 */
53 [PROG2] = KEYMAP(\ 59 [PROG2] = KEYMAP(\
54 _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, _______, _______, _______, _______,_______,_______, \ 60 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \
55RALT(KC_RBRC), _______,RALT(KC_Q),KC_BSLS,_______,_______,M(CFLEX),S(KC_6),S(KC_RBRC),S(KC_8), S(KC_9), S(KC_SLSH), KC_RBRC, _______, _______,_______,_______, _______,_______,_______,_______, \ 61 RA(RBRC),_______, RA(Q),KC_BSLS,_______,_______,M(CFLEX), S(6),S(RBRC), S(8), S(9),S(SLSH),KC_RBRC,_______, _______,_______,_______, _______,_______,_______,_______, \
56 _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, _______, RALT(KC_7),RALT(KC_0),RALT(KC_NUBS), _______,_______,_______, _______,_______,_______,_______, \ 62 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RA(7), RA(0),RA(NUBS), _______,_______,_______, _______,_______,_______,_______, \
57 _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, S(KC_DOT), S(KC_2), _______, _______,_______,_______, \ 63 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, S(DOT), S(2), _______, _______,_______,_______, \
58 _______,S(KC_NUBS), _______,_______,_______,_______, _______,_______, _______,KC_NUBS,S(KC_NUBS), S(KC_MINS), _______, _______, _______,_______,_______,_______, \ 64 _______,S(NUBS),_______,_______,_______,_______,_______,_______,_______,KC_NUBS,S(NUBS),S(MINS), _______, _______, _______,_______,_______,_______, \
59 _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,_______), \ 65 _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______),
60 /* Layer 3: media layer */ 66 /* Layer 3: media layer */
61 [MEDIA] = KEYMAP(\ 67 [MEDIA] = KEYMAP(\
62 KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ 68 KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \
63 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 69 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \
64 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 70 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \
65 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ 71 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \
66 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 72 XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \
67 XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______,XXXXXXX, KC_MRWD,KC_MSTP,KC_MFFD, XXXXXXX,XXXXXXX), 73 XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______,XXXXXXX, KC_MRWD,KC_MSTP,KC_MFFD, XXXXXXX,XXXXXXX),
68 /* Layer 4: Mouse layer */ 74 /* Layer 4: Mouse layer */
69 [MOUSE1] = KEYMAP(\ 75 [MOUSE1] = KEYMAP(\
70 F(6),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ 76 F(6),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \
71 XXXXXXX,KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 77 _______,KC_ACL0,KC_ACL1,KC_ACL2,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \
72 XXXXXXX,KC_BTN4, KC_WH_D, KC_MS_U, KC_WH_U, XXXXXXX, KC_Y,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_DEL, KC_END,KC_PGDN, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 78 _______,KC_BTN4,KC_WH_D,KC_MS_U,KC_WH_U,_______, C(Z),_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \
73 F(0),KC_BTN5, KC_MS_L, KC_MS_D, KC_MS_R, F(7),KC_WH_L,KC_WH_D,KC_WH_U, KC_WH_R, XXXXXXX,XXXXXXX, KC_BTN1, XXXXXXX,XXXXXXX,XXXXXXX, \ 79 _______,KC_BTN5,KC_MS_L,KC_MS_D,KC_MS_R, F(7),KC_WH_L,KC_WH_D,KC_WH_U,KC_WH_R,_______,_______, _______, _______,_______,_______, \
74 MO(MOUSE2),XXXXXXX,LC(KC_Y),LC(KC_X),LC(KC_C),LC(KC_V),XXXXXXX,KC_BTN2,KC_BTN3,LC(KC_PGUP),LC(KC_PGDN),XXXXXXX, KC_RSFT, KC_UP, XXXXXXX,XXXXXXX,XXXXXXX,KC_PENT, \ 80 MO(MOUSE2),_______, C(Y), C(X), C(C), C(V),_______,KC_BTN2,KC_BTN3,C(PGUP),C(PGDN),_______, KC_RSFT, _______, _______,_______,_______,_______, \
75 KC_LCTL,KC_LGUI,KC_LALT, KC_BTN1, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT, XXXXXXX,XXXXXXX), 81 KC_LCTL,_______,KC_LALT, KC_BTN1, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, _______,_______,_______, _______,_______),
76 /* Layer 5: Mouse layer 2*/ 82 /* Layer 5: Mouse layer 2*/
77 [MOUSE2] = KEYMAP(\ 83 [MOUSE2] = KEYMAP(\
78 _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______,_______, _______,_______,_______, \ 84 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \
79 _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ 85 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \
80 _______,_______,KC_BTN2, KC_WH_U, KC_BTN3, _______,_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ 86 _______,_______,KC_BTN2,KC_WH_U,KC_BTN3,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \
81 _______,_______,KC_WH_L, KC_WH_D, KC_WH_R, _______,KC_MS_L,KC_MS_D,KC_MS_U, KC_MS_R, _______,_______, _______, _______,_______,_______, \ 87 _______,_______,KC_WH_L,KC_WH_D,KC_WH_R,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______, _______, _______,_______,_______, \
82 _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______, _______, _______, _______,_______,_______,_______, \ 88 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______, \
83 _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______), 89 _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______),
84 /* Layer 6: Misc layer */ 90 /* Layer 6: Misc layer */
85 [MISC] = KEYMAP(\ 91 [MISC] = KEYMAP(\
86 XXXXXXX, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX,XXXXXXX,XXXXXXX, \ 92 _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______,_______,_______, \
87 XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 93 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \
88 XXXXXXX,KC_SLCT,LC(KC_W), KC_UP, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_BSPC, KC_DEL, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 94 _______,KC_SLCT, C(W), KC_UP,_______,_______,_______,_______,KC_BSPC, KC_DEL,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \
89 XXXXXXX,XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX,KC_HOME,KC_PGDN,KC_PGUP, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ 95 _______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,KC_HOME,KC_PGDN,KC_PGUP,_______,_______,_______, _______, _______,_______,_______, \
90 KC_LSFT,XXXXXXX,LC(KC_Y),LC(KC_X),LC(KC_C),LC(KC_V), KC_SPC, KC_END,XXXXXXX,LC(KC_PGUP),LC(KC_PGDN),XXXXXXX, KC_RSFT, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ 96 KC_LSFT,_______, C(Y), C(X), C(C), C(V), KC_SPC, KC_END,_______,C(PGUP),C(PGDN),_______, _______, _______, _______,_______,_______,_______, \
91 KC_LCTL,KC_LGUI, KC_LALT, LT(MISC, KC_SPC), KC_RALT,KC_RGUI, KC_APP,KC_RCTL, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX), 97 _______,_______,_______, LT(MISC, KC_SPC), _______,_______,_______,_______, _______,_______,_______, _______,_______),
92}; 98};
93 99
94const uint16_t PROGMEM fn_actions[] = { 100const uint16_t PROGMEM fn_actions[] = {
95 [0] = ACTION_LAYER_TAP_TOGGLE(MOUSE1), // toggle enable mouse layer (4) 101 [0] = ACTION_LAYER_TAP_TOGGLE(MOUSE1), // tap-toggle mouse layer (4)
96 [1] = ACTION_FUNCTION_TAP(LCTRL_BRACKET), // tap to print [ 102 [1] = ACTION_FUNCTION_TAP(LCTRL_BRACKET), // tap to print [
97 [2] = ACTION_FUNCTION_TAP(RCTRL_BRACKET), // tap to print ] 103 [2] = ACTION_FUNCTION_TAP(RCTRL_BRACKET), // tap to print ]
98 [3] = ACTION_FUNCTION_TAP(LALT_CURLY), // tap to print { 104 [3] = ACTION_FUNCTION_TAP(LALT_CURLY), // tap to print {
99 [4] = ACTION_FUNCTION_TAP(RALT_CURLY), // tap to print } 105 [4] = ACTION_FUNCTION_TAP(RALT_CURLY), // tap to print }
100 [5] = ACTION_LAYER_TAP_TOGGLE(PROG1), // toggle programming layer 1 (1) 106 [5] = ACTION_LAYER_TAP_TOGGLE(PROG1), // tap-toggle programming layer 1
101 [6] = ACTION_LAYER_SET_CLEAR(DEFAULT), 107 [6] = ACTION_LAYER_SET_CLEAR(DEFAULT),
102 [7] = ACTION_FUNCTION_TAP(CTRL_CLICK), 108 [7] = ACTION_FUNCTION_TAP(CTRL_CLICK),
103 [8] = ACTION_FUNCTION_TAP(LSHFT_PAREN), // tap to print ( 109 [8] = ACTION_FUNCTION_TAP(LSHFT_PAREN), // tap to print (
104 [9] = ACTION_FUNCTION_TAP(RSHFT_PAREN), // tap to print ) 110 [9] = ACTION_FUNCTION_TAP(RSHFT_PAREN), // tap to print )
105}; 111};
106 112
107const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 113const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -126,7 +132,22 @@ void matrix_init_user(void) {
126} 132}
127 133
128void matrix_scan_user(void) { 134void matrix_scan_user(void) {
135 uint8_t layer;
136 layer = biton32(layer_state);
129 137
138 if (current_layer_global != layer) {
139 current_layer_global = layer;
140
141 // unset CAPSLOCK and SCROLL LOCK LEDs
142 led_set_kb(host_keyboard_leds() & ~(1<<USB_LED_CAPS_LOCK));
143 led_set_kb(host_keyboard_leds() & ~(1<<USB_LED_SCROLL_LOCK));
144 // set SCROLL LOCK LED when the mouse layer is active, CAPS LOCK when PROG layer is active
145 if (layer == MOUSE1 || layer == MOUSE2) {
146 led_set_kb(host_keyboard_leds() | (1<<USB_LED_SCROLL_LOCK));
147 } else if (layer == PROG1 || layer == PROG2) {
148 led_set_kb(host_keyboard_leds() | (1<<USB_LED_CAPS_LOCK));
149 }
150 }
130} 151}
131 152
132void led_set_user(uint8_t usb_led) { 153void led_set_user(uint8_t usb_led) {
@@ -209,6 +230,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
209 keycode == KC_BSLS || 230 keycode == KC_BSLS ||
210 keycode == KC_GRV 231 keycode == KC_GRV
211 )) { 232 )) {
233 // LSFT is the modifier for this layer, so we set LSFT for every key to get the expected behavior
212 if (record->event.pressed) { 234 if (record->event.pressed) {
213 register_mods(MOD_LSFT); 235 register_mods(MOD_LSFT);
214 } else { 236 } else {
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/readme.md b/keyboards/kitten_paw/keymaps/ickerwx/readme.md
new file mode 100644
index 000000000..0d23be4ea
--- /dev/null
+++ b/keyboards/kitten_paw/keymaps/ickerwx/readme.md
@@ -0,0 +1,18 @@
1# My personal keymap for the Kitten Paw controller
2
3This keymap only works correctly when you have your OS configured with a German keymap. Use the keymap however you like. It's most likely a living thing that will never be quite finished.
4
5## Description of the layers
6Layer 0 (DEFAULT) works just like you would expect a keyboard to work, mostly, except:
7Caps Lock switches to the mouse layer, RGUI and APP are switches to the programming layer and media layer.
8Mouse and programming layer switches can be held or double-tapped to lock.
9Holding space switches to the MISC layer where I currently accumulate useful shortcuts.
10Tapping left and right Shift, Ctrl and Alt will send (), [] and {} respectively.
11
12Layers 1 and 2 (PROG1 and PROG2) emulate the US layout while still using a German OS keymap setting. I was annoyed of having to change the OS settings every time I wanted to use the US layout for coding, so I made these layers to behave just like the US layout even though the OS still uses German. The shift keys were a bit tricky, I had to use them as MO(PROG2) switches, so to get the actual expected behavior I enable LSFT for almost every keypress on PROG2 in ```process_record_user```. Since the shift keys are MO() function keys, they do not print () at the moment, which sucks. I'm working on it.
13
14Layer 3 (MEDIA) just has a couple of media keys on it, mainly around the cursor keys and nav key cluster.
15
16Layers 4 and 5 (MOUSE1 and MOUSE2) are mouse layers. Move the cursor using ESDF, scroll using HJKL, Space for left click, N and M for right and middle click. There's more, look at the keymap.
17
18Layer 6 is a layer I don't have a good name for, so I call it MISC. You'll find cursor keys at ESDF, other navigation keys around the HJKL cluster and F12 to F24 on the F-keys. For now. \ No newline at end of file
diff --git a/keyboards/kitten_paw/kitten_paw.c b/keyboards/kitten_paw/kitten_paw.c
index 8713baf43..92f64b06b 100644
--- a/keyboards/kitten_paw/kitten_paw.c
+++ b/keyboards/kitten_paw/kitten_paw.c
@@ -4,7 +4,6 @@ void matrix_init_kb(void) {
4 // put your keyboard start-up code here 4 // put your keyboard start-up code here
5 // runs once when the firmware starts up 5 // runs once when the firmware starts up
6 6
7 matrix_init_quantum();
8 matrix_init_user(); 7 matrix_init_user();
9} 8}
10 9
@@ -12,7 +11,6 @@ void matrix_scan_kb(void) {
12 // put your looping keyboard code here 11 // put your looping keyboard code here
13 // runs every cycle (a lot) 12 // runs every cycle (a lot)
14 13
15 matrix_scan_quantum();
16 matrix_scan_user(); 14 matrix_scan_user();
17} 15}
18 16
@@ -25,6 +23,21 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
25 23
26void led_set_kb(uint8_t usb_led) { 24void led_set_kb(uint8_t usb_led) {
27 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here 25 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
28 26 CONFIG_LED_IO;
27 CONFIG_LED_IO;
28 print_dec(usb_led);
29 if (usb_led & (1<<USB_LED_CAPS_LOCK))
30 USB_LED_CAPS_LOCK_ON;
31 else
32 USB_LED_CAPS_LOCK_OFF;
33
34 if (usb_led & (1<<USB_LED_NUM_LOCK))
35 USB_LED_NUM_LOCK_ON;
36 else
37 USB_LED_NUM_LOCK_OFF;
38 if (usb_led & (1<<USB_LED_SCROLL_LOCK))
39 USB_LED_SCROLL_LOCK_ON;
40 else
41 USB_LED_SCROLL_LOCK_OFF;
29 led_set_user(usb_led); 42 led_set_user(usb_led);
30} 43}
diff --git a/keyboards/kitten_paw/kitten_paw.h b/keyboards/kitten_paw/kitten_paw.h
index a6c1d27de..189b721b9 100644
--- a/keyboards/kitten_paw/kitten_paw.h
+++ b/keyboards/kitten_paw/kitten_paw.h
@@ -3,6 +3,17 @@
3 3
4#include "quantum.h" 4#include "quantum.h"
5 5
6#define CONFIG_LED_IO \
7 DDRB |= (1<<7); \
8 DDRC |= (1<<5) | (1<<6);
9
10#define USB_LED_CAPS_LOCK_ON PORTC &= ~(1<<6)
11#define USB_LED_CAPS_LOCK_OFF PORTC |= (1<<6)
12#define USB_LED_NUM_LOCK_ON PORTB &= ~(1<<7)
13#define USB_LED_NUM_LOCK_OFF PORTB |= (1<<7)
14#define USB_LED_SCROLL_LOCK_ON PORTC &= ~(1<<5)
15#define USB_LED_SCROLL_LOCK_OFF PORTC |= (1<<5)
16
6// This a shortcut to help you visually see your layout. 17// This a shortcut to help you visually see your layout.
7// The first section contains all of the arguements 18// The first section contains all of the arguements
8// The second converts the arguments into a two-dimensional array 19// The second converts the arguments into a two-dimensional array
diff --git a/keyboards/kitten_paw/led.c b/keyboards/kitten_paw/led.c
deleted file mode 100644
index a1bf057c4..000000000
--- a/keyboards/kitten_paw/led.c
+++ /dev/null
@@ -1,47 +0,0 @@
1/*
2 Copyright 2014 Ralf Schmitt <ralf@bunkertor.net>
3
4 This program is free software: you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation, either version 2 of the License, or
7 (at your option) any later version.
8
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
13
14 You should have received a copy of the GNU General Public License
15 along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include <avr/io.h>
19#include "stdint.h"
20#include "led.h"
21
22/* LED pin configuration
23 *
24 * Scroll Lock PC5
25 * Caps Lock PC6
26 * Num Lock PB7
27 *
28 */
29void led_set(uint8_t usb_led) {
30 DDRB |= (1<<7);
31 DDRC |= (1<<5) | (1<<6);
32
33 if (usb_led & (1<<USB_LED_CAPS_LOCK))
34 PORTC &= ~(1<<6);
35 else
36 PORTC |= (1<<6);
37
38 if (usb_led & (1<<USB_LED_NUM_LOCK))
39 PORTB &= ~(1<<7);
40 else
41 PORTB |= (1<<7);
42
43 if (usb_led & (1<<USB_LED_SCROLL_LOCK))
44 PORTC &= ~(1<<5);
45 else
46 PORTC |= (1<<5);
47}
diff --git a/keyboards/kitten_paw/matrix.c b/keyboards/kitten_paw/matrix.c
index 46875293f..d436ad56c 100644
--- a/keyboards/kitten_paw/matrix.c
+++ b/keyboards/kitten_paw/matrix.c
@@ -67,6 +67,7 @@ void matrix_init(void) {
67 matrix[i] = 0; 67 matrix[i] = 0;
68 matrix_debouncing[i] = 0; 68 matrix_debouncing[i] = 0;
69 } 69 }
70 matrix_init_quantum();
70} 71}
71 72
72uint8_t matrix_scan(void) { 73uint8_t matrix_scan(void) {
@@ -94,7 +95,7 @@ uint8_t matrix_scan(void) {
94 } 95 }
95 } 96 }
96 } 97 }
97 98 matrix_scan_quantum();
98 return 1; 99 return 1;
99} 100}
100 101