Committing clang-format changes

Author: Clang Robot

src/include/Mcp.cpp

@@ -48,9 +48,8 @@ bool Mcp::mcpBegin(uint8_t _addr, uint8_t *_r)
     if (_addr == MCP23017_EXT_ADDR)
         second_mcp_inited = 1;
     if (_addr == MCP23017_INT_ADDR)
-        first_mcp_inited = 1;    
+        first_mcp_inited = 1;
     return true;
-
 }
 
 /**
@@ -63,8 +62,8 @@ bool Mcp::mcpBegin(uint8_t _addr, uint8_t *_r)
  */
 void Mcp::readMCPRegisters(uint8_t _addr, uint8_t *k)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     Wire.beginTransmission(_addr);
     Wire.write(0x00);
     Wire.endTransmission();
@@ -90,8 +89,8 @@ void Mcp::readMCPRegisters(uint8_t _addr, uint8_t *k)
  */
 void Mcp::readMCPRegisters(uint8_t _addr, uint8_t _regName, uint8_t *k, uint8_t _n)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     Wire.beginTransmission(_addr);
     Wire.write(_regName);
     Wire.endTransmission();
@@ -115,8 +114,8 @@ void Mcp::readMCPRegisters(uint8_t _addr, uint8_t _regName, uint8_t *k, uint8_t
  */
 void Mcp::readMCPRegister(uint8_t _addr, uint8_t _regName, uint8_t *k)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     Wire.beginTransmission(_addr);
     Wire.write(_regName);
     Wire.endTransmission();
@@ -135,8 +134,8 @@ void Mcp::readMCPRegister(uint8_t _addr, uint8_t _regName, uint8_t *k)
  */
 void Mcp::updateAllRegisters(uint8_t _addr, uint8_t *k)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     Wire.beginTransmission(_addr);
     Wire.write(0x00);
     for (int i = 0; i < 22; ++i)
@@ -158,8 +157,8 @@ void Mcp::updateAllRegisters(uint8_t _addr, uint8_t *k)
  */
 void Mcp::updateRegister(uint8_t _addr, uint8_t _regName, uint8_t _d)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     Wire.beginTransmission(_addr);
     Wire.write(_regName);
     Wire.write(_d);
@@ -181,8 +180,8 @@ void Mcp::updateRegister(uint8_t _addr, uint8_t _regName, uint8_t _d)
  */
 void Mcp::updateRegister(uint8_t _addr, uint8_t _regName, uint8_t *k, uint8_t _n)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     Wire.beginTransmission(_addr);
     Wire.write(_regName);
     for (int i = 0; i < _n; ++i)
@@ -213,8 +212,8 @@ void Mcp::updateRegister(uint8_t _addr, uint8_t _regName, uint8_t *k, uint8_t _n
  */
 void Mcp::pinModeInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin, uint8_t _mode)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     uint8_t _port = (_pin / 8) & 1;
     uint8_t _p = _pin % 8;
 
@@ -262,8 +261,8 @@ void Mcp::pinModeInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin, uint8_t _mod
  */
 void Mcp::digitalWriteInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin, uint8_t _state)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     uint8_t _port = (_pin / 8) & 1;
     uint8_t _p = _pin % 8;
 
@@ -287,8 +286,8 @@ void Mcp::digitalWriteInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin, uint8_t
  */
 uint8_t Mcp::digitalReadInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return 0;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return 0;
     uint8_t _port = (_pin / 8) & 1;
     uint8_t _p = _pin % 8;
     readMCPRegister(_addr, MCP23017_GPIOA + _port, _r);
@@ -316,8 +315,8 @@ uint8_t Mcp::digitalReadInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin)
 void Mcp::setIntOutputInternal(uint8_t _addr, uint8_t *_r, uint8_t intPort, uint8_t mirroring, uint8_t openDrain,
                                uint8_t polarity)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     intPort &= 1;
     mirroring &= 1;
     openDrain &= 1;
@@ -342,8 +341,8 @@ void Mcp::setIntOutputInternal(uint8_t _addr, uint8_t *_r, uint8_t intPort, uint
  */
 void Mcp::setIntPinInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin, uint8_t _mode)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     uint8_t _port = (_pin / 8) & 1;
     uint8_t _p = _pin % 8;
 
@@ -378,8 +377,8 @@ void Mcp::setIntPinInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin, uint8_t _m
  */
 void Mcp::pinModeMCP(uint8_t _pin, uint8_t _mode)
 {
-    if((!second_mcp_inited))
-    return;
+    if ((!second_mcp_inited))
+        return;
     pinModeInternal(MCP23017_EXT_ADDR, mcpRegsEx, _pin, _mode);
 }
 
@@ -394,8 +393,8 @@ void Mcp::pinModeMCP(uint8_t _pin, uint8_t _mode)
  */
 void Mcp::digitalWriteMCP(uint8_t _pin, uint8_t _state)
 {
-    if(!second_mcp_inited)
-    return;
+    if (!second_mcp_inited)
+        return;
     digitalWriteInternal(MCP23017_EXT_ADDR, mcpRegsEx, _pin, _state);
 }
 
@@ -409,8 +408,8 @@ void Mcp::digitalWriteMCP(uint8_t _pin, uint8_t _state)
  */
 uint8_t Mcp::digitalReadMCP(uint8_t _pin)
 {
-    if(!second_mcp_inited)
-    return 0;
+    if (!second_mcp_inited)
+        return 0;
     return digitalReadInternal(MCP23017_EXT_ADDR, mcpRegsEx, _pin);
 }
 
@@ -430,8 +429,8 @@ uint8_t Mcp::digitalReadMCP(uint8_t _pin)
  */
 void Mcp::setIntOutput(uint8_t intPort, uint8_t mirroring, uint8_t openDrain, uint8_t polarity)
 {
-    if(!second_mcp_inited)
-    return;
+    if (!second_mcp_inited)
+        return;
     setIntOutputInternal(MCP23017_EXT_ADDR, mcpRegsEx, intPort, mirroring, openDrain, polarity);
 }
 
@@ -445,8 +444,8 @@ void Mcp::setIntOutput(uint8_t intPort, uint8_t mirroring, uint8_t openDrain, ui
  */
 void Mcp::setIntPin(uint8_t _pin, uint8_t _mode)
 {
-    if(!second_mcp_inited)
-    return;
+    if (!second_mcp_inited)
+        return;
     setIntPinInternal(MCP23017_EXT_ADDR, mcpRegsEx, _pin, _mode);
 }
 
@@ -458,8 +457,8 @@ void Mcp::setIntPin(uint8_t _pin, uint8_t _mode)
  */
 void Mcp::removeIntPin(uint8_t _pin)
 {
-    if(!second_mcp_inited)
-    return;
+    if (!second_mcp_inited)
+        return;
     removeIntPinInternal(MCP23017_EXT_ADDR, mcpRegsEx, _pin);
 }
 
@@ -473,8 +472,8 @@ void Mcp::removeIntPin(uint8_t _pin)
  */
 uint16_t Mcp::getINT()
 {
-    if(!second_mcp_inited)
-    return 0;
+    if (!second_mcp_inited)
+        return 0;
     return getINTInternal(MCP23017_EXT_ADDR, mcpRegsEx);
 }
 
@@ -489,8 +488,8 @@ uint16_t Mcp::getINT()
  */
 uint16_t Mcp::getINTstate()
 {
-    if(!second_mcp_inited)
-    return 0;
+    if (!second_mcp_inited)
+        return 0;
     return getINTstateInternal(MCP23017_EXT_ADDR, mcpRegsEx);
 }
 
@@ -504,8 +503,8 @@ uint16_t Mcp::getINTstate()
  */
 void Mcp::setPorts(uint16_t _d)
 {
-    if(!second_mcp_inited)
-    return;
+    if (!second_mcp_inited)
+        return;
     setPortsInternal(MCP23017_EXT_ADDR, mcpRegsEx, _d);
 }
 
@@ -518,8 +517,8 @@ void Mcp::setPorts(uint16_t _d)
  */
 uint16_t Mcp::getPorts()
 {
-    if(!second_mcp_inited)
-    return 0;
+    if (!second_mcp_inited)
+        return 0;
     return getPortsInternal(MCP23017_EXT_ADDR, mcpRegsEx);
 }
 
@@ -535,8 +534,8 @@ uint16_t Mcp::getPorts()
  */
 void Mcp::removeIntPinInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     uint8_t _port = (_pin / 8) & 1;
     uint8_t _p = _pin % 8;
     _r[MCP23017_GPINTENA + _port] &= ~(1 << _p);
@@ -557,8 +556,8 @@ void Mcp::removeIntPinInternal(uint8_t _addr, uint8_t *_r, uint8_t _pin)
  */
 uint16_t Mcp::getINTInternal(uint8_t _addr, uint8_t *_r)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return 0;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return 0;
     readMCPRegisters(_addr, MCP23017_INTFA, _r, 2);
     return ((_r[MCP23017_INTFB] << 8) | _r[MCP23017_INTFA]);
 }
@@ -580,8 +579,8 @@ uint16_t Mcp::getINTInternal(uint8_t _addr, uint8_t *_r)
  */
 uint16_t Mcp::getINTstateInternal(uint8_t _addr, uint8_t *_r)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return 0;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return 0;
     readMCPRegisters(_addr, MCP23017_INTCAPA, _r, 2);
     return ((_r[MCP23017_INTCAPB] << 8) | _r[MCP23017_INTCAPA]);
 }
@@ -600,8 +599,8 @@ uint16_t Mcp::getINTstateInternal(uint8_t _addr, uint8_t *_r)
  */
 void Mcp::setPortsInternal(uint8_t _addr, uint8_t *_r, uint16_t _d)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return;
     _r[MCP23017_GPIOA] = _d & 0xff;
     _r[MCP23017_GPIOB] = (_d >> 8) & 0xff;
     updateRegister(_addr, MCP23017_GPIOA, _r, 2);
@@ -621,8 +620,8 @@ void Mcp::setPortsInternal(uint8_t _addr, uint8_t *_r, uint16_t _d)
  */
 uint16_t Mcp::getPortsInternal(uint8_t _addr, uint8_t *_r)
 {
-    if((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
-    return 0;
+    if ((_addr == MCP23017_EXT_ADDR && !second_mcp_inited) || (_addr == MCP23017_INT_ADDR && !first_mcp_inited))
+        return 0;
     readMCPRegisters(_addr, MCP23017_GPIOA, _r, 2);
     return ((_r[MCP23017_GPIOB] << 8) | (_r[MCP23017_GPIOA]));
 }