aboutsummaryrefslogtreecommitdiff
path: root/keyboards/rgbkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rgbkb')
-rw-r--r--keyboards/rgbkb/mun/config.h4
-rw-r--r--keyboards/rgbkb/mun/rev1/keyboard.json (renamed from keyboards/rgbkb/mun/rev1/info.json)1
-rw-r--r--keyboards/rgbkb/mun/rev1/rules.mk0
-rw-r--r--keyboards/rgbkb/mun/rules.mk1
-rw-r--r--keyboards/rgbkb/pan/pan.c6
-rw-r--r--keyboards/rgbkb/pan/rev1/32a/keyboard.json (renamed from keyboards/rgbkb/pan/rev1/32a/info.json)0
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/keyboard.json (renamed from keyboards/rgbkb/pan/rev1/proton_c/info.json)4
-rw-r--r--keyboards/rgbkb/pan/rev1/proton_c/rules.mk0
-rw-r--r--keyboards/rgbkb/sol/rev1/keyboard.json (renamed from keyboards/rgbkb/sol/rev1/info.json)1
-rw-r--r--keyboards/rgbkb/sol/rev1/rev1.c2
-rw-r--r--keyboards/rgbkb/sol/rev2/keyboard.json (renamed from keyboards/rgbkb/sol/rev2/info.json)1
-rw-r--r--keyboards/rgbkb/sol/rev2/rev2.c2
-rw-r--r--keyboards/rgbkb/sol/rules.mk1
-rw-r--r--keyboards/rgbkb/sol3/config.h4
-rw-r--r--keyboards/rgbkb/sol3/rev1/keyboard.json (renamed from keyboards/rgbkb/sol3/rev1/info.json)4
-rw-r--r--keyboards/rgbkb/sol3/rev1/rules.mk0
-rw-r--r--keyboards/rgbkb/sol3/rules.mk2
-rw-r--r--keyboards/rgbkb/zen/info.json5
-rw-r--r--keyboards/rgbkb/zen/rev1/keyboard.json (renamed from keyboards/rgbkb/zen/rev1/info.json)0
-rw-r--r--keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c36
-rw-r--r--keyboards/rgbkb/zen/rev1/rules.mk0
-rw-r--r--keyboards/rgbkb/zen/rev2/keyboard.json (renamed from keyboards/rgbkb/zen/rev2/info.json)0
-rw-r--r--keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c24
-rw-r--r--keyboards/rgbkb/zen/rules.mk1
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/keyboard.json (renamed from keyboards/rgbkb/zygomorph/rev1/info.json)1
-rw-r--r--keyboards/rgbkb/zygomorph/rev1/rules.mk0
-rw-r--r--keyboards/rgbkb/zygomorph/rules.mk2
27 files changed, 22 insertions, 80 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index b247fa91cd..74db14c061 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -54,8 +54,8 @@
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
#define TOUCH_UPDATE_INTERVAL 33
#define OLED_UPDATE_INTERVAL 33
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/keyboard.json
index 7374f6cd47..98265c6dd9 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/keyboard.json
@@ -102,6 +102,7 @@
"tap_keycode_delay": 5
},
"split": {
+ "enabled": true,
"soft_serial_pin": "A9",
"transport": {
"sync": {
diff --git a/keyboards/rgbkb/mun/rev1/rules.mk b/keyboards/rgbkb/mun/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/rgbkb/mun/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 4269e3b0a1..04d4c554ad 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -22,7 +22,6 @@ OLED_ENABLE = yes
ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
LTO_ENABLE = yes
OPT = 3
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index d175be3641..401831e0e2 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -24,8 +24,6 @@
// LED color buffer
rgb_led_t rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
-static void init(void) {}
-
static void flush(void) {
ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
}
@@ -44,7 +42,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
rgb_matrix_ws2812_array[i].g = g;
rgb_matrix_ws2812_array[i].b = b;
}
-# ifdef RGBW
+# ifdef WS2812_RGBW
convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]);
# endif
}
@@ -56,7 +54,7 @@ static void setled_all(uint8_t r, uint8_t g, uint8_t b) {
}
const rgb_matrix_driver_t rgb_matrix_driver = {
- .init = init,
+ .init = ws2812_init,
.flush = flush,
.set_color = setled,
.set_color_all = setled_all,
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/keyboard.json
index e4ac3eeecb..e4ac3eeecb 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/keyboard.json
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
index ff81cd1092..2ad3c056c8 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
@@ -4,9 +4,7 @@
"rows": ["A15", "B10", "A14", "A13", "A7"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
"encoder": {
"rotary": [
{"pin_a": "B14", "pin_b": "B15"},
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
+++ /dev/null
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/keyboard.json
index 874b4ece22..16b61d9e02 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/keyboard.json
@@ -82,6 +82,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"tapping": {
diff --git a/keyboards/rgbkb/sol/rev1/rev1.c b/keyboards/rgbkb/sol/rev1/rev1.c
index 21b4503ab9..f5997bac00 100644
--- a/keyboards/rgbkb/sol/rev1/rev1.c
+++ b/keyboards/rgbkb/sol/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "quantum.h"
+#include "sol.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/keyboard.json
index ac57e4e74e..f7ec84cfce 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/keyboard.json
@@ -77,6 +77,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"tapping": {
diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c
index e00c485609..cd2c9f9645 100644
--- a/keyboards/rgbkb/sol/rev2/rev2.c
+++ b/keyboards/rgbkb/sol/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "quantum.h"
+#include "sol.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk
index 2cacb68825..c956bb9f5f 100644
--- a/keyboards/rgbkb/sol/rules.mk
+++ b/keyboards/rgbkb/sol/rules.mk
@@ -1,7 +1,6 @@
# Custom local font file
OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
DEFAULT_FOLDER = rgbkb/sol/rev2
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 2d3caeea4e..8348b44f96 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -46,8 +46,8 @@
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
#define TOUCH_UPDATE_INTERVAL 33
#define OLED_UPDATE_INTERVAL 33
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index 96213156f0..83e0a7a927 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -24,6 +24,9 @@
"twinkle": true
}
},
+ "audio": {
+ "driver": "dac_additive"
+ },
"ws2812": {
"pin": "B5",
"driver": "pwm"
@@ -103,6 +106,7 @@
]
},
"split": {
+ "enabled": true,
"dip_switch": {
"right": {
"pins": ["A14", "B0"]
diff --git a/keyboards/rgbkb/sol3/rev1/rules.mk b/keyboards/rgbkb/sol3/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/rgbkb/sol3/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 227219e302..0c48b5d30e 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -14,7 +14,6 @@ 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
-AUDIO_DRIVER = dac_additive
DYNAMIC_MACRO_ENABLE = yes
DIP_SWITCH_ENABLE = yes
@@ -26,7 +25,6 @@ OLED_ENABLE = yes
ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
LTO_ENABLE = yes
OPT = 3
diff --git a/keyboards/rgbkb/zen/info.json b/keyboards/rgbkb/zen/info.json
new file mode 100644
index 0000000000..2b9790e84e
--- /dev/null
+++ b/keyboards/rgbkb/zen/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/keyboard.json
index 81370b916d..81370b916d 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/keyboard.json
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
index b044652afd..c84d9574af 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
@@ -10,13 +10,6 @@ enum layer_number {
_NAV
};
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- NAV,
-
-};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
@@ -67,32 +60,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
float tone_qwerty[][2] = SONG(QWERTY_SOUND);
float tone_colemak[][2] = SONG(COLEMAK_SOUND);
#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
- persistant_default_layer_set(1UL<<_QWERTY);
- }
- return false;
- break;
- //case COLEMAK:
- //if (record->event.pressed) {
- //#ifdef AUDIO_ENABLE
- //PLAY_SONG(tone_colemak);
- //#endif
- //persistant_default_layer_set(1UL<<_COLEMAK);
- //}
- //return false;
- //break;
- }
- return true;
-}
diff --git a/keyboards/rgbkb/zen/rev1/rules.mk b/keyboards/rgbkb/zen/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/rgbkb/zen/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/keyboard.json
index 8d486e53b8..8d486e53b8 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/keyboard.json
diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
index 4b289b095f..1776c6b585 100644
--- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
@@ -10,11 +10,6 @@ enum layer_number {
_NAV
};
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- NAV
-};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
@@ -84,25 +79,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
return true;
}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- set_single_persistent_default_layer(1UL<<_QWERTY);
- }
- return false;
- break;
- //case COLEMAK:
- //if (record->event.pressed) {
- //set_single_persistent_default_layer(1UL<<_COLEMAK);
- //}
- //return false;
- //break;
- }
- return true;
-}
-
-
#if OLED_ENABLE
const char* layer_name_user(uint32_t layer) {
switch (layer) {
diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk
index 3c692c76fc..28653a7d5f 100644
--- a/keyboards/rgbkb/zen/rules.mk
+++ b/keyboards/rgbkb/zen/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight
DEFAULT_FOLDER = rgbkb/zen/rev2
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
index 3bd412cc3b..851842d081 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
@@ -23,6 +23,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"rgblight": {
diff --git a/keyboards/rgbkb/zygomorph/rev1/rules.mk b/keyboards/rgbkb/zygomorph/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/rgbkb/zygomorph/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
index bc168c3983..dfdffe3c3a 100644
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ b/keyboards/rgbkb/zygomorph/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = rgbkb/zygomorph/rev1
# Disable unsupported hardware