aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/rgbkb/sol/keymaps/default/keymap.c18
-rw-r--r--keyboards/rgbkb/sol/keymaps/default/readme.md8
-rw-r--r--keyboards/rgbkb/sol/rev2/config.h2
-rw-r--r--keyboards/rgbkb/sol/rev2/post_rules.mk2
-rw-r--r--keyboards/rgbkb/sol/rev2/rev2.c20
-rw-r--r--keyboards/rgbkb/sol/rev2/rules.mk1
6 files changed, 38 insertions, 13 deletions
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index e08e02c48..04af5165e 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -107,13 +107,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
107 * ,------------------------------------------------. ,------------------------------------------------. 107 * ,------------------------------------------------. ,------------------------------------------------.
108 * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | 108 * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 |
109 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| 109 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
110 * | | SAD | VAI | SAI | RESET| | | | | | | | | | | 110 * | | SAD | VAI | SAI | RESET| | | | | | P7 | P8 | P9 | | |
111 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| 111 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
112 * | | HUD | VAD | HUI |RGBRST| | | | | |QWERTY|COLEMK| | | | 112 * | | HUD | VAD | HUI |RGBRST| | | | | | P4 | P5 | P6 | | |
113 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| 113 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
114 * | | SPD | | SPI | | | | | | | |RGBTOG| HUI | SAI | VAI | 114 * | | SPD | | SPI | | | | | | | P1 | P2 | P3 | | |
115 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| 115 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
116 * | | | |RGBMOD(| | | | | | | |RGBRMOD| HUD | SAD | VAD | 116 * | | | |RGBMOD| | | | | | | P0 | PDOT | NLCK |QWERTY|COLEMK|
117 * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' 117 * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
118 * | | | | | | 118 * | | | | | |
119 * `-------------' `-------------' 119 * `-------------' `-------------'
@@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
121 121
122 [_ADJ] = LAYOUT( \ 122 [_ADJ] = LAYOUT( \
123 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ 123 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
124 _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 124 _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, \
125 _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, \ 125 _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, \
126 _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, RGB_SPI, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ 126 _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, \
127 _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, \ 127 _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_NLCK, QWERTY, COLEMAK, \
128 _______, _______, _______, _______ \ 128 _______, _______, _______, _______ \
129 ) 129 )
130}; 130};
@@ -301,7 +301,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
301oled_rotation_t oled_init_user(oled_rotation_t rotation) { 301oled_rotation_t oled_init_user(oled_rotation_t rotation) {
302 if (is_keyboard_master()) 302 if (is_keyboard_master())
303 return OLED_ROTATION_270; 303 return OLED_ROTATION_270;
304 return rotation; 304 return OLED_ROTATION_180;
305} 305}
306 306
307static void render_logo(void) { 307static void render_logo(void) {
diff --git a/keyboards/rgbkb/sol/keymaps/default/readme.md b/keyboards/rgbkb/sol/keymaps/default/readme.md
index 4a97a7bab..ce5bce19e 100644
--- a/keyboards/rgbkb/sol/keymaps/default/readme.md
+++ b/keyboards/rgbkb/sol/keymaps/default/readme.md
@@ -57,13 +57,13 @@
57 * ,------------------------------------------------. ,------------------------------------------------. 57 * ,------------------------------------------------. ,------------------------------------------------.
58 * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | 58 * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 |
59 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| 59 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
60 * | | SAD | VAI | SAI | RESET| | | | | | | | | | | 60 * | | SAD | VAI | SAI | RESET| | | | | | P7 | P8 | P9 | | |
61 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| 61 * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------|
62 * | | HUD | VAD | HUI |RGBRST| | | | | |QWERTY|COLEMK| | | | 62 * | | HUD | VAD | HUI |RGBRST| | | | | | P4 | P5 | P6 | | |
63 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| 63 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
64 * | | | | | | | | | | | |RGBTOG| HUI | SAI | VAI | 64 * | | | | | | | | | | | P1 | P2 | P3 | | |
65 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| 65 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
66 * | | | |RGBMOD| | | | | | | |RGBSMOD| HUD | SAD | VAD | 66 * | | | |RGBMOD| | | | | | | P0 | PDOT | NLCK |QWERTY|COLEMK|
67 * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' 67 * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------'
68 * | | | | | | 68 * | | | | | |
69 * `-------------' `-------------' 69 * `-------------' `-------------'
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h
index af74b7e46..ee5ad924a 100644
--- a/keyboards/rgbkb/sol/rev2/config.h
+++ b/keyboards/rgbkb/sol/rev2/config.h
@@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33 33
34#ifdef FULLHAND_ENABLE 34#ifdef FULLHAND_ENABLE
35 #define FULLHAND_LEDS 24 35 #define FULLHAND_LEDS 24
36#elif SF_ENABLE
37 #define FULLHAND_LEDS 38
36#else 38#else
37 #define FULLHAND_LEDS 0 39 #define FULLHAND_LEDS 0
38#endif 40#endif
diff --git a/keyboards/rgbkb/sol/rev2/post_rules.mk b/keyboards/rgbkb/sol/rev2/post_rules.mk
index 0cbf430ad..ab03325c9 100644
--- a/keyboards/rgbkb/sol/rev2/post_rules.mk
+++ b/keyboards/rgbkb/sol/rev2/post_rules.mk
@@ -20,6 +20,8 @@ endif
20 20
21ifeq ($(strip $(FULLHAND_ENABLE)), yes) 21ifeq ($(strip $(FULLHAND_ENABLE)), yes)
22 OPT_DEFS += -DFULLHAND_ENABLE 22 OPT_DEFS += -DFULLHAND_ENABLE
23else ifeq ($(strip $(SF_ENABLE)), yes)
24 OPT_DEFS += -DSF_ENABLE
23endif 25endif
24 26
25ifeq ($(strip $(EXTRA_ENCODERS_ENABLE)), yes) 27ifeq ($(strip $(EXTRA_ENCODERS_ENABLE)), yes)
diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c
index 467aa18e4..e00c48560 100644
--- a/keyboards/rgbkb/sol/rev2/rev2.c
+++ b/keyboards/rgbkb/sol/rev2/rev2.c
@@ -33,6 +33,11 @@ led_config_t g_led_config = { {
33#ifdef FULLHAND_ENABLE 33#ifdef FULLHAND_ENABLE
34 { 2, 88 }, { 2, 103 }, { 2, 117 }, { 2, 132 }, { 10, 145 }, { 25, 145 }, { 39, 145 }, 34 { 2, 88 }, { 2, 103 }, { 2, 117 }, { 2, 132 }, { 10, 145 }, { 25, 145 }, { 39, 145 },
35 { 54, 145 }, { 69, 145 }, { 79, 136 }, { 87, 124 }, { 94, 111 }, 35 { 54, 145 }, { 69, 145 }, { 79, 136 }, { 87, 124 }, { 94, 111 },
36// SF Left
37#elif SF_ENABLE
38 { 0, 88 }, { 0, 103 }, { 0, 117 }, { 0, 130 }, { 9, 142 }, { 24, 142 }, { 38, 142 },
39 { 53, 142 }, { 67, 142 }, { 79, 135 }, { 86, 123 }, { 93, 110 }, { 88, 102 }, { 74, 101 },
40 { 60, 91 }, { 45, 98 }, { 33, 92 }, { 23, 86 }, { 10, 80 },
36#endif 41#endif
37// Left Hand Mapped Right to Left 42// Left Hand Mapped Right to Left
38 { 213, 14 }, { 196, 14 }, { 182, 14 }, { 168, 14 }, { 154, 14 }, { 140, 14 }, { 122, 14 }, 43 { 213, 14 }, { 196, 14 }, { 182, 14 }, { 168, 14 }, { 154, 14 }, { 140, 14 }, { 122, 14 },
@@ -49,6 +54,11 @@ led_config_t g_led_config = { {
49#ifdef FULLHAND_ENABLE 54#ifdef FULLHAND_ENABLE
50 ,{ 222, 88 }, { 222, 103 }, { 222, 117 }, { 222, 132 }, { 214, 145 }, { 199, 145 }, { 185, 145 }, 55 ,{ 222, 88 }, { 222, 103 }, { 222, 117 }, { 222, 132 }, { 214, 145 }, { 199, 145 }, { 185, 145 },
51 { 170, 145 }, { 155, 145 }, { 145, 136 }, { 137, 124 }, { 130, 111 } 56 { 170, 145 }, { 155, 145 }, { 145, 136 }, { 137, 124 }, { 130, 111 }
57// SF Right
58#elif SF_ENABLE
59 ,{ 224, 88 }, { 224, 103 }, { 224, 117 }, { 224, 130 }, { 215, 142 }, { 200, 142 }, { 186, 142 },
60 { 171, 142 }, { 157, 142 }, { 145, 135 }, { 138, 123 }, { 131, 110 }, { 136, 102 }, { 150, 101 },
61 { 164, 91 }, { 179, 98 }, { 191, 92 }, { 201, 86 }, { 214, 80 }
52#endif 62#endif
53}, { 63}, {
54// Left Hand Mapped Left to Right 64// Left Hand Mapped Left to Right
@@ -66,6 +76,11 @@ led_config_t g_led_config = { {
66#ifdef FULLHAND_ENABLE 76#ifdef FULLHAND_ENABLE
67 2, 2, 2, 2, 2, 2, 2, 77 2, 2, 2, 2, 2, 2, 2,
68 2, 2, 2, 2, 2, 78 2, 2, 2, 2, 2,
79// SF Left
80#elif SF_ENABLE
81 2, 2, 2, 2, 2, 2, 2,
82 2, 2, 2, 2, 2, 2, 2,
83 2, 2, 2, 2, 2,
69#endif 84#endif
70// Left Hand Mapped Right to Left 85// Left Hand Mapped Right to Left
71 1, 4, 4, 4, 4, 4, 1, 86 1, 4, 4, 4, 4, 4, 1,
@@ -82,6 +97,11 @@ led_config_t g_led_config = { {
82#ifdef FULLHAND_ENABLE 97#ifdef FULLHAND_ENABLE
83 ,2, 2, 2, 2, 2, 2, 2, 98 ,2, 2, 2, 2, 2, 2, 2,
84 2, 2, 2, 2, 2 99 2, 2, 2, 2, 2
100// SF Right
101#elif SF_ENABLE
102 ,2, 2, 2, 2, 2, 2, 2,
103 2, 2, 2, 2, 2, 2, 2,
104 2, 2, 2, 2, 2
85#endif 105#endif
86} }; 106} };
87 107
diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk
index 87b400fa1..40f4c4b8c 100644
--- a/keyboards/rgbkb/sol/rev2/rules.mk
+++ b/keyboards/rgbkb/sol/rev2/rules.mk
@@ -22,6 +22,7 @@ RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typin
22 22
23RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port 23RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port
24FULLHAND_ENABLE = no # Enables the additional 24 Full Hand LEDs 24FULLHAND_ENABLE = no # Enables the additional 24 Full Hand LEDs
25SF_ENABLE = no # Enables the additional 38 Starfighter LEDs
25IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone) 26IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone)
26 27
27# Misc 28# Misc
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-23 12:50:50 +0000