From 682555faac8a67deff5688b956165cd1c39389cb Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 15 May 2018 22:30:58 -0400 Subject: i2c fix --- keyboards/ergodox_ez/ergodox_ez.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ergodox_ez/ergodox_ez.h') diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index eda6d767cf..3ffc32553c 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -4,7 +4,7 @@ #include "quantum.h" #include #include -#include "i2cmaster.h" +#include "i2c_master.h" #include #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -- cgit v1.2.3 From 6380f8319057d33bb6d07c66789867e49c634504 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 22 Jun 2018 21:26:30 -0400 Subject: refactor, non-working --- keyboards/ergodox_ez/ergodox_ez.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ergodox_ez/ergodox_ez.h') diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index 3ffc32553c..9086db2fbd 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -23,7 +23,7 @@ #define OLATA 0x14 // output latch register #define OLATB 0x15 -extern uint8_t mcp23018_status; +extern i2c_status_t mcp23018_status; void init_ergodox(void); void ergodox_blink_all_leds(void); -- cgit v1.2.3 From 7a44ad83fce391c938d18abcc2125e15c1982078 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 23 Jun 2018 14:18:47 -0400 Subject: adds immediate i2c return, fixes ez matrix code --- keyboards/ergodox_ez/ergodox_ez.h | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboards/ergodox_ez/ergodox_ez.h') diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index 9086db2fbd..6410304955 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -24,6 +24,7 @@ #define OLATB 0x15 extern i2c_status_t mcp23018_status; +#define ERGODOX_EZ_I2C_TIMEOUT 100 void init_ergodox(void); void ergodox_blink_all_leds(void); -- cgit v1.2.3