drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Simplify NIBBLE encoder code and clean up keymaps (#11808)

Browse source 
* Simplify encoder code and clean up keymaps.

-Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps.
-Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build.
-Move layer names to enum

* Change encoder_update_kb to encoder_update_user per PR feedback
This commit is contained in:
Jay Greco 2021-02-09 06:50:16 -08:00 • committed by GitHub
parent 627ceebef3
commit 4107856b70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 77 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

20
keyboards/nullbitsco/nibble/keymaps/default/keymap.c
View file

@ -15,8 +15,10 @@
*/
#include QMK_KEYBOARD_H
#define _MA 0
#define _FN 1
enum layer_names {
_MA,
_FN
};
enum custom_keycodes {
KC_CUST = SAFE_RANGE,
@ -24,14 +26,14 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MA] = LAYOUT_ansi(
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_BSPC, KC_TILD,
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_BSPC, KC_HOME,
KC_F13, 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_F14, 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_ENT, KC_PGUP,
KC_F15, KC_LSFT, 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_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN] = LAYOUT_ansi(
RESET, 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_HOME, KC_INS,
RESET, 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_END,
RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -68,7 +70,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
}
break;
}
return true;
}
@ -100,10 +102,10 @@ void change_RGB(bool clockwise) {
} else {
rgblight_step_reverse();
}
}
}
}
void encoder_update_kb(uint8_t index, bool clockwise) {
void encoder_update_user(uint8_t index, bool clockwise) {
if (layer_state_is(1)) {
//change RGB settings
change_RGB(clockwise);
@ -113,7 +115,7 @@ void encoder_update_kb(uint8_t index, bool clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
}
}
}
@ -125,4 +127,4 @@ void matrix_init_user(void) {
void matrix_scan_user(void) {
// Scan and parse keystrokes from remote keyboard, if connected (see readme)
matrix_scan_remote_kb();
}
}