Merge remote-tracking branch 'upstream/develop'

1 files changed, 19 insertions, 27 deletions

diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c
index d257212750..0185a7ce2b 100755
--- a/keyboards/kbdfans/maja/maja.c
+++ b/keyboards/kbdfans/maja/maja.c
@@ -1,6 +1,6 @@
 #include "maja.h"
 
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 	{0, C2_1,  C3_1,  C4_1},  // LA0
     {0, C1_1,  C3_2, C4_2},   // LA1
     {0, C1_2,  C2_2, C4_3},   // LA2
@@ -14,7 +14,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, C1_12, C2_12, C3_12}, // LB4
     {0, C1_11, C2_11, C3_11}, // LB3
     {0, C1_10, C2_10, C4_11}, // LB2
-    {0, C1_9,  C3_10, C4_10}, // LB1	
+    {0, C1_9,  C3_10, C4_10}, // LB1
 	{0, C2_9,  C3_9,  C4_9},  // LB0
 
     {0, C9_4,  C8_4, C7_4},   // LA12
@@ -39,20 +39,20 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, C9_8,  C7_7, C6_7},   // LA16
     {0, C8_8,  C7_8, C6_8},   // LA17
     {1, C2_1,  C3_1,  C4_1},  // LC0
-    {1, C1_15, C2_15, C3_15}, // LD7	
-    {1, C1_14, C2_14, C3_14}, // LD6	
-    {1, C1_13, C2_13, C3_13}, // LD5	
-    {1, C1_12, C2_12, C3_12}, // LD4	
+    {1, C1_15, C2_15, C3_15}, // LD7
+    {1, C1_14, C2_14, C3_14}, // LD6
+    {1, C1_13, C2_13, C3_13}, // LD5
+    {1, C1_12, C2_12, C3_12}, // LD4
     {1, C1_11, C2_11, C3_11}, // LD3
     {1, C1_10, C2_10, C4_11}, // LD2
     {1, C1_9,  C3_10, C4_10}, // LD1
     {0, C8_16, C7_16, C6_16}, // LB17
 
     {1, C1_6,  C2_6, C3_6},   // LC6
-    {1, C1_5,  C2_5, C3_5},   // LC5	
-    {1, C1_4,  C2_4, C3_4},   // LC4	
+    {1, C1_5,  C2_5, C3_5},   // LC5
+    {1, C1_4,  C2_4, C3_4},   // LC4
     {1, C1_3,  C2_3, C3_3},   // LC3
-    {1, C1_2,  C2_2, C4_3},   // LC2	
+    {1, C1_2,  C2_2, C4_3},   // LC2
     {1, C1_1,  C3_2, C4_2},   // LC1
     {1, C1_16, C2_16, C3_16}, // LD8
     {1, C9_9,  C8_9,  C7_9},  // LD9
@@ -80,7 +80,7 @@ led_config_t g_led_config = { {
     {  30,  31,     32,  33,  34,     35,  36,     37,  38,     39,  40,     41,     NO_LED, 42,  43},
     {  44,  45,     46,  47,  48,     49,  50,     51,  52,     53,  54,     55,     56,     57,  NO_LED},
 	{  58,  NO_LED, 59,  60,  NO_LED, 61,  NO_LED, 62,  NO_LED, 63,  NO_LED, NO_LED, 64,     65,  66}
-}, { 
+}, {
     {4,1},{18,1},{31,0},{46,3},{59,5},{73,7},{86,10},{107,9},{121,7},{134,4},{148,2},{162,0},{176,2},{196,2},{224,0},
 	{5,15},{22,15},{37,15},{50,17},{64,20},{77,22},{103,23},{117,21},{130,19},{143,16},{158,15},{171,16},{186,16},{202,16},{224,16},
 	{4,28},{23,28},{38,29},{51,31},{65,34},{78,36},{109,36},{122,34},{136,32},{150,29},{164,29},{177,29},{200,29},{224,29},
@@ -88,26 +88,18 @@ led_config_t g_led_config = { {
 	{0,55},{40,58},{62,61},{86,64},{119,62},{147,58},{201,60},{214,60},{224,60}
 }, {
     1, 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, 1, 
+	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, 1,
 	4, 4, 4, 1, 4, 4, 1, 1, 1
 } };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (host_keyboard_led_state().caps_lock)
-    {
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
+    return true;
 }