From a24a45fce71462bd80ef02fe049b16b68720d751 Mon Sep 17 00:00:00 2001
From: Ben Blazak <benblazak.dev@gmail.com>
Date: Fri, 6 Apr 2012 00:19:57 -0700
Subject: [PATCH] wrote teensy update() (need to test); minor mcp23018 update()
 fix

---
 src/keyboard/ergodox/mcp23018.c   |  9 +++++-
 src/keyboard/ergodox/teensy-2-0.c | 52 +++++++++++++++++++++++++++++--
 src/keyboard/ergodox/teensy-2-0.h |  2 ++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/keyboard/ergodox/mcp23018.c b/src/keyboard/ergodox/mcp23018.c
index a1de01f..62f224e 100644
--- a/src/keyboard/ergodox/mcp23018.c
+++ b/src/keyboard/ergodox/mcp23018.c
@@ -108,10 +108,11 @@ uint8_t mcp23018_update_matrix(uint8_t matrix[KB_ROWS][KB_COLUMNS]) {
 
 	for (uint8_t row=0x6; row<=0xB; row++) {
 		// set row low : 0
+		// set other rows high : 1
 		twi_start();
 		twi_send(TWI_ADDR_WRITE);
 		twi_send(GPIOA);
-		twi_send( 0b00111111 & ~(1<<(row-6)) );  // GPIOA
+		twi_send( 0b11111111 & ~(1<<(row-6)) );  // GPIOA
 
 		// get column data
 		twi_start();
@@ -123,6 +124,12 @@ uint8_t mcp23018_update_matrix(uint8_t matrix[KB_ROWS][KB_COLUMNS]) {
 			matrix[row][col] = !( data & (1<<col) );
 	}
 
+	// set all rows high : 1
+	twi_start();
+	twi_send(TWI_ADDR_WRITE);
+	twi_send(GPIOA);
+	twi_send(0b11111111);
+
 	twi_stop();
 
 	return 0;  // success
diff --git a/src/keyboard/ergodox/teensy-2-0.c b/src/keyboard/ergodox/teensy-2-0.c
index 39e4233..1a8e79e 100644
--- a/src/keyboard/ergodox/teensy-2-0.c
+++ b/src/keyboard/ergodox/teensy-2-0.c
@@ -11,6 +11,7 @@
 
 #include "lib/data-types.h"
 
+#include "matrix.h"
 #define TEENSY_2_0_h_INCLUDE_PRIVATE
 #include "teensy-2-0.h"
 
@@ -30,9 +31,9 @@
 
 /* pin macros
  * - note: you can move the `UNUSED`, `ROW`, and `COLUMN` pins around, but be
- *   sure to keep the set of pins listed in those catagories constant.  other
- *   pins are not movable, and either are referenced explicitly or have macros
- *   defined for them elsewhere.
+ *   sure to keep the set of all the pins listed constant.  other pins are not
+ *   movable, and either are referenced explicitly or have macros defined for
+ *   them elsewhere.
  * - note: if you change pin assignments, please be sure to update
  *   "teensy-2-0.md".
  */
@@ -149,3 +150,48 @@ uint8_t teensy_init(void) {
 	return 0;  // success
 }
 
+/* returns:
+ * - success: 0
+ * + will never return failure
+ */
+#if KB_ROWS != 12 || KB_COLUMNS != 7
+	#error "Expecting different keyboard dimensions"
+#endif
+static inline void _update_columns(
+		uint8_t matrix[KB_ROWS][KB_COLUMNS], uint8_t row ) {
+	matrix[row][0] = ! TEENSYPIN_READ(COLUMN_0);
+	matrix[row][1] = ! TEENSYPIN_READ(COLUMN_1);
+	matrix[row][2] = ! TEENSYPIN_READ(COLUMN_2);
+	matrix[row][3] = ! TEENSYPIN_READ(COLUMN_3);
+	matrix[row][4] = ! TEENSYPIN_READ(COLUMN_4);
+	matrix[row][5] = ! TEENSYPIN_READ(COLUMN_5);
+	matrix[row][6] = ! TEENSYPIN_READ(COLUMN_6);
+}
+uint8_t teensy_update_matrix(uint8_t matrix[KB_ROWS][KB_COLUMNS]) {
+	TEENSYPIN_WRITE(DDR, CLEAR, ROW_0);  // set row low (as output)
+	_update_columns(matrix, 0);          // read col 0..6 and update matrix
+	TEENSYPIN_WRITE(DDR, SET, ROW_0);    // set row hi-Z (as input)
+
+	TEENSYPIN_WRITE(DDR, CLEAR, ROW_1);
+	_update_columns(matrix, 1);
+	TEENSYPIN_WRITE(DDR, SET, ROW_1);
+
+	TEENSYPIN_WRITE(DDR, CLEAR, ROW_2);
+	_update_columns(matrix, 2);
+	TEENSYPIN_WRITE(DDR, SET, ROW_2);
+
+	TEENSYPIN_WRITE(DDR, CLEAR, ROW_3);
+	_update_columns(matrix, 3);
+	TEENSYPIN_WRITE(DDR, SET, ROW_3);
+
+	TEENSYPIN_WRITE(DDR, CLEAR, ROW_4);
+	_update_columns(matrix, 4);
+	TEENSYPIN_WRITE(DDR, SET, ROW_4);
+
+	TEENSYPIN_WRITE(DDR, CLEAR, ROW_5);
+	_update_columns(matrix, 5);
+	TEENSYPIN_WRITE(DDR, SET, ROW_5);
+
+	return 0;  // success
+}
+
diff --git a/src/keyboard/ergodox/teensy-2-0.h b/src/keyboard/ergodox/teensy-2-0.h
index 06b0e47..945cc94 100644
--- a/src/keyboard/ergodox/teensy-2-0.h
+++ b/src/keyboard/ergodox/teensy-2-0.h
@@ -32,6 +32,8 @@
 	#ifdef TEENSY_2_0_h_INCLUDE_PRIVATE
 
 		uint8_t teensy_init(void);
+		uint8_t teensy_update_matrix(
+				uint8_t matrix[KB_ROWS][KB_COLUMNS] );
 
 	#endif