Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup work_board #23266

Merged
merged 2 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions keyboards/work_louder/work_board/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_LED_COUNT 49
#define RGB_MATRIX_DISABLE_KEYCODES

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x1
12 changes: 12 additions & 0 deletions keyboards/work_louder/work_board/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
"pid": "0xDCD1",
"max_power": 100
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgblight": true,
"rgb_matrix": true,
"encoder": true
},
"build": {
"lto": true
},
"rgb_matrix": {
"animations": {
"alphas_mods": true,
Expand Down
13 changes: 3 additions & 10 deletions keyboards/work_louder/work_board/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,23 @@

#include QMK_KEYBOARD_H

enum planck_layers {
enum layers {
_QWERTY,
_LOWER,
_RAISE,
_ADJUST
};

enum tap_dances {
ENC_TAP,
ENC_TAP
waffle87 marked this conversation as resolved.
Show resolved Hide resolved
};

#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(
Expand Down Expand Up @@ -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 change: 0 additions & 1 deletion keyboards/work_louder/work_board/keymaps/default/readme.md

This file was deleted.

1 change: 1 addition & 0 deletions keyboards/work_louder/work_board/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
TAP_DANCE_ENABLE = yes
TRI_LAYER_ENABLE = yes
2 changes: 2 additions & 0 deletions keyboards/work_louder/work_board/keymaps/via/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 14 additions & 12 deletions keyboards/work_louder/work_board/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,24 @@

#include QMK_KEYBOARD_H

enum planck_layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
enum layers {
_QWERTY,
_LOWER,
_RAISE,
_ADJUST
};

enum tap_dances {
ENC_TAP,
ENC_TAP
};

#define LOWER TL_LOWR
#define RAISE TL_UPPR

// clang-format off
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, 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, _______,
Expand Down Expand Up @@ -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;
}
}

Expand All @@ -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;
}
}

Expand Down
17 changes: 0 additions & 17 deletions keyboards/work_louder/work_board/rules.mk
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
LTO_ENABLE = yes

RGB_MATRIX_ENABLE = yes

SRC += rgb_functions.c

DEFAULT_FOLDER = work_louder/work_board/rev3
Loading