summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2018-06-12 14:27:22 -0400
committerJack Humbert <jack.humb@gmail.com>2018-06-12 14:27:22 -0400
commitb8564f5dd08f49ee0fc6d28957a376132bd7038d (patch)
tree5a0ddabb672b057ea0f5c6fcb97f08a5dae11272
parent998ddbb122c9d3e2a77bd4e88c881b225ca0d569 (diff)
revert some attempts, update i2c
-rwxr-xr-xdrivers/avr/i2c_master.c2
-rw-r--r--keyboards/ergodox_ez/config.h5
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.c14
-rw-r--r--keyboards/ergodox_ez/matrix.c8
4 files changed, 14 insertions, 15 deletions
diff --git a/drivers/avr/i2c_master.c b/drivers/avr/i2c_master.c
index bcf92153c5..cd3c2e1c81 100755
--- a/drivers/avr/i2c_master.c
+++ b/drivers/avr/i2c_master.c
@@ -21,7 +21,7 @@ void i2c_init(void)
uint8_t i2c_start(uint8_t address)
{
// reset TWI control register
- //TWCR = 0;
+ TWCR = 0;
// transmit START condition
TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
// wait for end of transmission
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 3dfe8733cb..1285cbe1c9 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -81,10 +81,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* fix space cadet rollover issue */
#define DISABLE_SPACE_CADET_ROLLOVER
-// #define RGB_MIDI
-#define RGBW_BB_TWI
+// #define RGBW_BB_TWI
-#define RGBW 1
+// #define RGBW 1
/* "debounce" is measured in keyboard scans. Some users reported
* needing values as high as 15, which was at the time around 50ms.
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index b393d73d7e..3a2d1273fa 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -113,13 +113,13 @@ uint8_t init_mcp23018(void) {
// sreg_prev=SREG;
// cli();
- // if (i2c_initialized == 0) {
- // i2c_init(); // on pins D(1,0)
- // i2c_initialized = true;
- // _delay_ms(1000);
- // }
- i2c_init(); // on pins D(1,0)
- _delay_ms(1000);
+ if (i2c_initialized == 0) {
+ i2c_init(); // on pins D(1,0)
+ i2c_initialized = true;
+ _delay_ms(1000);
+ }
+ // i2c_init(); // on pins D(1,0)
+ // _delay_ms(1000);
// set pin direction
// - unused : input : 1
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 6660af46a4..8b117166fb 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -68,8 +68,8 @@ static void init_cols(void);
static void unselect_rows(void);
static void select_row(uint8_t row);
-// static uint8_t mcp23018_reset_loop;
-static uint16_t mcp23018_reset_loop;
+static uint8_t mcp23018_reset_loop;
+// static uint16_t mcp23018_reset_loop;
#ifdef DEBUG_MATRIX_SCAN_RATE
uint32_t matrix_timer;
@@ -176,8 +176,8 @@ void debounce_report(matrix_row_t change, uint8_t row) {
uint8_t matrix_scan(void)
{
if (mcp23018_status) { // if there was an error
- // if (++mcp23018_reset_loop == 0) {
- if (++mcp23018_reset_loop >= 1300) {
+ if (++mcp23018_reset_loop == 0) {
+ // if (++mcp23018_reset_loop >= 1300) {
// since mcp23018_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans
// this will be approx bit more frequent than once per second
print("trying to reset mcp23018\n");