Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-12-27 03:37:11 +00:00
commit cd62961392
1 changed files with 62 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
keyboards/pistachio_mp/keymaps/via/keymap.c
View file

@ -23,10 +23,29 @@ enum layer_names {
_RESERVE_1 _RESERVE_1
}; };
static uint8_t encoder_state = 0;
static const keypos_t ENC_CW = {.row = 3, .col = 3};
static const keypos_t ENC_CCW = {.row = 4, .col = 1};
#define LAYOUT_via( \
ECW,ECCW, K07, \
K00, K01, K02, K03, \
K04, K05, K06, \
K08, K09, K10, K11, \
K12, K13, K14, \
K15, K16, K17 ) { \
{ K00, K01, K02, K03 }, \
{ K04, K05, K06, K07 }, \
{ K08, K09, K10, K11 }, \
{ K12, K13, K14, ECCW }, \
{ K15, ECW, K16, K17 }, \
}
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */ /* Base */
[_BASE] = LAYOUT( [_BASE] = LAYOUT_via(
KC_MPLY, KC_VOLU,KC_VOLD,KC_MPLY,
LT(_FN, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS, LT(_FN, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PPLS,
@ -34,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P0, KC_PDOT, KC_PENT KC_P0, KC_PDOT, KC_PENT
), ),
/* Fn */ /* Fn */
[_FN] = LAYOUT( [_FN] = LAYOUT_via(
KC_NO, KC_VOLU,KC_VOLD,KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUI, RGB_SAI, RGB_VAI,
RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG,
@ -43,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, KC_NO, KC_NO KC_NO, KC_NO, KC_NO
), ),
/* Reserve */ /* Reserve */
[_RESERVE_0] = LAYOUT( [_RESERVE_0] = LAYOUT_via(
KC_TRNS, KC_VOLU,KC_VOLD,KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@ -52,8 +71,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS
), ),
/* Reserve */ /* Reserve */
[_RESERVE_1] = LAYOUT( [_RESERVE_1] = LAYOUT_via(
KC_TRNS, KC_VOLU,KC_VOLD,KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@ -61,16 +80,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS
), ),
}; };
#ifdef ENCODER_ENABLE #ifdef ENCODER_ENABLE
bool encoder_update_user(uint8_t index, bool clockwise) { void encoder_action_unregister(void) {
if (index == 0) { if (encoder_state) {
// Volume control keyevent_t encoder_event = (keyevent_t) {
if (clockwise) { .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
tap_code(KC_VOLU); .pressed = false,
} else { .time = (timer_read() | 1)
tap_code(KC_VOLD); };
encoder_state = 0;
action_exec(encoder_event);
} }
return;
} }
void encoder_action_register(uint8_t index, bool clockwise) {
keyevent_t encoder_event = (keyevent_t) {
.key = clockwise ? ENC_CW : ENC_CCW,
.pressed = true,
.time = (timer_read() | 1)
};
encoder_state = (clockwise ^ 1) | (clockwise << 1);
action_exec(encoder_event);
return;
}
void matrix_scan_kb(void) {
encoder_action_unregister();
matrix_scan_user();
return;
}
bool encoder_update_kb(uint8_t index, bool clockwise) {
encoder_action_register(index, clockwise);
// don't return user actions, because they are in the keymap
// encoder_update_user(index, clockwise);
return true; return true;
} };
#endif #endif