Fixup work_board (#23266)
* initial * Update keyboards/work_louder/work_board/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> --------- Co-authored-by: Drashna Jaelre <drashna@live.com>
This commit is contained in:
parent
df397a3bba
commit
aa33d8ba8e
8 changed files with 32 additions and 56 deletions
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
enum planck_layers {
|
||||
enum layers {
|
||||
_QWERTY,
|
||||
_LOWER,
|
||||
_RAISE,
|
||||
|
|
@ -27,15 +27,12 @@ enum tap_dances {
|
|||
ENC_TAP,
|
||||
};
|
||||
|
||||
#define LOWER MO(_LOWER)
|
||||
#define RAISE MO(_RAISE)
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_QWERTY] = LAYOUT(
|
||||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, TD(ENC_TAP),
|
||||
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT,
|
||||
MO(3), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
MO(3), KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
[_LOWER] = LAYOUT(
|
||||
|
|
@ -85,7 +82,3 @@ void dance_enc_reset(tap_dance_state_t *state, void *user_data) {
|
|||
tap_dance_action_t tap_dance_actions[] = {
|
||||
[ENC_TAP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_enc_finished, dance_enc_reset),
|
||||
};
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
# The default keymap for work
|
||||
|
|
@ -1 +1,2 @@
|
|||
TAP_DANCE_ENABLE = yes
|
||||
TRI_LAYER_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -2,3 +2,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#pragma once
|
||||
#define NO_ACTION_ONESHOT
|
||||
#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
|
||||
#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
||||
|
|
|
|||
|
|
@ -16,14 +16,16 @@
|
|||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
enum planck_layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
|
||||
|
||||
enum tap_dances {
|
||||
ENC_TAP,
|
||||
enum layers {
|
||||
_QWERTY,
|
||||
_LOWER,
|
||||
_RAISE,
|
||||
_ADJUST
|
||||
};
|
||||
|
||||
#define LOWER TL_LOWR
|
||||
#define RAISE TL_UPPR
|
||||
enum tap_dances {
|
||||
ENC_TAP
|
||||
};
|
||||
|
||||
// clang-format off
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
|
@ -31,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, QK_KB_9,
|
||||
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
|
||||
MO(3), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
|
||||
MO(3), KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
|
||||
),
|
||||
[_LOWER] = LAYOUT(
|
||||
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______,
|
||||
|
|
@ -158,9 +160,9 @@ void wl_config_set_value(uint8_t *data) {
|
|||
work_louder_config.led_level = (bool)*value_data;
|
||||
layer_state_set_kb(layer_state);
|
||||
break;
|
||||
// case id_wl_layer:
|
||||
// layer_move(*value_data);
|
||||
// break;
|
||||
// case id_wl_layer:
|
||||
// layer_move(*value_data);
|
||||
// break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -173,9 +175,9 @@ void wl_config_get_value(uint8_t *data) {
|
|||
case id_wl_brightness:
|
||||
*value_data = work_louder_config.led_level;
|
||||
break;
|
||||
// case id_wl_layer:
|
||||
// *value_data = get_highest_layer(layer_state);
|
||||
// break;
|
||||
// case id_wl_layer:
|
||||
// *value_data = get_highest_layer(layer_state);
|
||||
// break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue