From 215c9cc30f2bf87f9fa3de1e0bb31412b3b8447e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 26 Mar 2023 11:39:30 +0200
Subject: [PATCH] Simplify base modes

---
 .../xdrv_28_pcf8574_v2.ino                    | 19 ++++++++++++-------
 .../tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino  | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino b/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino
index ff08fd033..c04c2bda7 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino
@@ -122,9 +122,9 @@ struct PCF8574 {
   uint8_t relay_offset;
   uint8_t button_max;
   uint8_t switch_max;
-  uint8_t base;
   int8_t button_offset;
   int8_t switch_offset;
+  bool base;
   bool interrupt;
 } Pcf8574;
 
@@ -231,11 +231,10 @@ bool Pcf8574LoadTemplate(void) {
   if (!root) { return false; }
 
   // rule3 on file#pcf8574.dat do {"NAME":"PCF8574 A=B1234,Ri4321,B=B5678,Ri8765","GPIO":[32,33,34,35,259,258,257,256,36,37,38,39,263,262,261,260]} endon
-  // rule3 on file#pcf8574.dat do {"NAME":"PCF8574 A=B3456,Ri4321,B=B78910,Ri8765","BASE":1,"GPIO":[34,35,36,37,259,258,257,256,38,39,40,41,263,262,261,260]} endon
-  // rule3 on file#pcf8574.dat do {"NAME":"PCF8574 A=B3456,Ri6543,B=B78910,Ri10987","BASE":2,"GPIO":[34,35,36,37,261,260,259,258,38,39,40,41,265,264,263,262]} endon
+  // rule3 on file#pcf8574.dat do {"NAME":"PCF8574 A=B3456,Ri6543,B=B78910,Ri10987","BASE":1,"GPIO":[34,35,36,37,261,260,259,258,38,39,40,41,265,264,263,262]} endon
   JsonParserToken val = root[PSTR(D_JSON_BASE)];
   if (val) {
-    Pcf8574.base = val.getUInt();
+    Pcf8574.base = (val.getUInt()) ? true : false;
   }
   val = root[PSTR(D_JSON_NAME)];
   if (val) {
@@ -351,9 +350,11 @@ void Pcf8574Init(void) {
 
 void Pcf8574Power(void) {
   // XdrvMailbox.index = 32-bit rpower bit mask
+  // Use absolute relay indexes unique with main template
   power_t rpower = XdrvMailbox.index;
   uint32_t relay_max = TasmotaGlobal.devices_present;
-  if (Pcf8574.base < 2) {
+  if (!Pcf8574.base) {
+    // Use relative and sequential relay indexes
     rpower >>= Pcf8574.relay_offset;
     relay_max = Pcf8574.relay_max;
   }
@@ -370,11 +371,13 @@ void Pcf8574Power(void) {
 bool Pcf8574AddButton(void) {
   // XdrvMailbox.index = button/switch index
   uint32_t index = XdrvMailbox.index;
-  if (Pcf8574.base < 1) {
+  if (!Pcf8574.base) {
+    // Use relative and sequential button indexes
     if (Pcf8574.button_offset < 0) { Pcf8574.button_offset = index; }
     index -= Pcf8574.button_offset;
     if (index >= Pcf8574.button_max) { return false; }
   } else {
+    // Use absolute button indexes unique with main template
     if (!Pcf8574PinUsed(GPIO_KEY1, index)) { return false; }
     Pcf8574.button_offset = 0;
   }
@@ -385,11 +388,13 @@ bool Pcf8574AddButton(void) {
 bool Pcf8574AddSwitch(void) {
   // XdrvMailbox.index = button/switch index
   uint32_t index = XdrvMailbox.index;
-  if (Pcf8574.base < 1) {
+  if (!Pcf8574.base) {
+    // Use relative and sequential switch indexes
     if (Pcf8574.switch_offset < 0) { Pcf8574.switch_offset = index; }
     index -= Pcf8574.switch_offset;
     if (index >= Pcf8574.switch_max) { return false; }
   } else {
+    // Use absolute switch indexes unique with main template
     if (!Pcf8574PinUsed(GPIO_SWT1, index)) { return false; }
     Pcf8574.switch_offset = 0;
   }
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino b/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino
index fa7a914fa..1186bf5db 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino
@@ -152,9 +152,9 @@ struct MCP230 {
   uint8_t relay_offset;
   uint8_t button_max;
   uint8_t switch_max;
-  uint8_t base;
   int8_t button_offset;
   int8_t switch_offset;
+  bool base;
   bool interrupt;
 } Mcp23x;
 
@@ -489,7 +489,7 @@ bool MCP23xLoadTemplate(void) {
   // {"NAME":"MCP23017","GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231,40,41,42,43,44,45,46,47,232,233,234,235,236,237,238,239]}
   JsonParserToken val = root[PSTR(D_JSON_BASE)];
   if (val) {
-    Mcp23x.base = val.getUInt();
+    Mcp23x.base = (val.getUInt()) ? true : false;
   }
   val = root[PSTR(D_JSON_NAME)];
   if (val) {
@@ -738,9 +738,11 @@ void MCP23xInit(void) {
 
 void MCP23xPower(void) {
   // XdrvMailbox.index = 32-bit rpower bit mask
+  // Use absolute relay indexes unique with main template
   power_t rpower = XdrvMailbox.index;
   uint32_t relay_max = TasmotaGlobal.devices_present;
-  if (Mcp23x.base < 2) {
+  if (!Mcp23x.base) {
+    // Use relative and sequential relay indexes
     rpower >>= Mcp23x.relay_offset;
     relay_max = Mcp23x.relay_max;
   }
@@ -757,11 +759,13 @@ void MCP23xPower(void) {
 bool MCP23xAddButton(void) {
   // XdrvMailbox.index = button/switch index
   uint32_t index = XdrvMailbox.index;
-  if (Mcp23x.base < 1) {
+  if (!Mcp23x.base) {
+    // Use relative and sequential button indexes
     if (Mcp23x.button_offset < 0) { Mcp23x.button_offset = index; }
     index -= Mcp23x.button_offset;
     if (index >= Mcp23x.button_max) { return false; }
   } else {
+    // Use absolute button indexes unique with main template
     if (!MCP23xPinUsed(GPIO_KEY1, index)) { return false; }
     Mcp23x.button_offset = 0;
   }
@@ -772,11 +776,13 @@ bool MCP23xAddButton(void) {
 bool MCP23xAddSwitch(void) {
   // XdrvMailbox.index = button/switch index
   uint32_t index = XdrvMailbox.index;
-  if (Mcp23x.base < 1) {
+  if (!Mcp23x.base) {
+    // Use relative and sequential switch indexes
     if (Mcp23x.switch_offset < 0) { Mcp23x.switch_offset = index; }
     index -= Mcp23x.switch_offset;
     if (index >= Mcp23x.switch_max) { return false; }
   } else {
+    // Use absolute switch indexes unique with main template
     if (!MCP23xPinUsed(GPIO_SWT1, index)) { return false; }
     Mcp23x.switch_offset = 0;
   }