summaryrefslogtreecommitdiff
path: root/keyboards/work_louder/micro
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/work_louder/micro')
-rw-r--r--keyboards/work_louder/micro/config.h7
-rw-r--r--keyboards/work_louder/micro/info.json41
-rw-r--r--keyboards/work_louder/micro/keymaps/default/keymap.c2
-rw-r--r--keyboards/work_louder/micro/keymaps/peterfalken/keymap.c2
-rw-r--r--keyboards/work_louder/micro/keymaps/via/keymap.c2
-rw-r--r--keyboards/work_louder/micro/matrix.c9
-rw-r--r--keyboards/work_louder/micro/micro.c2
-rw-r--r--keyboards/work_louder/micro/rules.mk2
8 files changed, 31 insertions, 36 deletions
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index bfe04592ac..234b1de602 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -4,13 +4,6 @@
#pragma once
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-#define USB_MAX_POWER_CONSUMPTION 100
-
-#define RGB_DI_PIN D1
#define RGB_MATRIX_LED_COUNT 12
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
#define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index 3627122102..6b14ecfbe7 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -39,11 +39,18 @@
"max_brightness": 150,
"saturation_steps": 8
},
+ "ws2812": {
+ "pin": "D1"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"url": "https://worklouder.cc/",
"usb": {
"device_version": "1.0.0",
"pid": "0xE6E3",
- "vid": "0x574C"
+ "vid": "0x574C",
+ "max_power": 100
},
"encoder": {
"rotary": [
@@ -57,22 +64,22 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0, "y": 0 },
- { "matrix": [0, 1], "x": 1.25, "y": 0.25 },
- { "matrix": [0, 2], "x": 2.25, "y": 0.25 },
- { "matrix": [0, 3], "x": 3.5, "y": 0 },
- { "matrix": [1, 0], "x": 0.25, "y": 1.25 },
- { "matrix": [1, 1], "x": 1.25, "y": 1.25 },
- { "matrix": [1, 2], "x": 2.25, "y": 1.25 },
- { "matrix": [1, 3], "x": 3.25, "y": 1.25 },
- { "matrix": [2, 0], "x": 0.25, "y": 2.25 },
- { "matrix": [2, 1], "x": 1.25, "y": 2.25 },
- { "matrix": [2, 2], "x": 2.25, "y": 2.25 },
- { "matrix": [2, 3], "x": 3.25, "y": 2.25 },
- { "matrix": [3, 0], "x": 0, "y": 3.5 },
- { "matrix": [3, 1], "x": 1.25, "y": 3.25 },
- { "matrix": [3, 2], "x": 2.25, "y": 3.25 },
- { "matrix": [3, 3], "x": 3.5, "y": 3.5 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 0.25},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [1, 0], "x": 0.25, "y": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 0.25, "y": 2.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5}
]
}
}
diff --git a/keyboards/work_louder/micro/keymaps/default/keymap.c b/keyboards/work_louder/micro/keymaps/default/keymap.c
index 6b5541e017..56146f4932 100644
--- a/keyboards/work_louder/micro/keymaps/default/keymap.c
+++ b/keyboards/work_louder/micro/keymaps/default/keymap.c
@@ -62,7 +62,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
{ ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(C(KC_Z), C(KC_Y)) },
{ ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
{ ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/work_louder/micro/keymaps/peterfalken/keymap.c b/keyboards/work_louder/micro/keymaps/peterfalken/keymap.c
index 8ef9a4eb97..abb902597b 100644
--- a/keyboards/work_louder/micro/keymaps/peterfalken/keymap.c
+++ b/keyboards/work_louder/micro/keymaps/peterfalken/keymap.c
@@ -79,7 +79,7 @@ typedef union {
work_louder_config_t work_louder_config;
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
{ ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(CK_UNDO, CK_REDO) },
{ ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
{ ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/work_louder/micro/keymaps/via/keymap.c b/keyboards/work_louder/micro/keymaps/via/keymap.c
index 514aae2aa0..bcb55a3991 100644
--- a/keyboards/work_louder/micro/keymaps/via/keymap.c
+++ b/keyboards/work_louder/micro/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
{ ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(C(KC_Z), C(KC_Y)) },
{ ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
{ ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/work_louder/micro/matrix.c b/keyboards/work_louder/micro/matrix.c
index d2ae16ad9c..743c788662 100644
--- a/keyboards/work_louder/micro/matrix.c
+++ b/keyboards/work_louder/micro/matrix.c
@@ -4,16 +4,13 @@
/*
* scan matrix
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
+#include "matrix.h"
+#include <string.h>
+#include "atomic_util.h"
#include "wait.h"
-#include "print.h"
#include "debug.h"
#include "util.h"
-#include "matrix.h"
#include "debounce.h"
-#include QMK_KEYBOARD_H
/* matrix state(1:on, 0:off) */
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
diff --git a/keyboards/work_louder/micro/micro.c b/keyboards/work_louder/micro/micro.c
index 42bc2db529..d845a62250 100644
--- a/keyboards/work_louder/micro/micro.c
+++ b/keyboards/work_louder/micro/micro.c
@@ -1,7 +1,7 @@
// Copyright 2022 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
+#include "micro.h"
#if defined(RGB_MATRIX_ENABLE)
// clang-format off
diff --git a/keyboards/work_louder/micro/rules.mk b/keyboards/work_louder/micro/rules.mk
index bf0aa91911..ae0d803c0a 100644
--- a/keyboards/work_louder/micro/rules.mk
+++ b/keyboards/work_louder/micro/rules.mk
@@ -1,4 +1,2 @@
-RGB_MATRIX_DRIVER = WS2812
-
SRC += rgb_functions.c \
matrix.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 08:21:50 +0000