From 3bf14105631aeefed9799fc8af9971aa176daea2 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 27 Mar 2020 16:34:00 +0100
Subject: [PATCH] Fix PCF8574 and MCP230xx address confict

Fix PCF8574 and MCP230xx address confict (#8010)
---
 tasmota/xdrv_28_pcf8574.ino | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tasmota/xdrv_28_pcf8574.ino b/tasmota/xdrv_28_pcf8574.ino
index 26ae9f65a..98773c385 100644
--- a/tasmota/xdrv_28_pcf8574.ino
+++ b/tasmota/xdrv_28_pcf8574.ino
@@ -77,6 +77,16 @@ void Pcf8574Init(void)
   uint8_t pcf8574_address = PCF8574_ADDR1;
   while ((Pcf8574.max_devices < MAX_PCF8574) && (pcf8574_address < PCF8574_ADDR2 +8)) {
 
+#ifdef USE_MCP230xx_ADDR
+    if (USE_MCP230xx_ADDR == pcf8574_address) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Address 0x%02x reserved for MCP320xx skipped"), pcf8574_address);
+      pcf8574_address++;
+      if ((PCF8574_ADDR1 +7) == pcf8574_address) {  // Support I2C addresses 0x20 to 0x26 and 0x39 to 0x3F
+        pcf8574_address = PCF8574_ADDR2 +1;
+      }
+    }
+#endif
+
   //  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PCF: Probing addr: 0x%x for PCF8574"), pcf8574_address);
 
     if (I2cSetDevice(pcf8574_address)) {
@@ -93,12 +103,6 @@ void Pcf8574Init(void)
     }
 
     pcf8574_address++;
-#ifdef USE_MCP230xx_ADDR
-    if (USE_MCP230xx_ADDR == pcf8574_address) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Addr: 0x%x reserved for MCP320xx, skipping PCF8574 probe"), pcf8574_address);
-      pcf8574_address++;
-    }
-#endif
     if ((PCF8574_ADDR1 +7) == pcf8574_address) {  // Support I2C addresses 0x20 to 0x26 and 0x39 to 0x3F
       pcf8574_address = PCF8574_ADDR2 +1;
     }