From a6f63b9565503de346af6b2961b6d669d19ebf9b Mon Sep 17 00:00:00 2001
From: foostan <ks@fstn.jp>
Date: Tue, 30 Jan 2024 10:31:36 +0900
Subject: [PATCH] Update crkbd oled and rgbmatrix

---
 .../crkbd/qmk/qmk_firmware/keymaps/default/keymap.c      | 9 ---------
 keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c    | 8 ++++----
 keyboards/crkbd/qmk/qmk_firmware/keymaps/via/rules.mk    | 3 ++-
 keyboards/crkbd/qmk/qmk_firmware/rev1/config.h           | 6 +-----
 keyboards/crkbd/qmk/qmk_firmware/rev1/info.json          | 4 ++--
 keyboards/crkbd/qmk/qmk_firmware/rev1/post_config.h      | 5 +++++
 keyboards/crkbd/qmk/qmk_firmware/rev4/config.h           | 4 ----
 keyboards/crkbd/qmk/qmk_firmware/rev4/info.json          | 4 ++--
 keyboards/crkbd/qmk/qmk_firmware/rev4/post_config.h      | 5 +++++
 9 files changed, 21 insertions(+), 27 deletions(-)
 create mode 100644 keyboards/crkbd/qmk/qmk_firmware/rev1/post_config.h
 create mode 100644 keyboards/crkbd/qmk/qmk_firmware/rev4/post_config.h

diff --git a/keyboards/crkbd/qmk/qmk_firmware/keymaps/default/keymap.c b/keyboards/crkbd/qmk/qmk_firmware/keymaps/default/keymap.c
index 0f1f218f..c0a12c30 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/keymaps/default/keymap.c
+++ b/keyboards/crkbd/qmk/qmk_firmware/keymaps/default/keymap.c
@@ -50,12 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       //`--------------------------'  `--------------------------'
   )
 };
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-  [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-  [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-  [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-};
-#endif
diff --git a/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c b/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c
index bb3bf014..4c4496a3 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c
+++ b/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/keymap.c
@@ -53,9 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-  [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-  [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
-  [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_RGHT, KC_LEFT), },
+  [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), },
+  [1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), },
+  [2] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), },
+  [3] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(RGB_SAI, RGB_SAD), ENCODER_CCW_CW(RGB_VAI, RGB_VAD), },
 };
 #endif
diff --git a/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/rules.mk b/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/rules.mk
index 036bd6d1..2b3ca6b8 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/rules.mk
+++ b/keyboards/crkbd/qmk/qmk_firmware/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE         = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev1/config.h b/keyboards/crkbd/qmk/qmk_firmware/rev1/config.h
index ee695eb6..529b2081 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev1/config.h
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev1/config.h
@@ -8,8 +8,4 @@
 #ifdef RGB_MATRIX_ENABLE
 #  define RGB_MATRIX_LED_COUNT 54
 #  define SPLIT_TRANSPORT_MIRROR
-#endif
-
-#ifndef OLED_FONT_H
-#  define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-#endif
+#endif
\ No newline at end of file
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev1/info.json b/keyboards/crkbd/qmk/qmk_firmware/rev1/info.json
index 2b1bced1..9ab28546 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev1/info.json
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev1/info.json
@@ -143,7 +143,7 @@
         "led_count": 54,
         "split": true,
         "split_count": [27, 27],
-        "max_brightness": 120,
+        "max_brightness": 50,
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -162,7 +162,7 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
-        "max_brightness": 120,
+        "max_brightness": 50,
         "split_count": [27, 27],
         "layout": [
             {"x": 85, "y": 16, "flags": 2},
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev1/post_config.h b/keyboards/crkbd/qmk/qmk_firmware/rev1/post_config.h
new file mode 100644
index 00000000..882ff4d3
--- /dev/null
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev1/post_config.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#ifndef OLED_FONT_H
+#  define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
+#endif
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4/config.h b/keyboards/crkbd/qmk/qmk_firmware/rev4/config.h
index 415b9711..113c0eb7 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev4/config.h
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev4/config.h
@@ -9,7 +9,3 @@
 #define OLED_UPDATE_INTERVAL 50
 #define I2C1_SDA_PIN GP6
 #define I2C1_SCL_PIN GP7
-
-#ifndef OLED_FONT_H
-#  define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-#endif
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json b/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json
index fd25ecb5..c13cad39 100644
--- a/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev4/info.json
@@ -290,7 +290,7 @@
         "led_count": 46,
         "split": true,
         "split_count": [23, 23],
-        "max_brightness": 120,
+        "max_brightness": 50,
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -306,7 +306,7 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
-        "max_brightness": 120,
+        "max_brightness": 50,
         "split_count": [23, 23],
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/crkbd/qmk/qmk_firmware/rev4/post_config.h b/keyboards/crkbd/qmk/qmk_firmware/rev4/post_config.h
new file mode 100644
index 00000000..882ff4d3
--- /dev/null
+++ b/keyboards/crkbd/qmk/qmk_firmware/rev4/post_config.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#ifndef OLED_FONT_H
+#  define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
+#endif