From 22a10cc8a3f7d1ff8ba7f75de49ca0feb6d07f7f Mon Sep 17 00:00:00 2001 From: Maarten Dekkers Date: Thu, 23 Apr 2020 20:59:32 +0200 Subject: Add encoder to ta-65 default keymap --- keyboards/maartenwut/ta65/keymaps/default/keymap.c | 54 +++++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) (limited to 'keyboards/maartenwut/ta65/keymaps/default/keymap.c') diff --git a/keyboards/maartenwut/ta65/keymaps/default/keymap.c b/keyboards/maartenwut/ta65/keymaps/default/keymap.c index b04172c759..4a04882964 100644 --- a/keyboards/maartenwut/ta65/keymaps/default/keymap.c +++ b/keyboards/maartenwut/ta65/keymaps/default/keymap.c @@ -1,17 +1,47 @@ #include QMK_KEYBOARD_H -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -#define _MA 0 - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_MA] = LAYOUT_all( - 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_BSLS, KC_BSPC, KC_GRV, - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT) +[0] = LAYOUT_all( + 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_BSLS, KC_BSPC, KC_INS, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_all( + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + }; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + switch(biton32(layer_state)){ + case 0: //Layer 0 + if (!clockwise) { // Remove ! to reverse direction + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + case 1: //Layer 1 + if (!clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + break; + default: + if (!clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + } + } +} \ No newline at end of file -- cgit v1.2.3 From 1df8bb3cdbfdee86af579a532c6cfaa5c89fc154 Mon Sep 17 00:00:00 2001 From: Maarten Dekkers Date: Fri, 24 Apr 2020 01:40:01 +0200 Subject: Update keymap.c Co-Authored-By: Joel Challis --- keyboards/maartenwut/ta65/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/maartenwut/ta65/keymaps/default/keymap.c') diff --git a/keyboards/maartenwut/ta65/keymaps/default/keymap.c b/keyboards/maartenwut/ta65/keymaps/default/keymap.c index 4a04882964..00cd65abb4 100644 --- a/keyboards/maartenwut/ta65/keymaps/default/keymap.c +++ b/keyboards/maartenwut/ta65/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ - switch(biton32(layer_state)){ + switch(get_highest_layer(layer_state)){ case 0: //Layer 0 if (!clockwise) { // Remove ! to reverse direction tap_code(KC_VOLU); @@ -44,4 +44,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { break; } } -} \ No newline at end of file +} -- cgit v1.2.3 From 5c9c45619e267e1c43fee483a1a1de54c12989bc Mon Sep 17 00:00:00 2001 From: Maarten Dekkers Date: Fri, 24 Apr 2020 19:41:05 +0200 Subject: Change keymap encoder code Co-Authored-By: Joel Challis --- keyboards/maartenwut/ta65/keymaps/default/keymap.c | 39 +++++++++------------- 1 file changed, 15 insertions(+), 24 deletions(-) (limited to 'keyboards/maartenwut/ta65/keymaps/default/keymap.c') diff --git a/keyboards/maartenwut/ta65/keymaps/default/keymap.c b/keyboards/maartenwut/ta65/keymaps/default/keymap.c index 00cd65abb4..8bb8a14ba0 100644 --- a/keyboards/maartenwut/ta65/keymaps/default/keymap.c +++ b/keyboards/maartenwut/ta65/keymaps/default/keymap.c @@ -19,29 +19,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - switch(get_highest_layer(layer_state)){ - case 0: //Layer 0 - if (!clockwise) { // Remove ! to reverse direction - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - case 1: //Layer 1 - if (!clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - break; - default: - if (!clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - } + switch(get_highest_layer(layer_state)){ + case 1: //Layer 1 + if (!clockwise) { // Remove ! to reverse direction + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + break; + default: //Layer 0 + if (!clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; } } -- cgit v1.2.3