X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=keyboard%2Fhhkb_rn42%2Fmatrix.c;h=22becd10509e9734c384728c87f755d19cdbdfa3;hb=9179246a1d69024449829218aa7fb967d8ccc3f5;hp=b0af4baa5214089a16597bb1c2b18d78d7c15086;hpb=4f22a45b99abd6b018ac0ab8be915e45a9f88282;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/hhkb_rn42/matrix.c b/keyboard/hhkb_rn42/matrix.c
index b0af4baa..22becd10 100644
--- a/keyboard/hhkb_rn42/matrix.c
+++ b/keyboard/hhkb_rn42/matrix.c
@@ -27,8 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "matrix.h"
 #include "hhkb_avr.h"
+#include <avr/wdt.h>
+#include "suspend.h"
+#include "lufa.h"
 
 
+// matrix power saving
+#define MATRIX_POWER_SAVE       10000
+static uint32_t matrix_last_modified = 0;
+static bool matrix_power = true;
+
 // matrix state buffer(1:on, 0:off)
 static matrix_row_t *matrix;
 static matrix_row_t *matrix_prev;
@@ -72,7 +80,7 @@ uint8_t matrix_scan(void)
     matrix_prev = matrix;
     matrix = tmp;
 
-    KEY_POWER_ON();
+    matrix_power_up();
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
         for (uint8_t col = 0; col < MATRIX_COLS; col++) {
             KEY_SELECT(row, col);
@@ -126,8 +134,9 @@ uint8_t matrix_scan(void)
             // This takes 25us or more to make sure KEY_STATE returns to idle state.
             _delay_us(75);
         }
+        if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32();
     }
-    KEY_POWER_OFF();
+    matrix_power_down();
     return 1;
 }
 
@@ -165,3 +174,18 @@ void matrix_print(void)
         xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
     }
 }
+
+void matrix_power_up(void) {
+    if (matrix_power) return;
+    KEY_POWER_ON();
+    matrix_power = true;
+}
+void matrix_power_down(void) {
+    if (!matrix_power) return;
+    // doesn't power save while USB connection is active
+    if (USB_DeviceState != DEVICE_STATE_Unattached) return;
+    if (timer_elapsed32(matrix_last_modified) <= MATRIX_POWER_SAVE) return;
+    KEY_POWER_OFF();
+    suspend_power_down();
+    matrix_power = false;
+}