adds immediate i2c return, fixes ez matrix code

[qmk_firmware.git] / keyboards / ergodox_ez / ergodox_ez.h

diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index d6fa30bb20cb692983c1a1424c094d0f2855d755..64103049550bb2d725aa01f8e3d8da330f5a3027 100644 (file)
--- 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);
@@ -250,5 +251,7 @@ inline void ergodox_led_all_set(uint8_t n)
 
 #define LAYOUT_ergodox KEYMAP
 #define LAYOUT_ergodox_pretty KEYMAP_PRETTY
+#define LAYOUT_ergodox_80 KEYMAP_80
+#define LAYOUT_ergodox_pretty_80 KEYMAP_PRETTY_80
 
 #endif