Skip to content

Commit 702c0f1

Browse files
caternusoncaternuson
committed
clang it up
1 parent 10046a5 commit 702c0f1

6 files changed

+45
-44
lines changed

‎src/Adafruit_MCP23X08.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,4 @@
2727
@brief default ctor.
2828
*/
2929
/**************************************************************************/
30-
Adafruit_MCP23X08::Adafruit_MCP23X08() {
31-
pinCount = 8;
32-
}
30+
Adafruit_MCP23X08::Adafruit_MCP23X08() { pinCount = 8; }

‎src/Adafruit_MCP23X08.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@brief Class for MCP23008 I2C and MCP23S08 SPI variants.
1313
*/
1414
/**************************************************************************/
15-
class Adafruit_MCP23X08: public Adafruit_MCP23XXX {
15+
class Adafruit_MCP23X08 : public Adafruit_MCP23XXX {
1616
public:
1717
Adafruit_MCP23X08();
1818
};

‎src/Adafruit_MCP23X17.cpp

+5-16
Original file line numberDiff line numberDiff line change
@@ -27,49 +27,39 @@
2727
@brief default ctor.
2828
*/
2929
/**************************************************************************/
30-
Adafruit_MCP23X17::Adafruit_MCP23X17() {
31-
pinCount = 16;
32-
}
30+
Adafruit_MCP23X17::Adafruit_MCP23X17() { pinCount = 16; }
3331

3432
/**************************************************************************/
3533
/*!
3634
@brief Bulk read all pins on Port A.
3735
@returns current pin states of port as a uint8_t.
3836
*/
3937
/**************************************************************************/
40-
uint8_t Adafruit_MCP23X17::readGPIOA() {
41-
return readGPIO(0);
42-
}
38+
uint8_t Adafruit_MCP23X17::readGPIOA() { return readGPIO(0); }
4339

4440
/**************************************************************************/
4541
/*!
4642
@brief Bulk write all pins on Port A.
4743
@param value pin states to write as uint8_t.
4844
*/
4945
/**************************************************************************/
50-
void Adafruit_MCP23X17::writeGPIOA(uint8_t value) {
51-
writeGPIO(value, 0);
52-
}
46+
void Adafruit_MCP23X17::writeGPIOA(uint8_t value) { writeGPIO(value, 0); }
5347

5448
/**************************************************************************/
5549
/*!
5650
@brief Bulk read all pins on Port B.
5751
@returns current pin states of port as a uint8_t.
5852
*/
5953
/**************************************************************************/
60-
uint8_t Adafruit_MCP23X17::readGPIOB() {
61-
return readGPIO(1);
62-
}
54+
uint8_t Adafruit_MCP23X17::readGPIOB() { return readGPIO(1); }
6355

6456
/**************************************************************************/
6557
/*!
6658
@brief Bulk write all pins on Port B.
6759
@param value pin states to write as uint8_t.
6860
*/
6961
/**************************************************************************/
70-
void Adafruit_MCP23X17::writeGPIOB(uint8_t value) {
71-
writeGPIO(value, 1);
72-
}
62+
void Adafruit_MCP23X17::writeGPIOB(uint8_t value) { writeGPIO(value, 1); }
7363

7464
/**************************************************************************/
7565
/*!
@@ -90,4 +80,3 @@ uint16_t Adafruit_MCP23X17::readGPIOAB() {
9080
void Adafruit_MCP23X17::writeGPIOAB(uint16_t value) {
9181
writeRegister16(getRegister(MCP23XXX_GPIO), value);
9282
}
93-

‎src/Adafruit_MCP23X17.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@brief Class for MCP23017 I2C and MCP23S17 SPI variants.
1313
*/
1414
/**************************************************************************/
15-
class Adafruit_MCP23X17: public Adafruit_MCP23XXX {
15+
class Adafruit_MCP23X17 : public Adafruit_MCP23XXX {
1616
public:
1717
Adafruit_MCP23X17();
1818

‎src/Adafruit_MCP23XXX.cpp

+26-10
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ bool Adafruit_MCP23XXX::begin_I2C(uint8_t i2c_addr, TwoWire *wire) {
4444
*/
4545
/**************************************************************************/
4646
bool Adafruit_MCP23XXX::begin_SPI(uint8_t cs_pin, SPIClass *theSPI) {
47-
spi_dev = new Adafruit_SPIDevice(cs_pin, 1000000, SPI_BITORDER_MSBFIRST, SPI_MODE0, theSPI);
47+
spi_dev = new Adafruit_SPIDevice(cs_pin, 1000000, SPI_BITORDER_MSBFIRST,
48+
SPI_MODE0, theSPI);
4849
return spi_dev->begin();
4950
}
5051

@@ -58,8 +59,8 @@ bool Adafruit_MCP23XXX::begin_SPI(uint8_t cs_pin, SPIClass *theSPI) {
5859
@return true if initialization successful, otherwise false.
5960
*/
6061
/**************************************************************************/
61-
bool Adafruit_MCP23XXX::begin_SPI(int8_t cs_pin, int8_t sck_pin, int8_t miso_pin,
62-
int8_t mosi_pin) {
62+
bool Adafruit_MCP23XXX::begin_SPI(int8_t cs_pin, int8_t sck_pin,
63+
int8_t miso_pin, int8_t mosi_pin) {
6364
spi_dev = new Adafruit_SPIDevice(cs_pin, sck_pin, miso_pin, mosi_pin);
6465
return spi_dev->begin();
6566
}
@@ -105,7 +106,8 @@ void Adafruit_MCP23XXX::pinMode(uint8_t pin, uint8_t mode) {
105106
*/
106107
/**************************************************************************/
107108
uint8_t Adafruit_MCP23XXX::digitalRead(uint8_t pin) {
108-
if (pin >= pinCount) return 0;
109+
if (pin >= pinCount)
110+
return 0;
109111
return ((readGPIO(PORT(pin)) & MASK(pin)) == 0) ? LOW : HIGH;
110112
}
111113

@@ -156,11 +158,21 @@ void Adafruit_MCP23XXX::writeGPIO(uint8_t value, uint8_t port) {
156158
@param polarity HIGH or LOW
157159
*/
158160
/**************************************************************************/
159-
void Adafruit_MCP23XXX::setupInterrupts(bool mirroring, bool openDrain, uint8_t polarity) {
161+
void Adafruit_MCP23XXX::setupInterrupts(bool mirroring, bool openDrain,
162+
uint8_t polarity) {
160163
uint8_t iocon = readRegister(getRegister(MCP23XXX_IOCON));
161-
if (mirroring) iocon |= 1 << 6; else iocon &= ~(1 << 6);
162-
if (openDrain) iocon |= 1 << 2; else iocon &= ~(1 << 2);
163-
if (polarity == HIGH) iocon |= 1 << 1; else iocon &= ~(1 << 1);
164+
if (mirroring)
165+
iocon |= 1 << 6;
166+
else
167+
iocon &= ~(1 << 6);
168+
if (openDrain)
169+
iocon |= 1 << 2;
170+
else
171+
iocon &= ~(1 << 2);
172+
if (polarity == HIGH)
173+
iocon |= 1 << 1;
174+
else
175+
iocon &= ~(1 << 1);
164176
writeRegister(getRegister(MCP23XXX_IOCON), iocon);
165177
}
166178

@@ -191,7 +203,10 @@ void Adafruit_MCP23XXX::setupInterruptPin(uint8_t pin, uint8_t mode) {
191203
// set DEFVAL to 1=LOW or 0=HIGH
192204
reg = getRegister(MCP23XXX_DEFVAL, PORT(pin));
193205
uint8_t defval = readRegister(reg);
194-
if (mode == LOW) defval |= MASK(pin); else defval &= ~MASK(pin);
206+
if (mode == LOW)
207+
defval |= MASK(pin);
208+
else
209+
defval &= ~MASK(pin);
195210
writeRegister(reg, defval);
196211
}
197212
}
@@ -334,7 +349,8 @@ uint8_t Adafruit_MCP23XXX::getRegister(uint8_t baseAddress, uint8_t port) {
334349
if (pinCount > 8) {
335350
reg *= 2;
336351
// Port B
337-
if (port) reg++;
352+
if (port)
353+
reg++;
338354
}
339355
return reg;
340356
}

‎src/Adafruit_MCP23XXX.h

+11-13
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
#ifndef __ADAFRUIT_MCP23XXX_H__
66
#define __ADAFRUIT_MCP23XXX_H__
77

8-
#include <Arduino.h>
98
#include <Adafruit_I2CDevice.h>
109
#include <Adafruit_SPIDevice.h>
11-
10+
#include <Arduino.h>
1211

1312
// registers
1413
#define MCP23XXX_IODIR 0x00 //!< I/O direction register
@@ -24,13 +23,12 @@
2423
#define MCP23XXX_GPIO 0x09 //!< Port register
2524
#define MCP23XXX_OLAT 0x0A //!< Output latch register
2625

27-
#define MCP23XXX_ADDR 0x20 //!< Default I2C Address
28-
#define MCP23XXX_SPI_WRITE 0x40 //!< Opcode for SPI write
29-
#define MCP23XXX_SPI_READ 0x41 //!< Opcode for SPI read
30-
31-
#define PORT(pin) ((pin < 8) ? 0 : 1) //!< Determine port from pin number
32-
#define MASK(pin) (1 << (pin % 8)) //!< Determine mask from pin number
26+
#define MCP23XXX_ADDR 0x20 //!< Default I2C Address
27+
#define MCP23XXX_SPI_WRITE 0x40 //!< Opcode for SPI write
28+
#define MCP23XXX_SPI_READ 0x41 //!< Opcode for SPI read
3329

30+
#define PORT(pin) ((pin < 8) ? 0 : 1) //!< Determine port from pin number
31+
#define MASK(pin) (1 << (pin % 8)) //!< Determine mask from pin number
3432

3533
/**************************************************************************/
3634
/*!
@@ -51,24 +49,24 @@ class Adafruit_MCP23XXX {
5149
void digitalWrite(uint8_t pin, uint8_t value);
5250

5351
// bulk access
54-
uint8_t readGPIO(uint8_t port=0);
55-
void writeGPIO(uint8_t value, uint8_t port=0);
52+
uint8_t readGPIO(uint8_t port = 0);
53+
void writeGPIO(uint8_t value, uint8_t port = 0);
5654

5755
// interrupts
5856
void setupInterrupts(bool mirroring, bool openDrain, uint8_t polarity);
59-
void setupInterruptPin(uint8_t pin, uint8_t mode=CHANGE);
57+
void setupInterruptPin(uint8_t pin, uint8_t mode = CHANGE);
6058
void disableInterruptPin(uint8_t pin);
6159
uint8_t getLastInterruptPin();
6260

6361
protected:
6462
Adafruit_I2CDevice *i2c_dev = NULL; ///< Pointer to I2C bus interface
6563
Adafruit_SPIDevice *spi_dev = NULL; ///< Pointer to SPI bus interface
66-
uint8_t pinCount; ///< Total number of GPIO pins
64+
uint8_t pinCount; ///< Total number of GPIO pins
6765
uint8_t readRegister(uint8_t addr);
6866
void writeRegister(uint8_t addr, uint8_t value);
6967
uint16_t readRegister16(uint8_t addr);
7068
void writeRegister16(uint8_t addr, uint16_t value);
71-
uint8_t getRegister(uint8_t baseAddress, uint8_t port=0);
69+
uint8_t getRegister(uint8_t baseAddress, uint8_t port = 0);
7270

7371
private:
7472
uint8_t buffer[4];

0 commit comments

Comments
 (0)