summaryrefslogtreecommitdiff
path: root/keyboards/ryanskidmore
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ryanskidmore')
-rw-r--r--keyboards/ryanskidmore/rskeys100/config.h2
-rw-r--r--keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c7
-rw-r--r--keyboards/ryanskidmore/rskeys100/rskeys100.c48
3 files changed, 30 insertions, 27 deletions
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index 187834f7e3..24106a4ef1 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -31,7 +31,7 @@
/* RGB Data Pin */
#define RGB_DI_PIN C7
/* The number of RGB LEDs connected */
-#define DRIVER_LED_TOTAL 118
+#define RGB_MATRIX_LED_COUNT 105
/* Set the maximum brightness to 110 to avoid going over 500 mA.
* At full brightness with all three indicator LEDs on, the power draw is about 450 mA. */
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 110
diff --git a/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c b/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
index 38a88a3cd4..8b88f90dae 100644
--- a/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
+++ b/keyboards/ryanskidmore/rskeys100/keymaps/default/keymap.c
@@ -22,9 +22,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
/* Default Layer */
[0] = LAYOUT_fullsize_iso(
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, LT(1, KC_F12), KC_PSCR, KC_SLCK, KC_PAUS,
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, LT(1, KC_F12), KC_PSCR, KC_SCRL, KC_PAUS,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
@@ -46,7 +46,7 @@ void keyboard_post_init_user(void) {
rgb_matrix_enable_noeeprom();
}
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
/* We use RGB for the indicator RGB colours since we don't need to adjust the brightness.
* If any of the indicators are enabled, set the key to white. This overrides the active RGB
* matrix animation. */
@@ -62,4 +62,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
if (host_keyboard_led_state().scroll_lock) {
RGB_MATRIX_INDICATOR_SET_COLOR(14, 255, 255, 255);
}
+ return false;
}
diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.c b/keyboards/ryanskidmore/rskeys100/rskeys100.c
index ec98ae62cc..242ca8641d 100644
--- a/keyboards/ryanskidmore/rskeys100/rskeys100.c
+++ b/keyboards/ryanskidmore/rskeys100/rskeys100.c
@@ -5,26 +5,28 @@
#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,NO_LED, 14, 15, 16,NO_LED,NO_LED,NO_LED,NO_LED},
- { 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 24, 24, 23, 22, 21, 20, 19, 18, 17},
- { 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60},
- { 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66,NO_LED,NO_LED,NO_LED,NO_LED, 64, 63, 62,NO_LED},
- { 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,NO_LED,NO_LED, 93,NO_LED, 94, 95, 96, 97},
- { 117,NO_LED, 116, 115,NO_LED,NO_LED, 112,NO_LED,NO_LED,NO_LED, 109, 108, 107, 106, 105, 103, 102, 101,NO_LED, 99,NO_LED}
- }, {
- {0, 0}, {21, 0}, {32, 0}, {43, 0}, {53, 0}, {64, 0}, {75, 0}, {85, 0}, {96, 0}, {117, 0}, {128, 0}, {139, 0}, {149, 0}, {160, 0}, {171, 0}, {181, 0},
- {0, 13}, {11, 13}, {21, 13}, {32, 13}, {42, 13}, {53, 13}, {64, 13}, {75, 13}, {85, 13}, {96, 13}, {107, 13}, {117, 13}, {128, 13}, {139, 13}, {160, 13}, {171, 13}, {181, 13}, {192, 13}, {203, 13}, {213, 13}, {224, 13},
- {0, 26}, {11, 26}, {21, 26}, {32, 26}, {42, 26}, {53, 26}, {64, 26}, {75, 26}, {85, 26}, {96, 26}, {107, 26}, {117, 26}, {128, 26}, {149, 26}, {160, 26}, {171, 26}, {181, 26}, {192, 26}, {203, 26}, {213, 26}, {224, 26},
- {0, 38}, {11, 38}, {21, 38}, {32, 38}, {42, 38}, {53, 38}, {64, 38}, {75, 38}, {85, 38}, {96, 38}, {117, 38}, {128, 38}, {149, 38}, {192, 38}, {203, 38}, {213, 38},
- {0, 51}, {11, 51}, {21, 51}, {32, 51}, {42, 51}, {53, 51}, {64, 51}, {75, 51}, {85, 51}, {96, 51}, {107, 51}, {117, 51}, {139, 51}, {171, 51}, {192, 51}, {203, 51}, {213, 51}, {224, 51},
- {0, 64}, {11, 64}, {21, 64}, {64, 64}, {107, 64}, {117, 64}, {128, 64}, {149, 64}, {160, 64}, {171, 64}, {181, 64}, {192, 64}, {213, 64}
- }, {
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
- } };
-#endif \ No newline at end of file
+led_config_t g_led_config = {
+ {
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 13, 14, 15, NO_LED, NO_LED, NO_LED, NO_LED },
+ { 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16 },
+ { 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 },
+ { 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, NO_LED, NO_LED, NO_LED, NO_LED, 60, 59, 58, NO_LED },
+ { 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, NO_LED, NO_LED, 87, NO_LED, 88, 89, 90, 91 },
+ { 104, NO_LED, 103, 102, NO_LED, NO_LED, 101, NO_LED, NO_LED, NO_LED, 100, 99, 98, 97, 96, 95, 94, 93, NO_LED, 92, NO_LED }
+ }, {
+ { 0, 0 }, { 21, 0 }, { 32, 0 }, { 43, 0 }, { 53, 0 }, { 64, 0 }, { 75, 0 }, { 85, 0 }, { 96, 0 }, { 117, 0 }, { 128, 0 }, { 139, 0 }, { 149, 0 }, { 160, 0 }, { 171, 0 }, { 181, 0 },
+ { 0, 13 }, { 11, 13 }, { 21, 13 }, { 32, 13 }, { 42, 13 }, { 53, 13 }, { 64, 13 }, { 75, 13 }, { 85, 13 }, { 96, 13 }, { 107, 13 }, { 117, 13 }, { 128, 13 }, { 139, 13 }, { 160, 13 }, { 171, 13 }, { 181, 13 }, { 192, 13 }, { 203, 13 }, { 213, 13 }, { 224, 13 },
+ { 0, 26 }, { 11, 26 }, { 21, 26 }, { 32, 26 }, { 42, 26 }, { 53, 26 }, { 64, 26 }, { 75, 26 }, { 85, 26 }, { 96, 26 }, { 107, 26 }, { 117, 26 }, { 128, 26 }, { 149, 26 }, { 160, 26 }, { 171, 26 }, { 181, 26 }, { 192, 26 }, { 203, 26 }, { 213, 26 }, { 224, 26 },
+ { 0, 38 }, { 11, 38 }, { 21, 38 }, { 32, 38 }, { 42, 38 }, { 53, 38 }, { 64, 38 }, { 75, 38 }, { 85, 38 }, { 96, 38 }, { 117, 38 }, { 128, 38 }, { 149, 38 }, { 192, 38 }, { 203, 38 }, { 213, 38 },
+ { 0, 51 }, { 11, 51 }, { 21, 51 }, { 32, 51 }, { 42, 51 }, { 53, 51 }, { 64, 51 }, { 75, 51 }, { 85, 51 }, { 96, 51 }, { 107, 51 }, { 117, 51 }, { 139, 51 }, { 171, 51 }, { 192, 51 }, { 203, 51 }, { 213, 51 }, { 224, 51 },
+ { 0, 64 }, { 11, 64 }, { 21, 64 }, { 64, 64 }, { 107, 64 }, { 117, 64 }, { 128, 64 }, { 149, 64 }, { 160, 64 }, { 171, 64 }, { 181, 64 }, { 192, 64 }, { 213, 64 }
+ }, {
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+ }
+};
+#endif