summaryrefslogtreecommitdiff
path: root/keyboards/work_louder
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/work_louder')
-rw-r--r--keyboards/work_louder/loop/config.h20
-rw-r--r--keyboards/work_louder/loop/info.json36
-rw-r--r--keyboards/work_louder/loop/loop.h14
-rw-r--r--keyboards/work_louder/loop/rules.mk1
-rw-r--r--keyboards/work_louder/micro/config.h1
-rw-r--r--keyboards/work_louder/micro/info.json6
-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
-rw-r--r--keyboards/work_louder/nano/config.h20
-rw-r--r--keyboards/work_louder/nano/info.json17
-rw-r--r--keyboards/work_louder/nano/nano.h14
-rw-r--r--keyboards/work_louder/nano/rules.mk1
-rw-r--r--keyboards/work_louder/numpad/info.json4
-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.h20
-rw-r--r--keyboards/work_louder/work_board/info.json11
-rw-r--r--keyboards/work_louder/work_board/rules.mk1
-rw-r--r--keyboards/work_louder/work_board/work_board.c14
20 files changed, 66 insertions, 136 deletions
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 1e17946cef..4d5bcf9dba 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
- { F5 }
-#define MATRIX_COL_PINS { B3, B2, B1, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-
#define USB_MAX_POWER_CONSUMPTION 100
#define RGBLIGHT_DI_PIN E6
@@ -57,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
#define RGBLIGHT_DEFAULT_HUE 36
-#define RGB_DI_PIN F1
#define RGB_MATRIX_LED_COUNT 9
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index df4a5c1be0..64aed890de 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -7,6 +7,14 @@
"vid": "0x574C",
"pid": "0x1DF9"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+ "rows": ["F5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D0", "pin_b": "D1"},
@@ -17,24 +25,26 @@
"bootmagic": {
"matrix": [0, 11]
},
+ "ws2812": {
+ "pin": "F1"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k00", "x": 0, "y": 0},
- {"label": "k01", "x": 1, "y": 0},
- {"label": "k02", "x": 2, "y": 0},
-
- {"label": "k03", "x": 3, "y": 0},
- {"label": "k04", "x": 4, "y": 0},
- {"label": "k05", "x": 5, "y": 0},
- {"label": "k06", "x": 6, "y": 0},
- {"label": "k07", "x": 7, "y": 0},
- {"label": "k08", "x": 8, "y": 0},
- {"label": "k09", "x": 9, "y": 0},
- {"label": "k0a", "x": 10, "y": 0},
- {"label": "k0b", "x": 11, "y": 0}
+ {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k0a", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k0b", "matrix": [0, 11], "x": 11, "y": 0}
]
}
}
diff --git a/keyboards/work_louder/loop/loop.h b/keyboards/work_louder/loop/loop.h
index a7376881b3..b2cb2410fc 100644
--- a/keyboards/work_louder/loop/loop.h
+++ b/keyboards/work_louder/loop/loop.h
@@ -18,17 +18,3 @@
#include "quantum.h"
#include "rgb_functions.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b } \
-}
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index 7b2a49bbc2..b68ae20d14 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes
LTO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
SRC += rgb_functions.c
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index bfe04592ac..f23c5a4ef1 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -10,7 +10,6 @@
*/
#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..f6b45226a0 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -39,6 +39,12 @@
"max_brightness": 150,
"saturation_steps": 8
},
+ "ws2812": {
+ "pin": "D1"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"url": "https://worklouder.cc/",
"usb": {
"device_version": "1.0.0",
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
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 9148cf1abf..265da302e5 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
- { F7 }
-#define MATRIX_COL_PINS \
- { B5, B6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define USB_MAX_POWER_CONSUMPTION 100
#define RGBLIGHT_DI_PIN C7
@@ -58,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
#define RGBLIGHT_DEFAULT_HUE 170
-#define RGB_DI_PIN F6
#define RGB_MATRIX_LED_COUNT 2
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 3eb050b92a..70da0e4cc4 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,11 +8,22 @@
"pid": "0xE6F0",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B6", "C6"],
+ "rows": ["F7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D7", "pin_b": "B4"}
]
},
+ "ws2812": {
+ "pin": "F6"
+ },
"bootmagic": {
"matrix": [0, 2]
},
@@ -21,9 +32,9 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k00", "x": 0, "y": 0},
- {"label": "k01", "x": 1, "y": 0},
- {"label": "k02", "x": 2, "y": 0}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
]
}
}
diff --git a/keyboards/work_louder/nano/nano.h b/keyboards/work_louder/nano/nano.h
index cc152b8ccc..04de456eca 100644
--- a/keyboards/work_louder/nano/nano.h
+++ b/keyboards/work_louder/nano/nano.h
@@ -18,17 +18,3 @@
#include "quantum.h"
#include "rgb_functions.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02 \
-) { \
- { k00, k01, k02 } \
-}
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index 60c7afc95e..bcbb4bb31d 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -14,6 +14,5 @@ ENCODER_ENABLE = yes
LTO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
SRC += rgb_functions.c
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json
index dbae02e573..8400e21a83 100644
--- a/keyboards/work_louder/numpad/info.json
+++ b/keyboards/work_louder/numpad/info.json
@@ -63,10 +63,12 @@
"hue_steps": 8,
"led_count": 8,
"max_brightness": 120,
- "pin": "D1",
"saturation_steps": 8,
"sleep": true
},
+ "ws2812": {
+ "pin": "D1"
+ },
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index d0cb93ccbc..138779465e 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -14,16 +14,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
#include "rgb_functions.h"
#ifdef RGBLIGHT_ENABLE
-#undef RGB_DI_PIN
-#define RGB_DI_PIN RGBLIGHT_DI_PIN
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN RGBLIGHT_DI_PIN
#define ws2812_setleds ws2812_rgb_setleds
-#include "ws2812.c"
+#include "ws2812_bitbang.c"
void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
ws2812_setleds(start_led, num_leds);
diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h
index 8940cddefc..9ad7cdb19c 100644
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@@ -14,6 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+
#include "quantum.h"
#ifndef VIA_ENABLE
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index d9da63eb50..8f392bd050 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
- { F0, F1, F4, F5 }
-#define MATRIX_COL_PINS \
- { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, E6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define USB_MAX_POWER_CONSUMPTION 100
#define RGBLIGHT_DI_PIN D2
@@ -57,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9
#define RGBLIGHT_DEFAULT_HUE 213
-#define RGB_DI_PIN D1
#define RGB_MATRIX_LED_COUNT 49
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 5e934e90e0..3e208110a8 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -7,11 +7,22 @@
"vid": "0x574C",
"pid": "0xDCD1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"],
+ "rows": ["F0", "F1", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B0", "pin_b": "B1"}
]
},
+ "ws2812": {
+ "pin": "D1"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
index 714b4b5d04..9f4b9a4bc5 100644
--- a/keyboards/work_louder/work_board/rules.mk
+++ b/keyboards/work_louder/work_board/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes
LTO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index 928a8abd89..157504216d 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -16,20 +16,6 @@
#include "work_board.h"
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- return false;
- }
- if (clockwise) {
- tap_code(KC_VOLD);
- } else {
- tap_code(KC_VOLU);
- }
- return true;
-}
-#endif
-
#ifdef OLED_ENABLE
# ifdef RGB_MATRIX_ENABLE
# error Cannot run OLED and Per Key RGB at the same time due to pin conflicts
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:26:57 +0000