From 77f0dd809d325a6ee5bb9f1680f1da266fe00223 Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Wed, 28 Aug 2024 13:29:20 -0700
Subject: [PATCH] Fix i2c timeouts for all boards

---
 keyboards/zsa/ergodox_ez/ergodox_ez.h  | 2 +-
 keyboards/zsa/ergodox_ez/post_config.h | 4 ++--
 keyboards/zsa/moonlander/config.h      | 3 +++
 keyboards/zsa/planck_ez/config.h       | 1 +
 keyboards/zsa/voyager/config.h         | 2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/keyboards/zsa/ergodox_ez/ergodox_ez.h b/keyboards/zsa/ergodox_ez/ergodox_ez.h
index 633f6a148721..338c97c5f73f 100644
--- a/keyboards/zsa/ergodox_ez/ergodox_ez.h
+++ b/keyboards/zsa/ergodox_ez/ergodox_ez.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 extern i2c_status_t mcp23018_status;
 
 #ifndef ERGODOX_EZ_I2C_TIMEOUT
-#    define ERGODOX_EZ_I2C_TIMEOUT 80
+#    define ERGODOX_EZ_I2C_TIMEOUT 10
 #endif
 #ifndef MCP23018_EXPANDER_I2C_ADDR
 #    define MCP23018_EXPANDER_I2C_ADDR (0x20 << 1)
diff --git a/keyboards/zsa/ergodox_ez/post_config.h b/keyboards/zsa/ergodox_ez/post_config.h
index b8f06da2f408..b7889cc6e73f 100644
--- a/keyboards/zsa/ergodox_ez/post_config.h
+++ b/keyboards/zsa/ergodox_ez/post_config.h
@@ -40,6 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define WS2812_LED_COUNT RGBLIGHT_LED_COUNT
 
-#ifndef ISSI_TIMEOUT
-#    define ISSI_TIMEOUT 3
+#ifndef IS31FL3731_I2C_TIMEOUT
+#    define IS31FL3731_I2C_TIMEOUT 3
 #endif
diff --git a/keyboards/zsa/moonlander/config.h b/keyboards/zsa/moonlander/config.h
index 4e82cec8bb0d..a76474d869a5 100644
--- a/keyboards/zsa/moonlander/config.h
+++ b/keyboards/zsa/moonlander/config.h
@@ -22,6 +22,9 @@
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 7
 
+#define MCP23018_TIMEOUT 10
+
+
 #define EEPROM_I2C_24LC128
 
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
diff --git a/keyboards/zsa/planck_ez/config.h b/keyboards/zsa/planck_ez/config.h
index 1145df9ef97e..ea28be219af0 100644
--- a/keyboards/zsa/planck_ez/config.h
+++ b/keyboards/zsa/planck_ez/config.h
@@ -24,3 +24,4 @@
 #define AUDIO_PIN_ALT_AS_NEGATIVE
 
 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_TIMEOUT 5
diff --git a/keyboards/zsa/voyager/config.h b/keyboards/zsa/voyager/config.h
index 27460c591044..2310d0888d00 100644
--- a/keyboards/zsa/voyager/config.h
+++ b/keyboards/zsa/voyager/config.h
@@ -7,6 +7,8 @@
 #define MATRIX_COLS 7
 #define MATRIX_ROWS 12
 
+#define MCP23018_TIMEOUT 10
+
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC