Merge branch 'develop'

8 files changed, 124 insertions, 177 deletions

diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index d9da63eb50..56615c8e49 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -17,32 +17,10 @@ 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
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
 //#    define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
 #define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== or choose animations ==*/
 #define RGBLIGHT_EFFECT_BREATHING
@@ -57,7 +35,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..067a2b292e 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -5,119 +5,140 @@
     "maintainer": "Work Louder",
     "usb": {
       "vid": "0x574C",
-      "pid": "0xDCD1"
+      "pid": "0xDCD1",
+      "max_power": 100
     },
+    "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"
+    },
+    "rgblight": {
+      "max_brightness": 120
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_2u_space": {
             "layout": [
-              { "x": 0, "y": 0 },
-              { "x": 1, "y": 0 },
-              { "x": 2, "y": 0 },
-              { "x": 3, "y": 0 },
-              { "x": 4, "y": 0 },
-              { "x": 5, "y": 0 },
-              { "x": 6, "y": 0 },
-              { "x": 7, "y": 0 },
-              { "x": 8, "y": 0 },
-              { "x": 9, "y": 0 },
-              { "x": 10, "y": 0 },
-              { "x": 11, "y": 0 },
-              { "x": 12, "y": 0 },
-              { "x": 0, "y": 1 },
-              { "x": 1, "y": 1 },
-              { "x": 2, "y": 1 },
-              { "x": 3, "y": 1 },
-              { "x": 4, "y": 1 },
-              { "x": 5, "y": 1 },
-              { "x": 6, "y": 1 },
-              { "x": 7, "y": 1 },
-              { "x": 8, "y": 1 },
-              { "x": 9, "y": 1 },
-              { "x": 10, "y": 1 },
-              { "x": 11, "y": 1 },
-              { "x": 0, "y": 2 },
-              { "x": 1, "y": 2 },
-              { "x": 2, "y": 2 },
-              { "x": 3, "y": 2 },
-              { "x": 4, "y": 2 },
-              { "x": 5, "y": 2 },
-              { "x": 6, "y": 2 },
-              { "x": 7, "y": 2 },
-              { "x": 8, "y": 2 },
-              { "x": 9, "y": 2 },
-              { "x": 10, "y": 2 },
-              { "x": 11, "y": 2 },
-              { "x": 0, "y": 3 },
-              { "x": 1, "y": 3 },
-              { "x": 2, "y": 3 },
-              { "x": 3, "y": 3 },
-              { "x": 4, "y": 3 },
-              { "x": 5, "y": 3, "w": 2 },
-              { "x": 7, "y": 3 },
-              { "x": 8, "y": 3 },
-              { "x": 9, "y": 3 },
-              { "x": 10, "y": 3 },
-              { "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
-          },
-          "LAYOUT": {
+        },
+        "LAYOUT": {
             "layout": [
-              { "x": 0, "y": 0 },
-              { "x": 1, "y": 0 },
-              { "x": 2, "y": 0 },
-              { "x": 3, "y": 0 },
-              { "x": 4, "y": 0 },
-              { "x": 5, "y": 0 },
-              { "x": 6, "y": 0 },
-              { "x": 7, "y": 0 },
-              { "x": 8, "y": 0 },
-              { "x": 9, "y": 0 },
-              { "x": 10, "y": 0 },
-              { "x": 11, "y": 0 },
-              { "x": 12, "y": 0 },
-              { "x": 0, "y": 1 },
-              { "x": 1, "y": 1 },
-              { "x": 2, "y": 1 },
-              { "x": 3, "y": 1 },
-              { "x": 4, "y": 1 },
-              { "x": 5, "y": 1 },
-              { "x": 6, "y": 1 },
-              { "x": 7, "y": 1 },
-              { "x": 8, "y": 1 },
-              { "x": 9, "y": 1 },
-              { "x": 10, "y": 1 },
-              { "x": 11, "y": 1 },
-              { "x": 0, "y": 2 },
-              { "x": 1, "y": 2 },
-              { "x": 2, "y": 2 },
-              { "x": 3, "y": 2 },
-              { "x": 4, "y": 2 },
-              { "x": 5, "y": 2 },
-              { "x": 6, "y": 2 },
-              { "x": 7, "y": 2 },
-              { "x": 8, "y": 2 },
-              { "x": 9, "y": 2 },
-              { "x": 10, "y": 2 },
-              { "x": 11, "y": 2 },
-              { "x": 0, "y": 3 },
-              { "x": 1, "y": 3 },
-              { "x": 2, "y": 3 },
-              { "x": 3, "y": 3 },
-              { "x": 4, "y": 3 },
-              { "x": 5, "y": 3 },
-              { "x": 6, "y": 3 },
-              { "x": 7, "y": 3 },
-              { "x": 8, "y": 3 },
-              { "x": 9, "y": 3 },
-              { "x": 10, "y": 3 },
-              { "x": 11, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
index 9b8cc479ae..99bbedfdcb 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef ENCODER_ENABLE
 #   ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_DEFAULT_LAYER_1] = { { KC_DOWN, KC_UP   } },
     [_DEFAULT_LAYER_2] = { { _______, _______ } },
     [_DEFAULT_LAYER_3] = { { _______, _______ } },
diff --git a/keyboards/work_louder/work_board/keymaps/peterfalken/keymap.c b/keyboards/work_louder/work_board/keymaps/peterfalken/keymap.c
index 5cbe25322a..785322b8af 100644
--- a/keyboards/work_louder/work_board/keymaps/peterfalken/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/peterfalken/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_QWERTY]   = { { KC_VOLU, KC_VOLD } },
     [_RAISE]    = { { _______, _______ } },
     [_LOWER]    = { { _______, _______ } },
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index 08df414e88..e920c2f9bd 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LOWER]  = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
     [_RAISE]  = { ENCODER_CCW_CW(R_M_RMOD, R_M_MOD) },
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
diff --git a/keyboards/work_louder/work_board/work_board.h b/keyboards/work_louder/work_board/work_board.h
index 284eecc430..04de456eca 100644
--- a/keyboards/work_louder/work_board/work_board.h
+++ b/keyboards/work_louder/work_board/work_board.h
@@ -18,39 +18,3 @@
 
 #include "quantum.h"
 #include "rgb_functions.h"
-
-#define ___ KC_NO
-
-/* 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_2u_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
-    { k30, k31, k32, k33, k34, k35, ___, k37, k38, k39, k3a, k3b, ___ } \
-}
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
-}