led_matrix works now

[qmk_firmware.git] / quantum / led_matrix.c

diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
index 9a0aa6acd940b395b03cfa03d29016b4de5b8978..f849d478ddc284779bcbea7330c67aee7b514bbc 100644 (file)
--- a/quantum/led_matrix.c
+++ b/quantum/led_matrix.c
@@ -55,11 +55,14 @@ led_config_t led_matrix_config;
 
 bool g_suspend_state = false;
 
+// Last uniform brightness level.
+uint8_t g_uniform_brightness = 0;
+
 // Global tick at 20 Hz
 uint32_t g_tick = 0;
 
 // Ticks since this key was last hit.
-uint8_t g_key_hit[DRIVER_LED_TOTAL];
+uint8_t g_key_hit[LED_DRIVER_LED_COUNT];
 
 // Ticks since any key was last hit.
 uint32_t g_any_key_hit = 0;
@@ -95,7 +98,7 @@ void map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i, uint8_t
     led_matrix led;
     *led_count = 0;
 
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+    for (uint8_t i = 0; i < LED_DRIVER_LED_COUNT; i++) {
         // map_index_to_led(i, &led);
         led = g_leds[i];
         if (row == led.matrix_co.row && column == led.matrix_co.col) {
@@ -118,6 +121,7 @@ void led_matrix_set_index_value_all(uint8_t value) {
 }
 
 bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
+/* FIXME: Why you comment out skully?
     if (record->event.pressed) {
         uint8_t led[8], led_count;
         map_row_column_to_led(record->event.key.row, record->event.key.col, led, &led_count);
@@ -141,6 +145,7 @@ bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
         g_any_key_hit = 255;
         #endif
     }
+*/
     return true;
 }
 
@@ -155,22 +160,20 @@ void led_matrix_all_off(void) {
 
 // Uniform brightness
 void led_matrix_uniform_brightness(void) {
-    led_matrix_set_index_value_all(led_matrix_config.val);
+    uint8_t current_brightness = (LED_MATRIX_MAXIMUM_BRIGHTNESS / BACKLIGHT_LEVELS) * led_matrix_config.val;
+    if (current_brightness != g_uniform_brightness) {
+        g_uniform_brightness = current_brightness;
+        led_matrix_set_index_value_all(current_brightness);
+    }
 }
 
 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;
+    if (!led_matrix_config.enable) {
+        led_matrix_all_off();
+        led_matrix_indicators();
+        return;
     }
 
     // delay 1 second before driving LEDs or doing anything else
@@ -187,7 +190,8 @@ void led_matrix_task(void) {
         g_any_key_hit++;
     }
 
-    for (int led = 0; led < DRIVER_LED_TOTAL; led++) {
+/* FIXME: WHY YOU COMMENT OUT?!
+    for (int led = 0; led < LED_DRIVER_LED_COUNT; led++) {
         if (g_key_hit[led] < 255) {
             if (g_key_hit[led] == 254)
                 g_last_led_count = MAX(g_last_led_count - 1, 0);
@@ -200,24 +204,13 @@ void led_matrix_task(void) {
         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 +223,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) {
@@ -271,7 +266,7 @@ void led_matrix_init(void) {
   // TODO: put the 1 second startup delay here?
 
   // clear the key hits
-  for (int led=0; led<DRIVER_LED_TOTAL; led++) {
+  for (int led=0; led<LED_DRIVER_LED_COUNT; led++) {
       g_key_hit[led] = 255;
   }
 
@@ -317,7 +312,7 @@ static uint8_t decrement(uint8_t value, uint8_t step, uint8_t min, uint8_t max)
 //     uint8_t led[8], led_count;
 //     map_row_column_to_led(row,column,led,&led_count);
 //     for(uint8_t i = 0; i < led_count; i++) {
-//         if (led[i] < DRIVER_LED_TOTAL) {
+//         if (led[i] < LED_DRIVER_LED_COUNT) {
 //             void *address = backlight_get_custom_key_value_eeprom_address(led[i]);
 //             eeprom_update_byte(address, value);
 //         }
@@ -396,9 +391,15 @@ uint8_t led_matrix_get_mode(void) {
     return led_matrix_config.mode;
 }
 
-void led_matrix_set_value(uint8_t val, bool eeprom_write) {
+void led_matrix_set_value_noeeprom(uint8_t val) {
     led_matrix_config.val = val;
-    if (eeprom_write) {
-      eeconfig_update_led_matrix(led_matrix_config.raw);
-    }
+}
+
+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);
 }