diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2018-07-03 14:06:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 14:06:36 -0400 |
| commit | 9c2dde98e2b963704eb7cb87f6c53c52599fba53 (patch) | |
| tree | ced26f98b401d83aee69a6ee3b17bf9fbc6ad556 /keyboards/ergodox_ez/ergodox_ez.h | |
| parent | a7df902734b6aa8975e3a62a07ddb5544fd4ae85 (diff) | |
| parent | 08283f61244479743c4ff5ecba39bd0264979d77 (diff) | |
| download | qmk_firmware-9c2dde98e2b963704eb7cb87f6c53c52599fba53.tar.gz qmk_firmware-9c2dde98e2b963704eb7cb87f6c53c52599fba53.zip | |
Merge pull request #3229 from qmk/hf/shinydox
Adds I2C timeout and return values, adds support for future RGB Ergodox EZ
Diffstat (limited to 'keyboards/ergodox_ez/ergodox_ez.h')
| -rw-r--r-- | keyboards/ergodox_ez/ergodox_ez.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index 985dcfae54..383702b957 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -4,7 +4,7 @@ #include "quantum.h" #include <stdint.h> #include <stdbool.h> -#include "i2cmaster.h" +#include "i2c_master.h" #include <util/delay.h> #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) @@ -23,7 +23,8 @@ #define OLATA 0x14 // output latch register #define OLATB 0x15 -extern uint8_t mcp23018_status; +extern i2c_status_t mcp23018_status; +#define ERGODOX_EZ_I2C_TIMEOUT 100 void init_ergodox(void); void ergodox_blink_all_leds(void); |