Align RGBKB keyboards to current standards (#23663)

10 files changed, 44 insertions, 90 deletions

diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/rev1/config.h
index 8348b44f96..a99cbd5fff 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/rev1/config.h
@@ -51,6 +51,7 @@
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
+#define OLED_FONT_H "keyboards/rgbkb/common/glcdfont.c"
 
 /* Audio Configuration */
 #define AUDIO_PIN A4
diff --git a/keyboards/rgbkb/sol3/halconf.h b/keyboards/rgbkb/sol3/rev1/halconf.h
index f882cef085..f882cef085 100644
--- a/keyboards/rgbkb/sol3/halconf.h
+++ b/keyboards/rgbkb/sol3/rev1/halconf.h
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index 83e0a7a927..0df040e6e0 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -8,6 +8,22 @@
         "pid": "0x3510",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "dip_switch": true,
+        "dynamic_macro": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
     "rgblight": {
         "led_count": 156,
         "split_count": [78, 78],
@@ -25,6 +41,9 @@
         }
     },
     "audio": {
+        "default": {
+            "clicky": false
+        },
         "driver": "dac_additive"
     },
     "ws2812": {
diff --git a/keyboards/rgbkb/sol3/mcuconf.h b/keyboards/rgbkb/sol3/rev1/mcuconf.h
index e68a680f48..e68a680f48 100644
--- a/keyboards/rgbkb/sol3/mcuconf.h
+++ b/keyboards/rgbkb/sol3/rev1/mcuconf.h
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c
index e853ed9b98..7d264eb17f 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.c
+++ b/keyboards/rgbkb/sol3/rev1/rev1.c
@@ -8,6 +8,7 @@
  */
 
 #include "rev1.h"
+#include "transactions.h"
 #include "split_util.h"
 
 #define NUMBER_OF_TOUCH_ENCODERS 2
@@ -256,3 +257,15 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 };
+
+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);
+}
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.h b/keyboards/rgbkb/sol3/rev1/rev1.h
index 2ed720fcc3..6f08563e79 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.h
+++ b/keyboards/rgbkb/sol3/rev1/rev1.h
@@ -9,7 +9,9 @@
 
 #pragma once
 
-#include "sol3.h"
+#include "quantum.h"
+#include "touch_encoder.h"
+#include "common_oled.h"
 
 // weak functions overridable by the user
 void render_layer_status(void);
diff --git a/keyboards/rgbkb/sol3/rev1/rules.mk b/keyboards/rgbkb/sol3/rev1/rules.mk
new file mode 100644
index 0000000000..dad85ac483
--- /dev/null
+++ b/keyboards/rgbkb/sol3/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
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 0c48b5d30e..74804682a2 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -1,34 +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 = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # 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 = yes          # Audio output
-
-DYNAMIC_MACRO_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
-
-RGBLIGHT_ENABLE = no
-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/sol3/rev1
diff --git a/keyboards/rgbkb/sol3/sol3.c b/keyboards/rgbkb/sol3/sol3.c
deleted file mode 100644
index 97ae5bc5de..0000000000
--- a/keyboards/rgbkb/sol3/sol3.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#include "sol3.h"
-#include "eeconfig.h"
-#include "audio.h"
-#include <transactions.h>
-
-extern audio_config_t audio_config;
-
-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 eeconfig_init_kb(void) {
-    // Reset Keyboard EEPROM value to blank, rather than to a set value
-    eeconfig_update_kb(0);
-
-    audio_config.raw = eeconfig_read_audio();
-    audio_config.clicky_enable = false;
-    eeconfig_update_audio(audio_config.raw);
-
-    eeconfig_init_user();
-}
-
-void housekeeping_task_kb(void) {
-    touch_encoder_update(TOUCH_ENCODER_SYNC);
-    rgb_menu_update(RGB_MENU_SYNC);
-}
diff --git a/keyboards/rgbkb/sol3/sol3.h b/keyboards/rgbkb/sol3/sol3.h
deleted file mode 100644
index 06d5dcdea0..0000000000
--- a/keyboards/rgbkb/sol3/sol3.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#pragma once
-
-#if defined(KEYBOARD_rgbkb_sol3_rev1)
-#    include "rev1.h"
-#endif
-
-#include "quantum.h"
-#include "touch_encoder.h"
-#include "common_oled.h"