summaryrefslogtreecommitdiff
path: root/keyboards/doro67
diff options
context:
space:
mode:
authorXScorpion2 <rcalt2vt@gmail.com>2019-05-07 18:22:46 -0500
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-07 16:22:46 -0700
commitaf89752bffbaf5dcea30ea16be66b4d682701bc4 (patch)
treec82f2bc25409159a44778379db8b3a35afc47b8a /keyboards/doro67
parentc7f8548d9af2045996294602d2a4bd9a214ae23c (diff)
rgb_led struct conversion (aka: Per led (key) type rgb matrix effects - part 2) (#5783)
* Initial conversion of the rgb_led struct * Converting last keyboard & updating effects to take advantage of the new structure * New struct should not be const * Updated docs * Changing define ___ for no led to NO_LED * Missed converting some keymap usages of the old struct layout
Diffstat (limited to 'keyboards/doro67')
-rw-r--r--keyboards/doro67/rgb/rgb.c103
1 files changed, 30 insertions, 73 deletions
diff --git a/keyboards/doro67/rgb/rgb.c b/keyboards/doro67/rgb/rgb.c
index 8aaf6ef4ad..e8c9ac6321 100644
--- a/keyboards/doro67/rgb/rgb.c
+++ b/keyboards/doro67/rgb/rgb.c
@@ -14,6 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rgb.h"
+#include "rgb_matrix_types.h"
// Optional override functions below.
// You can leave any or all of these undefined.
@@ -52,76 +53,32 @@ void led_set_kb(uint8_t usb_led) {
led_set_user(usb_led);
}
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
- {{0|(0<<4)}, {15*0, 0}, 4}, // Esc
- {{0|(1<<4)}, {15*1, 0}, 4}, // 1
- {{0|(2<<4)}, {15*2, 0}, 4}, // 2
- {{0|(3<<4)}, {15*3, 0}, 4}, // 3
- {{0|(4<<4)}, {15*4, 0}, 4}, // 4
- {{0|(5<<4)}, {15*5, 0}, 4}, // 5
- {{0|(6<<4)}, {15*6, 0}, 4}, // 6
- {{0|(7<<4)}, {15*7, 0}, 4}, // 7
- {{0|(8<<4)}, {15*8, 0}, 4}, // 8
- {{0|(9<<4)}, {15*9, 0}, 4}, // 9
- {{0|(10<<4)}, {15*10, 0}, 4}, // 0
- {{0|(11<<4)}, {15*11, 0}, 4}, // -
- {{0|(12<<4)}, {15*12, 0}, 4}, // =
- {{0|(13<<4)}, {15*13.5, 0}, 1}, // Backspace
- {{0|(14<<4)}, {15*15, 0}, 1}, // Ins
-
- {{1|(0<<4)}, {15*0.5, 16}, 1}, // Tab
- {{1|(1<<4)}, {15*1.5, 16}, 4}, // Q
- {{1|(2<<4)}, {15*2.5, 16}, 4}, // W
- {{1|(3<<4)}, {15*3.5, 16}, 4}, // E
- {{1|(4<<4)}, {15*4.5, 16}, 4}, // R
- {{1|(5<<4)}, {15*5.5, 16}, 4}, // T
- {{1|(6<<4)}, {15*6.5, 16}, 4}, // Y
- {{1|(7<<4)}, {15*7.5, 16}, 4}, // U
- {{1|(8<<4)}, {15*8.5, 16}, 4}, // I
- {{1|(9<<4)}, {15*9.5, 16}, 4}, // O
- {{1|(10<<4)}, {15*10.5, 16}, 4}, // P
- {{1|(11<<4)}, {15*11.5, 16}, 4}, // [
- {{1|(12<<4)}, {15*12.5, 16}, 4}, // ]
- {{1|(13<<4)}, {15*13.75, 16}, 1}, //
- {{1|(14<<4)}, {15*15, 16}, 1}, // Del
-
- {{2|(0<<4)}, {15*0.75, 32}, 1}, // Capslock
- {{2|(1<<4)}, {15*1.75, 32}, 4}, // A
- {{2|(2<<4)}, {15*2.75, 32}, 4}, // S
- {{2|(3<<4)}, {15*3.75, 32}, 4}, // D
- {{2|(4<<4)}, {15*4.75, 32}, 4}, // F
- {{2|(5<<4)}, {15*5.75, 32}, 4}, // G
- {{2|(6<<4)}, {15*6.75, 32}, 4}, // H
- {{2|(7<<4)}, {15*7.75, 32}, 4}, // J
- {{2|(8<<4)}, {15*8.75, 32}, 4}, // K
- {{2|(9<<4)}, {15*9.75, 32}, 4}, // L
- {{2|(10<<4)}, {15*10.75, 32}, 4}, // ;
- {{2|(11<<4)}, {15*11.75, 32}, 4}, // '
- {{2|(13<<4)}, {15*13.25, 32}, 1}, // Enter
- {{2|(14<<4)}, {15*15, 32}, 1}, // Pgup
-
- {{3|(0<<4)}, {15*1.25, 48}, 1}, // LShift
- {{3|(2<<4)}, {15*2, 48}, 4}, // Z
- {{3|(3<<4)}, {15*3, 48}, 4}, // X
- {{3|(4<<4)}, {15*4, 48}, 4}, // C
- {{3|(5<<4)}, {15*5, 48}, 4}, // V
- {{3|(6<<4)}, {15*6, 48}, 4}, // B
- {{3|(7<<4)}, {15*7, 48}, 4}, // N
- {{3|(8<<4)}, {15*8, 48}, 4}, // M
- {{3|(9<<4)}, {15*9, 48}, 4}, // ,
- {{3|(10<<4)}, {15*10, 48}, 4}, // .
- {{3|(11<<4)}, {15*11, 48}, 4}, // /
- {{3|(12<<4)}, {15*12.75, 48}, 1}, // Shift
- {{3|(13<<4)}, {15*14, 48}, 1}, // Up
- {{3|(14<<4)}, {15*15, 48}, 1}, // Pgdn
-
- {{4|(0<<4)}, {15*0.25, 64}, 1}, // Ctrl
- {{4|(1<<4)}, {15*1.5, 64}, 1}, // GUI
- {{4|(2<<4)}, {15*2.25, 64}, 1}, // Alt
- {{4|(3<<4)}, {15*6.75, 64}, 4}, // Space
- {{4|(9<<4)}, {15*9, 64}, 1}, // RAlt
- {{4|(10<<4)}, {15*10.25, 64}, 1}, // FN
- {{4|(12<<4)}, {15*13, 64}, 1}, // Left
- {{4|(13<<4)}, {15*14, 64}, 1}, // Down
- {{4|(14<<4)}, {15*15, 64}, 1}, // Right
-};
+led_config_t g_led_config = { {
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
+ { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
+ { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
+ { 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 },
+ { 58, 59, 60, 61, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 62, 63, NO_LED, 64, 65, 66 }
+}, {
+ // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Ins
+ { 0, 0 }, { 15, 0 }, { 30, 0 }, { 45, 0 }, { 60, 0 }, { 75, 0 }, { 90, 0 }, { 105, 0 }, { 120, 0 }, { 135, 0 }, { 150, 0 }, { 165, 0 }, { 180, 0 }, { 202, 0 }, { 225, 0 },
+ // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], , Del
+ { 7, 16 }, { 22, 16 }, { 37, 16 }, { 52, 16 }, { 67, 16 }, { 82, 16 }, { 97, 16 }, { 112, 16 }, { 127, 16 }, { 142, 16 }, { 157, 16 }, { 172, 16 }, { 187, 16 }, { 206, 16 }, { 225, 16 },
+ // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter, Pgup
+ { 11, 32 }, { 26, 32 }, { 41, 32 }, { 56, 32 }, { 71, 32 }, { 86, 32 }, { 101, 32 }, { 116, 32 }, { 131, 32 }, { 146, 32 }, { 161, 32 }, { 176, 32 }, { 198, 32 }, { 225, 32 },
+ // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, Pgdn
+ { 18, 48 }, { 30, 48 }, { 45, 48 }, { 60, 48 }, { 75, 48 }, { 90, 48 }, { 105, 48 }, { 120, 48 }, { 135, 48 }, { 150, 48 }, { 165, 48 }, { 191, 48 }, { 210, 48 }, { 225, 48 },
+ // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+ { 3, 64 }, { 22, 64 }, { 33, 64 }, { 101, 64 }, { 135, 64 }, { 153, 64 }, { 195, 64 }, { 210, 64 }, { 225, 64 }
+}, {
+ // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Ins
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], , Del
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter, Pgup
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, Pgdn
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+ // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+ 1, 1, 1, 4, 1, 1, 1, 1, 1
+} };