From 4ae979f6ef8dbf9e1d1f35be15322ad6d02e2958 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 6 Oct 2012 02:23:12 +0900
Subject: Initial version of new code for layer switch is added.

---
 common/matrix.h | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'common/matrix.h')

diff --git a/common/matrix.h b/common/matrix.h
index c4b2cab51..b3332d5ff 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -18,8 +18,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef MATRIX_H
 #define MATRIX_H
 
+#include <stdint.h>
 #include <stdbool.h>
 
+
+#if (MATRIX_COLS <= 8)
+typedef  uint8_t    matrix_row_t;
+#elif (MATRIX_COLS <= 16)
+typedef  uint16_t   matrix_row_t;
+#elif (MATRIX_COLS <= 32)
+typedef  uint32_t   matrix_row_t;
+#else
+#error "MATRIX_COLS: invalid value"
+#endif
+
+#define MATRIX_IS_ON(row, col)  (matrix_get_row(row) && (1<<col))
+
+
 /* number of matrix rows */
 uint8_t matrix_rows(void);
 /* number of matrix columns */
@@ -35,11 +50,7 @@ bool matrix_has_ghost(void);
 /* whether a swtich is on */
 bool matrix_is_on(uint8_t row, uint8_t col);
 /* matrix state on row */
-#if (MATRIX_COLS <= 8)
-uint8_t matrix_get_row(uint8_t row);
-#else
-uint16_t matrix_get_row(uint8_t row);
-#endif
+matrix_row_t  matrix_get_row(uint8_t row);
 /* count keys pressed */
 uint8_t matrix_key_count(void);
 /* print matrix for debug */
-- 
cgit v1.2.3


From e451c059296a4c9af7a476577fee64afb9965bca Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 16 Oct 2012 11:20:49 +0900
Subject: Fix commands

---
 common/matrix.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/matrix.h')

diff --git a/common/matrix.h b/common/matrix.h
index b3332d5ff..91231e765 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -54,7 +54,7 @@ matrix_row_t  matrix_get_row(uint8_t row);
 /* count keys pressed */
 uint8_t matrix_key_count(void);
 /* print matrix for debug */
-void matrix_print(void);
+void matrix_debug(void);
 
 
 #endif
-- 
cgit v1.2.3


From fffc375b45ad795c4a8d3cde94783dac195a2613 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 18 Oct 2012 00:10:20 +0900
Subject: Add child proof keyboard locking feature!

Fix: add wait for Power down command
Add ifdef of MOUSEKEY_ENABLE
---
 common/matrix.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/matrix.h')

diff --git a/common/matrix.h b/common/matrix.h
index 91231e765..b3332d5ff 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -54,7 +54,7 @@ matrix_row_t  matrix_get_row(uint8_t row);
 /* count keys pressed */
 uint8_t matrix_key_count(void);
 /* print matrix for debug */
-void matrix_debug(void);
+void matrix_print(void);
 
 
 #endif
-- 
cgit v1.2.3