From f8ed4ed573c798bd40a1063072fd619732a2d49a Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Tue, 21 Feb 2017 09:39:51 +0700 Subject: Initial work for my kbod support in qmk_firmware - Wiring layout done No actual keymap yet --- keyboards/handwired/kbod/keymaps/default/keymap.c | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 keyboards/handwired/kbod/keymaps/default/keymap.c (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c new file mode 100644 index 000000000..9245270eb --- /dev/null +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +#include "kbod.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( /* Base */ + KC_A, KC_1, KC_H, \ + KC_TAB, KC_SPC \ +), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} \ No newline at end of file -- cgit v1.2.3 From 8b206e1e75f487a473b8a58223c857363ce0a6e4 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Wed, 22 Feb 2017 06:40:48 +0700 Subject: Add initial keymap *crossfingers* --- keyboards/handwired/kbod/kbod.h | 4 - keyboards/handwired/kbod/keymaps/default/keymap.c | 97 +++++++++++++++++------ 2 files changed, 73 insertions(+), 28 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h index 629fb3eac..04ecdd392 100644 --- a/keyboards/handwired/kbod/kbod.h +++ b/keyboards/handwired/kbod/kbod.h @@ -3,10 +3,6 @@ #include "quantum.h" -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 9245270eb..137ddf387 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -1,43 +1,92 @@ #include "kbod.h" +#define _____ KC_TRNS + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Base */ - KC_A, KC_1, KC_H, \ - KC_TAB, KC_SPC \ -), + KEYMAP( /* Base */ + F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, + 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_BSLASH, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPO, + LT(1, KC_LEAD), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + KEYMAP( /* Cursor layer */ + KC_GRAVE, 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_DEL, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, + _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_UP, _____, + _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ + ), + KEYMAP( /* Multimedia layer */ + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, _____, + LT(3, KC_LEAD), _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 + ), + KEYMAP( /* Multimedia layer */ + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, _____, + _____, _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + ), }; const uint16_t PROGMEM fn_actions[] = { - + [0] = ACTION_FUNCTION(0), }; -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { + static uint8_t shift_esc_shift_mask; + switch (id) { + case 0: + shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; + if (record->event.pressed) { + if (shift_esc_shift_mask) { + add_key(KC_GRV); + send_keyboard_report(); + } else { + add_key(KC_ESC); + send_keyboard_report(); + } + } else { + if (shift_esc_shift_mask) { + del_key(KC_GRV); + send_keyboard_report(); + } else { + del_key(KC_ESC); + send_keyboard_report(); + } } - return MACRO_NONE; -}; - + break; + } +} -void matrix_init_user(void) { -} +LEADER_EXTERNS(); void matrix_scan_user(void) { + LEADER_DICTIONARY() { + leading = false; + leader_end(); + SEQ_ONE_KEY(KC_B) { + layer_switch(0); + } + SEQ_ONE_KEY(KC_C) { + layer_switch(1); + } + SEQ_ONE_KEY(KC_M) { + layer_switch(2); + } + } } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + return MACRO_NONE; +}; void led_set_user(uint8_t usb_led) { -- cgit v1.2.3 From 7614c6b7a75c93b248d36f039f919ab925afde32 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Fri, 24 Feb 2017 12:06:10 +0700 Subject: Remove lead keys, fix some typos, rearrange layers --- keyboards/handwired/kbod/kbod.h | 2 +- keyboards/handwired/kbod/keymaps/default/keymap.c | 37 ++++++----------------- 2 files changed, 10 insertions(+), 29 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h index 04ecdd392..356063624 100644 --- a/keyboards/handwired/kbod/kbod.h +++ b/keyboards/handwired/kbod/kbod.h @@ -6,7 +6,7 @@ #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, K2C, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \ k40, k41, k42, k43, k44, k45, k46, k47 \ ) \ diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 137ddf387..463b1fc8b 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -7,29 +7,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, 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_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPO, - LT(1, KC_LEAD), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPC, + MO(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), KEYMAP( /* Cursor layer */ KC_GRAVE, 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_DEL, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, + TO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + TO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_UP, _____, - _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ + _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ ), KEYMAP( /* Multimedia layer */ _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, _____, - LT(3, KC_LEAD), _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 + TO(0), _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, _____, - _____, _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + TO(0), _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 ), }; @@ -37,6 +37,7 @@ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), }; +#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { static uint8_t shift_esc_shift_mask; switch (id) { @@ -63,31 +64,11 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } } - -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_B) { - layer_switch(0); - } - SEQ_ONE_KEY(KC_C) { - layer_switch(1); - } - SEQ_ONE_KEY(KC_M) { - layer_switch(2); - } - } -} - const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }; void led_set_user(uint8_t usb_led) { - + } \ No newline at end of file -- cgit v1.2.3 From af7430b896bdc15dd007b2227ed0b6f2feb0634a Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sat, 25 Feb 2017 12:36:53 +0700 Subject: Add capslock led, and audio buttons - Also change layer switch to momentary --- keyboards/handwired/kbod/keymaps/default/keymap.c | 42 ++++++++++++++--------- 1 file changed, 26 insertions(+), 16 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 463b1fc8b..3514ffb98 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -2,34 +2,36 @@ #define _____ KC_TRNS +#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( /* Base */ F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, 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_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, MO(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), KEYMAP( /* Cursor layer */ KC_GRAVE, 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_DEL, - TO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, - TO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, - _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_UP, _____, - _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ + MO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + MO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, _____, + _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_END, KC_UP, + _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT ), KEYMAP( /* Multimedia layer */ - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, _____, - TO(0), _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, + _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, _____, - TO(0), _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, KC_MS_BTN2, + _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 ), }; @@ -37,7 +39,7 @@ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), }; -#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) + void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { static uint8_t shift_esc_shift_mask; switch (id) { @@ -66,9 +68,17 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - return MACRO_NONE; + return MACRO_NONE; }; void led_set_user(uint8_t usb_led) { - + if (usb_led & _BV(USB_LED_CAPS_LOCK)) { + PORTB |= _BV(PB0); + } else { + PORTB &= ~_BV(PB0); + } +} + +void matrix_init_user(void) { + DDRB |= _BV(PB0); } \ No newline at end of file -- cgit v1.2.3 From c9dd11d5abec11aa046031c12b1aa5edc5efae77 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sat, 25 Feb 2017 13:30:18 +0700 Subject: Enable alt-F4 without [Fn] - Add led indicator when keymap not on base layer \o/ --- keyboards/handwired/kbod/keymaps/default/keymap.c | 62 +++++++++++++++-------- 1 file changed, 41 insertions(+), 21 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 3514ffb98..6f2805d9d 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -2,11 +2,31 @@ #define _____ KC_TRNS -#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) +#define MODS_PRESSED(btn) (get_mods() & (MOD_BIT(KC_L##btn)|MOD_BIT(KC_R##btn))) + +#define SET_WHETHER(mask, btn1, btn2) \ +if (record->event.pressed) { \ + if (mask) { \ + add_key(btn2); \ + send_keyboard_report(); \ + } else { \ + add_key(btn1); \ + send_keyboard_report(); \ + } \ +} else { \ + if (mask) { \ + del_key(btn2); \ + send_keyboard_report(); \ + } else { \ + del_key(btn1); \ + send_keyboard_report(); \ + } \ +} \ + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( /* Base */ - F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, + F(0), KC_1, KC_2, KC_3, F(1), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, 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_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, @@ -37,31 +57,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), + [1] = ACTION_FUNCTION(1), }; void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { - static uint8_t shift_esc_shift_mask; + static uint8_t shift_esc_mask; + static uint8_t alt_mask; switch (id) { case 0: - shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; - if (record->event.pressed) { - if (shift_esc_shift_mask) { - add_key(KC_GRV); - send_keyboard_report(); - } else { - add_key(KC_ESC); - send_keyboard_report(); - } - } else { - if (shift_esc_shift_mask) { - del_key(KC_GRV); - send_keyboard_report(); - } else { - del_key(KC_ESC); - send_keyboard_report(); - } - } + shift_esc_mask = MODS_PRESSED(SHIFT); + SET_WHETHER(shift_esc_mask, KC_ESC, KC_GRAVE) + break; + case 1: + alt_mask = MODS_PRESSED(ALT); + SET_WHETHER(alt_mask, KC_4, KC_F4); break; } } @@ -81,4 +91,14 @@ void led_set_user(uint8_t usb_led) { void matrix_init_user(void) { DDRB |= _BV(PB0); + DDRC |= _BV(PC7); +} + +void matrix_scan_user(void) { + uint8_t layer = biton32(layer_state); + if (layer) { + PORTC |= _BV(PC7); + } else { + PORTC &= ~_BV(PC7); + } } \ No newline at end of file -- cgit v1.2.3 From f5d78c739d48bad32409b3819c8d624d5e78c017 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sun, 26 Feb 2017 11:44:21 +0700 Subject: Forgot semicolon, and add reference link --- keyboards/handwired/kbod/keymaps/default/keymap.c | 2 +- keyboards/handwired/kbod/readme.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 6f2805d9d..a6c09dd53 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -67,7 +67,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { switch (id) { case 0: shift_esc_mask = MODS_PRESSED(SHIFT); - SET_WHETHER(shift_esc_mask, KC_ESC, KC_GRAVE) + SET_WHETHER(shift_esc_mask, KC_ESC, KC_GRAVE); break; case 1: alt_mask = MODS_PRESSED(ALT); diff --git a/keyboards/handwired/kbod/readme.md b/keyboards/handwired/kbod/readme.md index bd58fdd38..67bf711be 100644 --- a/keyboards/handwired/kbod/readme.md +++ b/keyboards/handwired/kbod/readme.md @@ -16,4 +16,6 @@ Something along this line: ``` avrdude -p m32u4 -c avr109 -P -C -e -u flash:w:handwired_kbod_default.hex -``` \ No newline at end of file +``` + +[More info](https://github.com/fudanchii/keyboard_of_disapproval) \ No newline at end of file -- cgit v1.2.3 From 15ddaa7f1929aa301a325b03c57e267524d56ea8 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sat, 11 Mar 2017 20:52:52 +0700 Subject: Fix layer stuck, and add numpad support --- keyboards/handwired/kbod/config.h | 5 +++++ keyboards/handwired/kbod/keymaps/default/keymap.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h index e73b7d086..f3d0c8bf2 100644 --- a/keyboards/handwired/kbod/config.h +++ b/keyboards/handwired/kbod/config.h @@ -159,4 +159,9 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION +#define PREVENT_STUCK_MODIFIERS + +#undef TAPPING_TOGGLE +#define TAPPING_TOGGLE 2 + #endif diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index a6c09dd53..65c5f552c 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, - MO(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + TT(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), KEYMAP( /* Cursor layer */ KC_GRAVE, 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_DEL, @@ -39,19 +39,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_END, KC_UP, _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT ), - KEYMAP( /* Multimedia layer */ - TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, + KEYMAP( /* Keypad layer */ + TO(0), _____, _____, _____, _____, _____, _____, KC_P7, KC_P8, KC_P9, _____, KC_PMNS, KC_PPLS, _____, + _____, _____, _____, _____, _____, _____, _____, KC_P4, KC_P5, KC_P6, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, KC_P1, KC_P2, KC_P3, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, KC_P0, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, KC_MS_BTN2, - _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + _____, _____, KC_WAKE, _____, _____, _____, _____, _____, _____, _____, KC_MSTP, KC_MPRV, KC_MNXT, _____, + _____, _____, KC_SLEP, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, KC_PWR, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, KC_MS_BTN2, + _____, _____, _____, KC_MPLY, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 ), }; -- cgit v1.2.3 From 649d08742a7aec4001193bb5a7a35ca7935a9753 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Tue, 28 Mar 2017 16:17:10 +0700 Subject: Use tap-toggle to move between layers. - Add PDOT key --- keyboards/handwired/kbod/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/handwired/kbod/keymaps/default/keymap.c') diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 65c5f552c..1386b742f 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -34,16 +34,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), KEYMAP( /* Cursor layer */ KC_GRAVE, 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_DEL, - MO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, - MO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, _____, + TT(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + TT(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_END, KC_UP, _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT ), KEYMAP( /* Keypad layer */ - TO(0), _____, _____, _____, _____, _____, _____, KC_P7, KC_P8, KC_P9, _____, KC_PMNS, KC_PPLS, _____, + TO(0), KC_1, KC_2, KC_3, F(1), KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_BSPC, _____, _____, _____, _____, _____, _____, _____, KC_P4, KC_P5, KC_P6, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_P1, KC_P2, KC_P3, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, KC_P0, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, + _____, _____, _____, _____, _____, _____, _____, KC_P0, KC_PDOT, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ -- cgit v1.2.3