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

erased some codesmells

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-07 17:11:11 +01:00
parent 0bd7868540
commit 5e0687f7c6
19 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/src/input/IInputGPIOInterface.h
View File

@@ -8,6 +8,8 @@
#ifndef SRC_UTILITIES_IINPUTGPIOINTERFACE_H_
#define SRC_UTILITIES_IINPUTGPIOINTERFACE_H_
#include <cstdint>
namespace flippR_driver
{
namespace input
@@ -18,7 +20,7 @@ class IInputGPIOInterface
public:
virtual ~IInputGPIOInterface() = default;
virtual bool read_data(char pin) const = 0;
virtual bool read_data(uint8_t pin) const = 0;
};
}

20
FlippR-Driver/src/input/InputGPIOInterface.cpp
View File

@@ -22,12 +22,12 @@ using namespace nlohmann;
InputGPIOInterface::InputGPIOInterface(std::map<std::string, uint8_t> pins)
: pins(pins)
: pins(std::move(pins))
{
init_pins();
}
bool InputGPIOInterface::read_data(char pin) const
bool InputGPIOInterface::read_data(uint8_t pin) const
{
// setting address to read
write_row(pin / INPUT_MATRIX_SIZE);
@@ -39,18 +39,18 @@ bool InputGPIOInterface::read_data(char pin) const
return read_pin(this->pins.at("data_address"));
}
void InputGPIOInterface::write_row(char data) const
void InputGPIOInterface::write_row(u_int8_t data) const
{
write_pin(this->pins.at("row_address_A"), data & 0b001);
write_pin(this->pins.at("row_address_B"), data & 0b010);
write_pin(this->pins.at("row_address_C"), data & 0b100);
write_pin(this->pins.at("row_address_A"), data & 0b001u);
write_pin(this->pins.at("row_address_B"), data & 0b010u);
write_pin(this->pins.at("row_address_C"), data & 0b100u);
}
void InputGPIOInterface::write_col(char data) const
void InputGPIOInterface::write_col(uint8_t data) const
{
write_pin(this->pins.at("col_address_A"), data & 0b001);
write_pin(this->pins.at("col_address_B"), data & 0b010);
write_pin(this->pins.at("col_address_C"), data & 0b100);
write_pin(this->pins.at("col_address_A"), data & 0b001u);
write_pin(this->pins.at("col_address_B"), data & 0b010u);
write_pin(this->pins.at("col_address_C"), data & 0b100u);
}
void InputGPIOInterface::init_pins() const

6
FlippR-Driver/src/input/InputGPIOInterface.h
View File

@@ -24,12 +24,12 @@ class InputGPIOInterface : public IInputGPIOInterface, GPIOInterface
{
public:
explicit InputGPIOInterface(std::map<std::string, uint8_t> pins);
bool read_data(char pin) const override;
bool read_data(uint8_t pin) const override;
private:
void init_pins() const;
void write_row(char data) const;
void write_col(char data) const;
void write_row(u_int8_t data) const;
void write_col(uint8_t data) const;
private:
const std::map<std::string, uint8_t> pins;