rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jonas Zeunert
2020-01-09 20:53:21 +01:00
parent 444b41d64d 5a239e5357
commit fdc85f5750
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FlippR-Driver/src/PinController.cpp
View File

@@ -50,13 +50,15 @@ bool PinController::read_pin(uint8_t address)
void PinController::initialize_port_expander(const uint8_t i2c_address, const uint8_t pin_base) void PinController::initialize_port_expander(const uint8_t i2c_address, const uint8_t pin_base)
{ {
auto initialized_port_extender = this->initialized_port_extenders.insert(std::pair<uint8_t, uint8_t>(i2c_address, pin_base); auto initialized_port_extender = this->initialized_port_extenders.insert(std::pair<uint8_t, uint8_t>(i2c_address, pin_base));
if(initialized_port_extender->second) if(not initialized_port_extender.second)
{ {
if(initialized_port_extender->first->second != pin_base) if(initialized_port_extender.first->second != pin_base)
{ {
CLOG(ERROR, OUTPUT_LOGGER) << "Port extender with address " << i2c_address char hex_string[4];
<< " is already initialized with pin base " << pin_base; sprintf(hex_string, "%X", i2c_address);
CLOG(WARNING, OUTPUT_LOGGER) << "Port extender with address 0x" << hex_string
<< " is already initialized with pin base " << int(pin_base) << ". Check config files!";
} }
return; return;
} }