Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Keyboard][Bug] Makrosu VIA compile fix encoder and formatting (#13306)

Browse source 
* fix encoder and formatting

* remove redundant breaks

* Update keyboards/makrosu/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/makrosu/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
This commit is contained in:
Xelus22 2021-06-23 13:30:42 +10:00 committed by GitHub
parent 268d0efa7e
commit ced7e9a0ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 126 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
keyboards/makrosu/keymaps/default/keymap.c
View file

@ -39,20 +39,20 @@ enum planck_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_1] = LAYOUT( [_1] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_ESC, KC_F1, KC_F2,
LOWER, KC_Z, KC_X), LOWER, KC_Z, KC_X),
[_2] = LAYOUT( [_2] = LAYOUT(
LALT(KC_TAB), LGUI(KC_TAB), LCTL(KC_S), LALT(KC_TAB), LGUI(KC_TAB), LCTL(KC_S),
LOWER, LCTL(KC_C), LCTL(KC_V)), LOWER, LCTL(KC_C), LCTL(KC_V)),
[_3] = LAYOUT( [_3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS), KC_TRNS, KC_TRNS, KC_TRNS),
[_4] = LAYOUT( [_4] = LAYOUT(
L1, L2, L3, L1, L2, L3,
_______, _______, _______), _______, _______, _______),
}; };
@ -61,38 +61,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE); state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE);
writePin(IND_1, layer_state_cmp(state, 1)); writePin(IND_1, layer_state_cmp(state, 1));
writePin(IND_2, layer_state_cmp(state, 2)); writePin(IND_2, layer_state_cmp(state, 2));
writePin(IND_3, layer_state_cmp(state, 3)); writePin(IND_3, layer_state_cmp(state, 3));
return state; return state;
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case L1: case L1:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_1); set_single_persistent_default_layer(_1);
}
return false;
} case L2:
return false; if (record->event.pressed) {
break; set_single_persistent_default_layer(_2);
case L2: }
if (record->event.pressed) { return false;
set_single_persistent_default_layer(_2); case L3:
if (record->event.pressed) {
} set_single_persistent_default_layer(_3);
return false; }
break; return false;
case L3: }
if (record->event.pressed) { return true;
set_single_persistent_default_layer(_3);
}
return false;
break;
}
return true;
} }
void matrix_init_user(void) { void matrix_init_user(void) {
@ -106,28 +98,25 @@ void matrix_init_user(void) {
writePinHigh(IND_3); writePinHigh(IND_3);
} }
void encoder_update_user(uint8_t index, bool clockwise) { bool encoder_update_user(uint8_t index, bool clockwise) {
if (layer_state_is(_1)) { if (layer_state_is(_1)) {
if (clockwise) { if (clockwise) {
tap_code(KC_UP); tap_code(KC_UP);
} else { } else {
tap_code(KC_DOWN); tap_code(KC_DOWN);
}
} else if (layer_state_is(_2)) {
if (clockwise) {
tap_code(KC_RGHT);
} else {
tap_code(KC_LEFT);
}
} else if (layer_state_is(_3)) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
} }
} return true;
else if (layer_state_is(_2)) {
if (clockwise) {
tap_code(KC_RGHT);
} else {
tap_code(KC_LEFT);
}
}
else if (layer_state_is(_3)) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
}
} }

107
keyboards/makrosu/keymaps/via/keymap.c
View file

@ -39,20 +39,20 @@ enum planck_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_1] = LAYOUT( [_1] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_ESC, KC_F1, KC_F2,
LOWER, KC_Z, KC_X), LOWER, KC_Z, KC_X),
[_2] = LAYOUT( [_2] = LAYOUT(
LALT(KC_TAB), LGUI(KC_TAB), LCTL(KC_S), LALT(KC_TAB), LGUI(KC_TAB), LCTL(KC_S),
LOWER, LCTL(KC_C), LCTL(KC_V)), LOWER, LCTL(KC_C), LCTL(KC_V)),
[_3] = LAYOUT( [_3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS), KC_TRNS, KC_TRNS, KC_TRNS),
[_4] = LAYOUT( [_4] = LAYOUT(
L1, L2, L3, L1, L2, L3,
_______, _______, _______), _______, _______, _______),
}; };
@ -61,38 +61,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE); state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE);
writePin(IND_1, layer_state_cmp(state, 1)); writePin(IND_1, layer_state_cmp(state, 1));
writePin(IND_2, layer_state_cmp(state, 2)); writePin(IND_2, layer_state_cmp(state, 2));
writePin(IND_3, layer_state_cmp(state, 3)); writePin(IND_3, layer_state_cmp(state, 3));
return state; return state;
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case L1: case L1:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_1); set_single_persistent_default_layer(_1);
}
return false;
} case L2:
return false; if (record->event.pressed) {
break; set_single_persistent_default_layer(_2);
case L2: }
if (record->event.pressed) { return false;
set_single_persistent_default_layer(_2); case L3:
if (record->event.pressed) {
} set_single_persistent_default_layer(_3);
return false; }
break; return false;
case L3: }
if (record->event.pressed) { return true;
set_single_persistent_default_layer(_3);
}
return false;
break;
}
return true;
} }
void matrix_init_user(void) { void matrix_init_user(void) {
@ -106,28 +98,25 @@ void matrix_init_user(void) {
writePinHigh(IND_3); writePinHigh(IND_3);
} }
void encoder_update_user(uint8_t index, bool clockwise) { bool encoder_update_user(uint8_t index, bool clockwise) {
if (layer_state_is(_1)) { if (layer_state_is(_1)) {
if (clockwise) { if (clockwise) {
tap_code(KC_UP); tap_code(KC_UP);
} else { } else {
tap_code(KC_DOWN); tap_code(KC_DOWN);
}
} else if (layer_state_is(_2)) {
if (clockwise) {
tap_code(KC_RGHT);
} else {
tap_code(KC_LEFT);
}
} else if (layer_state_is(_3)) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
} }
} return true;
else if (layer_state_is(_2)) {
if (clockwise) {
tap_code(KC_RGHT);
} else {
tap_code(KC_LEFT);
}
}
else if (layer_state_is(_3)) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
}
} }