aboutsummaryrefslogtreecommitdiff
path: root/keyboards/work_louder
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/work_louder')
-rw-r--r--keyboards/work_louder/loop/info.json12
-rw-r--r--keyboards/work_louder/loop/rev1/keyboard.json (renamed from keyboards/work_louder/loop/rev1/info.json)0
-rw-r--r--keyboards/work_louder/loop/rev1/rules.mk0
-rw-r--r--keyboards/work_louder/loop/rev3/keyboard.json (renamed from keyboards/work_louder/loop/rev3/info.json)0
-rw-r--r--keyboards/work_louder/loop/rev3/rules.mk0
-rw-r--r--keyboards/work_louder/loop/rules.mk18
-rw-r--r--keyboards/work_louder/micro/keyboard.json (renamed from keyboards/work_louder/micro/info.json)0
-rw-r--r--keyboards/work_louder/micro/matrix.c12
-rw-r--r--keyboards/work_louder/micro/micro.c24
-rw-r--r--keyboards/work_louder/nano/keyboard.json (renamed from keyboards/work_louder/nano/info.json)12
-rw-r--r--keyboards/work_louder/nano/rules.mk17
-rw-r--r--keyboards/work_louder/numpad/keyboard.json (renamed from keyboards/work_louder/numpad/info.json)0
-rw-r--r--keyboards/work_louder/rgb_functions.c7
-rw-r--r--keyboards/work_louder/rgb_functions.h2
-rw-r--r--keyboards/work_louder/work_board/config.h16
-rw-r--r--keyboards/work_louder/work_board/info.json12
-rw-r--r--keyboards/work_louder/work_board/keymaps/default/keymap.c11
-rw-r--r--keyboards/work_louder/work_board/keymaps/default/readme.md1
-rw-r--r--keyboards/work_louder/work_board/keymaps/default/rules.mk1
-rw-r--r--keyboards/work_louder/work_board/keymaps/via/config.h2
-rw-r--r--keyboards/work_louder/work_board/keymaps/via/keymap.c26
-rw-r--r--keyboards/work_louder/work_board/rev1/keyboard.json (renamed from keyboards/work_louder/work_board/rev1/info.json)0
-rw-r--r--keyboards/work_louder/work_board/rev1/rules.mk0
-rw-r--r--keyboards/work_louder/work_board/rev3/keyboard.json (renamed from keyboards/work_louder/work_board/rev3/info.json)0
-rw-r--r--keyboards/work_louder/work_board/rev3/rules.mk0
-rw-r--r--keyboards/work_louder/work_board/rules.mk17
-rw-r--r--keyboards/work_louder/work_board/work_board.c12
27 files changed, 87 insertions, 115 deletions
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 3c395e057a..771a31d105 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -8,6 +8,18 @@
"pid": "0x1DF9",
"max_power": 100
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "rgblight": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/work_louder/loop/rev1/info.json b/keyboards/work_louder/loop/rev1/keyboard.json
index 3caea9b338..3caea9b338 100644
--- a/keyboards/work_louder/loop/rev1/info.json
+++ b/keyboards/work_louder/loop/rev1/keyboard.json
diff --git a/keyboards/work_louder/loop/rev1/rules.mk b/keyboards/work_louder/loop/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/work_louder/loop/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/work_louder/loop/rev3/info.json b/keyboards/work_louder/loop/rev3/keyboard.json
index 603bca5c6a..603bca5c6a 100644
--- a/keyboards/work_louder/loop/rev3/info.json
+++ b/keyboards/work_louder/loop/rev3/keyboard.json
diff --git a/keyboards/work_louder/loop/rev3/rules.mk b/keyboards/work_louder/loop/rev3/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/work_louder/loop/rev3/rules.mk
+++ /dev/null
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index b68ae20d14..53c3227972 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -1,21 +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
-LTO_ENABLE = yes
-
SRC += rgb_functions.c
DEFAULT_FOLDER = work_louder/loop/rev3
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/keyboard.json
index 1b57ca82e8..1b57ca82e8 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/keyboard.json
diff --git a/keyboards/work_louder/micro/matrix.c b/keyboards/work_louder/micro/matrix.c
index 743c788662..3cfbf17dad 100644
--- a/keyboards/work_louder/micro/matrix.c
+++ b/keyboards/work_louder/micro/matrix.c
@@ -22,27 +22,27 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
static inline void setPinOutput_writeLow(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinOutput(pin);
- writePinLow(pin);
+ gpio_set_pin_output(pin);
+ gpio_write_pin_low(pin);
}
}
static inline void setPinOutput_writeHigh(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinOutput(pin);
- writePinHigh(pin);
+ gpio_set_pin_output(pin);
+ gpio_write_pin_high(pin);
}
}
static inline void setPinInputHigh_atomic(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
static inline uint8_t readMatrixPin(pin_t pin) {
if (pin != NO_PIN) {
- return readPin(pin);
+ return gpio_read_pin(pin);
} else {
return 1;
}
diff --git a/keyboards/work_louder/micro/micro.c b/keyboards/work_louder/micro/micro.c
index d845a62250..07ab92f7a7 100644
--- a/keyboards/work_louder/micro/micro.c
+++ b/keyboards/work_louder/micro/micro.c
@@ -49,29 +49,29 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
#endif
void work_louder_micro_led_1_on(void) {
- setPinOutput(WORK_LOUDER_LED_PIN_1);
- writePin(WORK_LOUDER_LED_PIN_1, true);
+ gpio_set_pin_output(WORK_LOUDER_LED_PIN_1);
+ gpio_write_pin(WORK_LOUDER_LED_PIN_1, true);
}
void work_louder_micro_led_2_on(void) {
- setPinOutput(WORK_LOUDER_LED_PIN_2);
- writePin(WORK_LOUDER_LED_PIN_2, true);
+ gpio_set_pin_output(WORK_LOUDER_LED_PIN_2);
+ gpio_write_pin(WORK_LOUDER_LED_PIN_2, true);
}
void work_louder_micro_led_3_on(void) {
- setPinOutput(WORK_LOUDER_LED_PIN_3);
- writePin(WORK_LOUDER_LED_PIN_3, true);
+ gpio_set_pin_output(WORK_LOUDER_LED_PIN_3);
+ gpio_write_pin(WORK_LOUDER_LED_PIN_3, true);
}
void work_louder_micro_led_1_off(void) {
- setPinInput(WORK_LOUDER_LED_PIN_1);
- writePin(WORK_LOUDER_LED_PIN_1, false);
+ gpio_set_pin_input(WORK_LOUDER_LED_PIN_1);
+ gpio_write_pin(WORK_LOUDER_LED_PIN_1, false);
}
void work_louder_micro_led_2_off(void) {
- setPinInput(WORK_LOUDER_LED_PIN_2);
- writePin(WORK_LOUDER_LED_PIN_2, false);
+ gpio_set_pin_input(WORK_LOUDER_LED_PIN_2);
+ gpio_write_pin(WORK_LOUDER_LED_PIN_2, false);
}
void work_louder_micro_led_3_off(void) {
- setPinInput(WORK_LOUDER_LED_PIN_3);
- writePin(WORK_LOUDER_LED_PIN_3, false);
+ gpio_set_pin_input(WORK_LOUDER_LED_PIN_3);
+ gpio_write_pin(WORK_LOUDER_LED_PIN_3, false);
}
void work_louder_micro_led_all_on(void) {
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/keyboard.json
index 61c48b3e80..e15d095de0 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/keyboard.json
@@ -9,6 +9,18 @@
"device_version": "0.0.1",
"max_power": 100
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "rgblight": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index bcbb4bb31d..e0822c009b 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -1,18 +1 @@
-# 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
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/keyboard.json
index bd615c4080..bd615c4080 100644
--- a/keyboards/work_louder/numpad/info.json
+++ b/keyboards/work_louder/numpad/keyboard.json
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index 9b39555971..bc31aab7c1 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -15,16 +15,23 @@
*/
#include "rgb_functions.h"
+#include <stdint.h>
+#include "quantum.h"
+#include "action.h"
+#include "rgblight.h"
+#include "rgb_matrix.h"
#ifdef RGBLIGHT_ENABLE
#undef WS2812_DI_PIN
#define WS2812_DI_PIN RGBLIGHT_DI_PIN
+#define ws2812_init ws2812_rgb_init
#define ws2812_setleds ws2812_rgb_setleds
#include "ws2812_bitbang.c"
const rgblight_driver_t rgblight_driver = {
+ .init = ws2812_init,
.setleds = ws2812_setleds,
};
#endif
diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h
index 9ad7cdb19c..eaef787a22 100644
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@@ -16,7 +16,7 @@
#pragma once
-#include "quantum.h"
+#include "keycodes.h"
#ifndef VIA_ENABLE
# ifndef RGB_MATRIX_TOGGLE
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 57f309513b..2514a63dde 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -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
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 8714133ae7..dc412fdabd 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -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,
diff --git a/keyboards/work_louder/work_board/keymaps/default/keymap.c b/keyboards/work_louder/work_board/keymaps/default/keymap.c
index 56c4a2ce1d..e55cd5c598 100644
--- a/keyboards/work_louder/work_board/keymaps/default/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/default/keymap.c
@@ -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);
-}
diff --git a/keyboards/work_louder/work_board/keymaps/default/readme.md b/keyboards/work_louder/work_board/keymaps/default/readme.md
deleted file mode 100644
index 3b2d89b9a6..0000000000
--- a/keyboards/work_louder/work_board/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for work
diff --git a/keyboards/work_louder/work_board/keymaps/default/rules.mk b/keyboards/work_louder/work_board/keymaps/default/rules.mk
index e5ddcae8d9..ec22b308f7 100644
--- a/keyboards/work_louder/work_board/keymaps/default/rules.mk
+++ b/keyboards/work_louder/work_board/keymaps/default/rules.mk
@@ -1 +1,2 @@
TAP_DANCE_ENABLE = yes
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/work_louder/work_board/keymaps/via/config.h b/keyboards/work_louder/work_board/keymaps/via/config.h
index d383467be7..7aa3bebe9b 100644
--- a/keyboards/work_louder/work_board/keymaps/via/config.h
+++ b/keyboards/work_louder/work_board/keymaps/via/config.h
@@ -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
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index e920c2f9bd..7f0627eb67 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -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, _______,
@@ -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;
}
}
diff --git a/keyboards/work_louder/work_board/rev1/info.json b/keyboards/work_louder/work_board/rev1/keyboard.json
index 9884ca6e48..9884ca6e48 100644
--- a/keyboards/work_louder/work_board/rev1/info.json
+++ b/keyboards/work_louder/work_board/rev1/keyboard.json
diff --git a/keyboards/work_louder/work_board/rev1/rules.mk b/keyboards/work_louder/work_board/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/work_louder/work_board/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/work_louder/work_board/rev3/info.json b/keyboards/work_louder/work_board/rev3/keyboard.json
index 63e757dfe2..63e757dfe2 100644
--- a/keyboards/work_louder/work_board/rev3/info.json
+++ b/keyboards/work_louder/work_board/rev3/keyboard.json
diff --git a/keyboards/work_louder/work_board/rev3/rules.mk b/keyboards/work_louder/work_board/rev3/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/work_louder/work_board/rev3/rules.mk
+++ /dev/null
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
index 9f4b9a4bc5..a4c45393c0 100644
--- a/keyboards/work_louder/work_board/rules.mk
+++ b/keyboards/work_louder/work_board/rules.mk
@@ -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
diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index 157504216d..975c7aa794 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -111,13 +111,13 @@ bool rgb_matrix_indicators_kb(void) {
}
void keyboard_pre_init_kb(void) {
- setPinOutput(B2);
- setPinOutput(B3);
- setPinOutput(B7);
+ gpio_set_pin_output(B2);
+ gpio_set_pin_output(B3);
+ gpio_set_pin_output(B7);
- writePinLow(B2);
- writePinLow(B3);
- writePinLow(B7);
+ gpio_write_pin_low(B2);
+ gpio_write_pin_low(B3);
+ gpio_write_pin_low(B7);
keyboard_pre_init_user();
}