From de326d078d9de21acccfa96525597308a7ec036d Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Fri, 17 Jun 2016 22:06:58 -0400
Subject: prevents ergodox_ez from waking up machine (#375)

---
 keyboard/ergodox_ez/matrix.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'keyboard/ergodox_ez')

diff --git a/keyboard/ergodox_ez/matrix.c b/keyboard/ergodox_ez/matrix.c
index 7266cca985..2a7dfba21d 100644
--- a/keyboard/ergodox_ez/matrix.c
+++ b/keyboard/ergodox_ez/matrix.c
@@ -106,6 +106,25 @@ void matrix_init(void)
 
 }
 
+void matrix_power_up(void) {
+    mcp23018_status = init_mcp23018();
+
+    unselect_rows();
+    init_cols();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
+
+#ifdef DEBUG_MATRIX_SCAN_RATE
+    matrix_timer = timer_read32();
+    matrix_scan_count = 0;
+#endif
+
+}
+
 uint8_t matrix_scan(void)
 {
     if (mcp23018_status) { // if there was an error
-- 
cgit v1.2.3


From db32864ce7029d758f57729cc2f75e051a28d0a2 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 18 Jun 2016 14:30:24 -0400
Subject: Cleans up quantum/keymap situation, removes extra lufa folders (#416)

* sorts out keycodes

* move midi around

* remove mbed

* replaces keymap with qmk/keymap_common

* fixes keymap.h

* keymap, config, quantum rearrange

* removes unneeded lufa stuff
---
 keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c | 2 +-
 keyboard/ergodox_ez/keymaps/townk_osx/keymap.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'keyboard/ergodox_ez')

diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
index d8911af412..131796fc5d 100644
--- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
@@ -1,6 +1,6 @@
 #include "ergodox_ez.h"
 #include "action_layer.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "keymap_extras/keymap_german.h"
 
 #define UC_ASYMPTOTICALLY_EQUAL_TO 0
diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
index b63698ec6a..07e58a491b 100644
--- a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
@@ -3,7 +3,7 @@
 #include "action_layer.h"
 #include "action_util.h"
 #include "led.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "timer.h"
 
 /*
-- 
cgit v1.2.3