X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fled_matrix.c;h=8ef8abe712b99cba2a45027451c24f9d73fca53b;hb=7ec583e5efb276ce90a40a1df985de7d0d0b8f46;hp=3b284990d989d9bf24daa604335b1dd91e4e64dd;hpb=bf2670601d29551896bab6811b9bb64de2d0ee0e;p=qmk_firmware.git

diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
index 3b284990d..8ef8abe71 100644
--- a/quantum/led_matrix.c
+++ b/quantum/led_matrix.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "quantum.h"
-#include "led_matrix.h"
+#include "ledmatrix.h"
 #include "progmem.h"
 #include "config.h"
 #include "eeprom.h"
@@ -67,9 +67,11 @@ uint32_t g_any_key_hit = 0;
 uint32_t eeconfig_read_led_matrix(void) {
   return eeprom_read_dword(EECONFIG_LED_MATRIX);
 }
+
 void eeconfig_update_led_matrix(uint32_t config_value) {
   eeprom_update_dword(EECONFIG_LED_MATRIX, config_value);
 }
+
 void eeconfig_update_led_matrix_default(void) {
   dprintf("eeconfig_update_led_matrix_default\n");
   led_matrix_config.enable = 1;
@@ -78,8 +80,9 @@ void eeconfig_update_led_matrix_default(void) {
   led_matrix_config.speed = 0;
   eeconfig_update_led_matrix(led_matrix_config.raw);
 }
+
 void eeconfig_debug_led_matrix(void) {
-  dprintf("led_matrix_config eprom\n");
+  dprintf("led_matrix_config eeprom\n");
   dprintf("led_matrix_config.enable = %d\n", led_matrix_config.enable);
   dprintf("led_matrix_config.mode = %d\n", led_matrix_config.mode);
   dprintf("led_matrix_config.val = %d\n", led_matrix_config.val);
@@ -87,7 +90,9 @@ void eeconfig_debug_led_matrix(void) {
 }
 
 // Last led hit
-#define LED_HITS_TO_REMEMBER 8
+#ifndef LED_HITS_TO_REMEMBER
+    #define LED_HITS_TO_REMEMBER 8
+#endif
 uint8_t g_last_led_hit[LED_HITS_TO_REMEMBER] = {255};
 uint8_t g_last_led_count = 0;
 
@@ -155,29 +160,15 @@ void led_matrix_all_off(void) {
 
 // Uniform brightness
 void led_matrix_uniform_brightness(void) {
-    led_matrix_set_index_value_all(led_matrix_config.val);
+    led_matrix_set_index_value_all(LED_MATRIX_MAXIMUM_BRIGHTNESS / BACKLIGHT_LEVELS * led_matrix_config.val);
 }
 
 void led_matrix_custom(void) {}
 
 void led_matrix_task(void) {
-  #ifdef TRACK_PREVIOUS_EFFECT
-      static uint8_t toggle_enable_last = 255;
-  #endif
-	if (!led_matrix_config.enable) {
-     led_matrix_all_off();
-     led_matrix_indicators();
-     #ifdef TRACK_PREVIOUS_EFFECT
-         toggle_enable_last = led_matrix_config.enable;
-     #endif
-     return;
-    }
-
-    // delay 1 second before driving LEDs or doing anything else
-    // FIXME: Can't we use wait_ms() here?
-    static uint8_t startup_tick = 0;
-    if (startup_tick < 20) {
-        startup_tick++;
+    if (!led_matrix_config.enable) {
+        led_matrix_all_off();
+        led_matrix_indicators();
         return;
     }
 
@@ -195,29 +186,12 @@ void led_matrix_task(void) {
         }
     }
 
-    // Factory default magic value
-    if (led_matrix_config.mode == 255) {
-        led_matrix_uniform_brightness();
-        return;
-    }
-
     // Ideally we would also stop sending zeros to the LED driver PWM buffers
     // while suspended and just do a software shutdown. This is a cheap hack for now.
     bool suspend_backlight = ((g_suspend_state && LED_DISABLE_WHEN_USB_SUSPENDED) ||
             (LED_DISABLE_AFTER_TIMEOUT > 0 && g_any_key_hit > LED_DISABLE_AFTER_TIMEOUT * 60 * 20));
     uint8_t effect = suspend_backlight ? 0 : led_matrix_config.mode;
 
-    #ifdef TRACK_PREVIOUS_EFFECT
-        // Keep track of the effect used last time,
-        // detect change in effect, so each effect can
-        // have an optional initialization.
-
-        static uint8_t effect_last = 255;
-        bool initialize = (effect != effect_last) || (led_matrix_config.enable != toggle_enable_last);
-        effect_last = effect;
-        toggle_enable_last = led_matrix_config.enable;
-    #endif
-
     // this gets ticked at 20 Hz.
     // each effect can opt to do calculations
     // and/or request PWM buffer updates.
@@ -230,10 +204,12 @@ void led_matrix_task(void) {
             break;
     }
 
-    if (! suspend_backlight) {
+    if (!suspend_backlight) {
         led_matrix_indicators();
     }
 
+    // Tell the LED driver to update its state
+    led_matrix_driver.flush();
 }
 
 void led_matrix_indicators(void) {
@@ -266,41 +242,44 @@ void led_matrix_indicators_user(void) {}
 // }
 
 void led_matrix_init(void) {
-  led_matrix_driver.init();
+    led_matrix_driver.init();
+
+    // Wait half a second for the driver to finish initializing
+    wait_ms(500);
 
-  // TODO: put the 1 second startup delay here?
+    // clear the key hits
+    for (int led=0; led<LED_DRIVER_LED_COUNT; led++) {
+        g_key_hit[led] = 255;
+    }
 
-  // clear the key hits
-  for (int led=0; led<LED_DRIVER_LED_COUNT; led++) {
-      g_key_hit[led] = 255;
-  }
+    if (!eeconfig_is_enabled()) {
+        dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
+        eeconfig_init();
+        eeconfig_update_led_matrix_default();
+    }
 
+    led_matrix_config.raw = eeconfig_read_led_matrix();
 
-  if (!eeconfig_is_enabled()) {
-      dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
-      eeconfig_init();
-      eeconfig_update_led_matrix_default();
-  }
-  led_matrix_config.raw = eeconfig_read_led_matrix();
-  if (!led_matrix_config.mode) {
-      dprintf("led_matrix_init_drivers led_matrix_config.mode = 0. Write default values to EEPROM.\n");
-      eeconfig_update_led_matrix_default();
-      led_matrix_config.raw = eeconfig_read_led_matrix();
-  }
-  eeconfig_debug_led_matrix(); // display current eeprom values
+    if (!led_matrix_config.mode) {
+        dprintf("led_matrix_init_drivers led_matrix_config.mode = 0. Write default values to EEPROM.\n");
+        eeconfig_update_led_matrix_default();
+        led_matrix_config.raw = eeconfig_read_led_matrix();
+    }
+
+    eeconfig_debug_led_matrix(); // display current eeprom values
 }
 
 // Deals with the messy details of incrementing an integer
 static uint8_t increment(uint8_t value, uint8_t step, uint8_t min, uint8_t max) {
     int16_t new_value = value;
     new_value += step;
-    return MIN(MAX( new_value, min), max );
+    return MIN(MAX(new_value, min), max);
 }
 
 static uint8_t decrement(uint8_t value, uint8_t step, uint8_t min, uint8_t max) {
     int16_t new_value = value;
     new_value -= step;
-    return MIN(MAX( new_value, min), max );
+    return MIN(MAX(new_value, min), max);
 }
 
 // void *backlight_get_custom_key_value_eeprom_address(uint8_t led) {
@@ -329,39 +308,41 @@ uint32_t led_matrix_get_tick(void) {
 }
 
 void led_matrix_toggle(void) {
-	led_matrix_config.enable ^= 1;
+	  led_matrix_config.enable ^= 1;
     eeconfig_update_led_matrix(led_matrix_config.raw);
 }
 
 void led_matrix_enable(void) {
-	led_matrix_config.enable = 1;
+	  led_matrix_config.enable = 1;
     eeconfig_update_led_matrix(led_matrix_config.raw);
 }
 
 void led_matrix_enable_noeeprom(void) {
-	led_matrix_config.enable = 1;
+	  led_matrix_config.enable = 1;
 }
 
 void led_matrix_disable(void) {
-	led_matrix_config.enable = 0;
+	  led_matrix_config.enable = 0;
     eeconfig_update_led_matrix(led_matrix_config.raw);
 }
 
 void led_matrix_disable_noeeprom(void) {
-	led_matrix_config.enable = 0;
+	  led_matrix_config.enable = 0;
 }
 
 void led_matrix_step(void) {
     led_matrix_config.mode++;
-    if (led_matrix_config.mode >= LED_MATRIX_EFFECT_MAX)
+    if (led_matrix_config.mode >= LED_MATRIX_EFFECT_MAX) {
         led_matrix_config.mode = 1;
+    }
     eeconfig_update_led_matrix(led_matrix_config.raw);
 }
 
 void led_matrix_step_reverse(void) {
     led_matrix_config.mode--;
-    if (led_matrix_config.mode < 1)
+    if (led_matrix_config.mode < 1) {
         led_matrix_config.mode = LED_MATRIX_EFFECT_MAX - 1;
+    }
     eeconfig_update_led_matrix(led_matrix_config.raw);
 }
 
@@ -404,3 +385,7 @@ void led_matrix_set_value(uint8_t val) {
     led_matrix_set_value_noeeprom(val);
     eeconfig_update_led_matrix(led_matrix_config.raw);
 }
+
+void backlight_set(uint8_t val) {
+    led_matrix_set_value(val);
+}