Align RGBKB keyboards to current standards (#23663)

keyboards/rgbkb/mun/config.h → keyboards/rgbkb/mun/rev1/config.h

@@ -59,3 +59,4 @@
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
+#define OLED_FONT_H "keyboards/rgbkb/common/glcdfont.c"

keyboards/rgbkb/mun/rev1/keyboard.json

@@ -8,6 +8,19 @@
         "pid": "0x3505",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
     "rgblight": {
         "led_count": 98,
         "split_count": [49, 49],

keyboards/rgbkb/mun/rev1/rev1.c

@@ -8,6 +8,9 @@
  */
 
 #include "rev1.h"
+#include "touch_encoder.h"
+#include "common_oled.h"
+#include "transactions.h"
 
 #define NUMBER_OF_TOUCH_ENCODERS 2
 #define TOUCH_ENCODER_OPTIONS TOUCH_SEGMENTS + 2
@@ -85,3 +88,15 @@ led_config_t g_led_config = { {
 } };
 // clang-format on
 #endif
+
+void keyboard_post_init_kb(void) {
+    touch_encoder_init();
+    transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync);
+    transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync);
+    keyboard_post_init_user();
+}
+
+void housekeeping_task_kb(void) {
+    touch_encoder_update(TOUCH_ENCODER_SYNC);
+    rgb_menu_update(RGB_MENU_SYNC);
+}

keyboards/rgbkb/mun/rev1/rev1.h

@@ -9,5 +9,5 @@
 
 #pragma once
 
-#include "mun.h"
+#include "quantum.h"
 #include "touch_encoder.h"

keyboards/rgbkb/mun/rev1/rules.mk

@@ -0,0 +1,8 @@
+# Touch encoder needs
+VPATH += keyboards/rgbkb/common
+SRC += touch_encoder.c
+SRC += common_oled.c
+I2C_DRIVER_REQUIRED = yes
+
+SERIAL_DRIVER = usart
+OPT = 3

keyboards/rgbkb/mun/rules.mk

@@ -1,31 +1 @@
-# Touch encoder needs
-VPATH += keyboards/rgbkb/common
-SRC += touch_encoder.c
-SRC += common_oled.c
-I2C_DRIVER_REQUIRED = yes
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # 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
-AUDIO_ENABLE = no           # Audio output
-
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-RGB_MATRIX_ENABLE = yes
-
-OLED_ENABLE = yes
-
-ENCODER_ENABLE = yes
-
-SERIAL_DRIVER = usart
-LTO_ENABLE = yes
-OPT = 3
-
-OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\"
-
 DEFAULT_FOLDER = rgbkb/mun/rev1

keyboards/rgbkb/pan/info.json

@@ -8,6 +8,15 @@
         "pid": "0x8C9C",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,

keyboards/rgbkb/pan/keymaps/default/rules.mk

@@ -1,6 +1,3 @@
 # RGB layout selection
 RGB_ENCODERS          = yes    # For RGB encoders, solder on both WS2811 chips
 STAGGERED_LAYOUT      = no     # If you soldered R1-A12 and R4-A12, enable this.
-
-# Do not edit past here
-include keyboards/$(KEYBOARD)/post_rules.mk

keyboards/rgbkb/pan/keymaps/default_eee/rules.mk

@@ -1,6 +1,3 @@
 # RGB layout selection
 RGB_ENCODERS          = yes    # For RGB encoders, solder on both WS2811 chips
 STAGGERED_LAYOUT      = no     # If you soldered R1-A12 and R4-A12, enable this.
-
-# Do not edit past here
-include keyboards/$(KEYBOARD)/post_rules.mk

keyboards/rgbkb/pan/keymaps/default_sss/rules.mk

@@ -1,6 +1,3 @@
 # RGB layout selection
 RGB_ENCODERS          = yes    # For RGB encoders, solder on both WS2811 chips
 STAGGERED_LAYOUT      = no     # If you soldered R1-A12 and R4-A12, enable this.
-
-# Do not edit past here
-include keyboards/$(KEYBOARD)/post_rules.mk

keyboards/rgbkb/pan/post_rules.mk

@@ -1,4 +1,10 @@
-# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines
+RGB_MATRIX_KEYPRESSES ?= no          # Enable reactive per-key effects.
+RGB_MATRIX_FRAMEBUFFER_EFFECTS ?= no # Enable frame buffer effects like the typing heatmap.
+
+# RGB layout selection
+STAGGERED_LAYOUT ?= no # If you soldered R1-A12 and R4-A12, enable this.
+RGB_ENCODERS ?= yes    # For RGB encoders, solder on both WS2811 chips
+
 ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
     OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
 endif

keyboards/rgbkb/pan/rules.mk

@@ -1,22 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # 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 = no            # Enable N-Key Rollover
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
+WS2812_DRIVER_REQUIRED = yes
 
-# RGB layout selection
-RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips
-STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this.
-
-# Default to revision 1
 DEFAULT_FOLDER = rgbkb/pan/rev1
-
-WS2812_DRIVER_REQUIRED := yes