Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove unnecessary variable #24

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions MCP23008.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ bool MCP23008::pinMode1(uint8_t pin, uint8_t mode)
return false;
}

uint8_t dataDirectionRegister = MCP23x08_DDR_A;
uint8_t val = readReg(dataDirectionRegister);
uint8_t val = readReg(MCP23x08_DDR_A);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -94,7 +93,7 @@ bool MCP23008::pinMode1(uint8_t pin, uint8_t mode)
val &= ~mask;
}
// other values won't change val ....
writeReg(dataDirectionRegister, val);
writeReg(MCP23x08_DDR_A, val);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -112,8 +111,7 @@ bool MCP23008::write1(uint8_t pin, uint8_t value)
_error = MCP23008_PIN_ERROR;
return false;
}
uint8_t IOR = MCP23x08_GPIO_A;
uint8_t val = readReg(IOR);
uint8_t val = readReg(MCP23x08_GPIO_A);
uint8_t pre = val;
if (_error != MCP23008_OK)
{
Expand All @@ -132,7 +130,7 @@ bool MCP23008::write1(uint8_t pin, uint8_t value)
// only write when changed.
if (pre != val)
{
writeReg(IOR, val);
writeReg(MCP23x08_GPIO_A, val);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -149,8 +147,7 @@ uint8_t MCP23008::read1(uint8_t pin)
_error = MCP23008_PIN_ERROR;
return MCP23008_INVALID_READ;
}
uint8_t IOR = MCP23x08_GPIO_A;
uint8_t val = readReg(IOR);
uint8_t val = readReg(MCP23x08_GPIO_A);
if (_error != MCP23008_OK)
{
return MCP23008_INVALID_READ;
Expand All @@ -170,8 +167,7 @@ bool MCP23008::setPolarity(uint8_t pin, bool reversed)
_error = MCP23008_PIN_ERROR;
return false;
}
uint8_t inputPolarityRegister = MCP23x08_POL_A;
uint8_t val = readReg(inputPolarityRegister);
uint8_t val = readReg(MCP23x08_POL_A);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -185,7 +181,7 @@ bool MCP23008::setPolarity(uint8_t pin, bool reversed)
{
val &= ~mask;
}
writeReg(inputPolarityRegister, val);
writeReg(MCP23x08_POL_A, val);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -201,8 +197,7 @@ bool MCP23008::getPolarity(uint8_t pin, bool &reversed)
_error = MCP23008_PIN_ERROR;
return false;
}
uint8_t inputPolarityRegister = MCP23x08_POL_A;
uint8_t val = readReg(inputPolarityRegister);
uint8_t val = readReg(MCP23x08_POL_A);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -222,8 +217,7 @@ bool MCP23008::setPullup(uint8_t pin, bool pullup)
_error = MCP23008_PIN_ERROR;
return false;
}
uint8_t inputPullupRegister = MCP23x08_PUR_A;
uint8_t val = readReg(inputPullupRegister);
uint8_t val = readReg(MCP23x08_PUR_A);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -237,7 +231,7 @@ bool MCP23008::setPullup(uint8_t pin, bool pullup)
{
val &= ~mask;
}
writeReg(inputPullupRegister, val);
writeReg(MCP23x08_PUR_A, val);
if (_error != MCP23008_OK)
{
return false;
Expand All @@ -253,8 +247,7 @@ bool MCP23008::getPullup(uint8_t pin, bool &pullup)
_error = MCP23008_PIN_ERROR;
return false;
}
uint8_t inputPullupRegister = MCP23x08_PUR_A;
uint8_t val = readReg(inputPullupRegister);
uint8_t val = readReg(MCP23x08_PUR_A);
if (_error != MCP23008_OK)
{
return false;
Expand Down
Loading