From 45abaabb1e284d0360a35574641542875d82f54d Mon Sep 17 00:00:00 2001
From: andrethomas <andre1024@gmail.com>
Date: Sun, 26 Aug 2018 13:38:43 +0200
Subject: [PATCH] MCP230xx - Resolve compiler warnings

---
 sonoff/xsns_29_mcp230xx.ino | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/sonoff/xsns_29_mcp230xx.ino b/sonoff/xsns_29_mcp230xx.ino
index 4898ca509..f27d68990 100644
--- a/sonoff/xsns_29_mcp230xx.ino
+++ b/sonoff/xsns_29_mcp230xx.ino
@@ -108,9 +108,8 @@ if ((6 == pinmod) && (statu < 2)) { statu = abs(statu-1); }
       return "TOGGLE";
       break;
 #endif // USE_MCP230xx_OUTPUT
-    default:
-      break;
   }
+  return "";
 }
 
 const char* IntModeTxt(uint8_t intmo) {
@@ -127,10 +126,8 @@ const char* IntModeTxt(uint8_t intmo) {
     case 3:
       return "DISABLED";
       break;
-    default:
-      return "UNKNOWN";
-      break;
   }
+  return "";
 }
 
 uint8_t MCP230xx_readGPIO(uint8_t port) {
@@ -235,7 +232,7 @@ void MCP230xx_Detect()
   }
 }
 
-bool MCP230xx_CheckForInterrupt(void) {
+void MCP230xx_CheckForInterrupt(void) {
   uint8_t intf;
   uint8_t mcp230xx_intcap = 0;
   uint8_t report_int;
@@ -351,22 +348,22 @@ void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
   if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
     if (pinstate < 2) {
       if (6 == pinmo) {
-        if (pinstate) portpins |= (1 << pin-(port*8)); else portpins |= (1 << pin+pinadd-(port*8)),portpins &= ~(1 << pin-(port*8));
+        if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins |= (1 << (pin+pinadd-(port*8))),portpins &= ~(1 << (pin-(port*8)));
       } else {
-        if (pinstate) portpins &= ~(1 << pin+pinadd-(port*8)),portpins |= (1 << pin-(port*8)); else portpins &= ~(1 << pin-(port*8));
+        if (pinstate) portpins &= ~(1 << (pin+pinadd-(port*8))),portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
       }
     } else {
       if (6 == pinmo) {
-      portpins |= (1 << pin+pinadd-(port*8)),portpins ^= (1 << pin-(port*8));
+      portpins |= (1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
       } else {
-      portpins &= ~(1 << pin+pinadd-(port*8)),portpins ^= (1 << pin-(port*8));
+      portpins &= ~(1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
       }
     }
   } else {
     if (pinstate < 2) {
-      if (pinstate) portpins |= (1 << pin-(port*8)); else portpins &= ~(1 << pin-(port*8));
+      if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
     } else {
-      portpins ^= (1 << pin-(port*8));
+      portpins ^= (1 << (pin-(port*8)));
     }
   }
   I2cWrite8(mcp230xx_address, MCP230xx_GPIO + port, portpins);