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

Adapted code to new layout

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-15 13:41:46 +02:00
parent fd28f87e38
commit f129f8bf74
15 changed files with 37 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/contrib/json_example/output/Lamp_Config.json
View File

@@ -1,4 +1,10 @@
{
"port_extender" :
[
"name" : "extender_1",
"i2c_address" : 33,
"pin_base" : 82
],
"lamps" :
[
{

6
FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
View File

@@ -1,4 +1,10 @@
{
"port_extender" :
[
"name" : "extender_0",
"i2c_address" : 32,
"pin_base" : 65
],
"deactivation_time_milliseconds" : 10,
"flippers" :
[

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

@@ -27,7 +27,7 @@ void PinController::initialize_input_pin(uint8_t address)
pinMode(address, INPUT);
}
void PinController::initialize_output_pin(uint8_t address)
void PinController::initialize_output_pin(const uint8_t address)
{
pinMode(address, OUTPUT);
}

2
FlippR-Driver/src/PinController.h
View File

@@ -24,7 +24,7 @@ public:
protected:
static void initialize_input_pin(uint8_t address);
static void initialize_output_pin(uint8_t address);
static void initialize_output_pin(const uint8_t address);
static void write_pin(uint8_t address, bool value);

3
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -45,6 +45,8 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& output_pin_config,
json output_config;
output_pin_config >> output_config;
//TODO new board layout
json driver_board_config = output_config.at("driver_board");
std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new detail::DriverBoardPinController(parse_pins_driver_board(driver_board_config), output_pin_mutex));
auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller);
@@ -232,6 +234,7 @@ std::shared_ptr<items::detail::Flipper> create_flipper(nlohmann::json &flipper_j
std::map<std::string, std::shared_ptr<items::Lamp>> create_lamps(std::istream &lamp_config, std::shared_ptr<DriverBoardPinController> &output_gpio_interface)
{
//TODO initialize portextender
std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
json lamp_config_json;

56
FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
View File

@@ -21,7 +21,7 @@ DriverBoardPinController::DriverBoardPinController(std::map<std::string, uint8_t
uint8_t i2c_address = pins_driver_board.at("i2c_address");
uint8_t pin_base = pins_driver_board.at("pin_base");
initialize_i2c_address(i2c_address, pin_base);
initialize_pins_output(pin_base, pins_driver_board.begin(), pins_driver_board.end());
CLOG(INFO, OUTPUT_LOGGER) << "Created DriverBoardPinController with i2c_address 0x" << std::hex << i2c_address << " and pin_base " << std::dec << pin_base;
@@ -31,64 +31,14 @@ void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_ite
{
std::lock_guard<std::mutex> guard(*output_item_mutex);
write_driver_board_address(driver_board_item.get_address());
write_data(true);
write_pin(driver_board_item.get_address(), true);
}
void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_item)
{
std::lock_guard<std::mutex> guard(*output_item_mutex);
write_driver_board_address(driver_board_item.get_address());
write_data(false);
}
// todo new layout without mux!
void DriverBoardPinController::write_driver_board_address(uint8_t address) const
{
int latch = address / 8;
int pin = address % 8;
select_mux(latch);
select_latch(latch);
select_pin(pin);
}
void DriverBoardPinController::select_mux(uint8_t latch)const
{
bool mux1 = latch / 8;
write_pin(pins_driver_board.at("mux1"), mux1);
write_pin(pins_driver_board.at("mux2"), !mux1);
}
void DriverBoardPinController::select_latch(uint8_t latch) const
{
// todo not nice
if(latch > 8)
latch -= 8;
write_pin(pins_driver_board.at("latch-select-A"), latch & 0b001u);
write_pin(pins_driver_board.at("latch-select-B"), latch & 0b010u);
write_pin(pins_driver_board.at("latch-select-C"), latch & 0b100u);
}
void DriverBoardPinController::write_data(bool data) const
{
write_pin(pins_driver_board.at("data"), data);
}
void DriverBoardPinController::select_pin(uint8_t pin) const
{
write_pin(pins_driver_board.at("pin-select-A"), pin & 0b001u);
write_pin(pins_driver_board.at("pin-select-B"), pin & 0b010u);
write_pin(pins_driver_board.at("pin-select-C"), pin & 0b100u);
write_pin(driver_board_item.get_address(), false);
}
void DriverBoardPinController::write_pin(uint8_t pin, bool value) const

13
FlippR-Driver/src/output/detail/DriverBoardPinController.h
View File

@@ -24,16 +24,13 @@ public:
DriverBoardPinController(std::map<std::string, uint8_t> pins_driver_board, std::shared_ptr<std::mutex> output_item_mutex);
~DriverBoardPinController() override = default;
void activate(items::DriverBoardItem &driver_board_item) override;
void deactivate(items::DriverBoardItem &driver_board_item) override;
void activate(items::DriverBoardItem & driver_board_item) override;
void deactivate(items::DriverBoardItem & driver_board_item) override;
void initialize_port_expander(const uint8_t i2c_address, const uint8_t pin_base);
void initialize_pin(const uint8_t address);
private:
void write_driver_board_address(uint8_t address) const;
void select_mux(uint8_t latch) const;
void select_latch(uint8_t latch) const;
void select_pin(uint8_t pin) const;
void write_data(bool data) const;
void write_pin(uint8_t pin, bool value) const;
private:

4
FlippR-Driver/src/output/items/detail/DriverBoardItem.cpp
View File

@@ -6,8 +6,8 @@
using namespace flippR_driver::output;
items::detail::DriverBoardItem::DriverBoardItem(const uint8_t address) :
address(address)
items::detail::DriverBoardItem::DriverBoardItem(const uint8_t address, const uint8_t pin_base) :
address(pin_base + address)
{}
uint8_t items::detail::DriverBoardItem::get_address() const

2
FlippR-Driver/src/output/items/detail/DriverBoardItem.h
View File

@@ -21,7 +21,7 @@ namespace detail
class DriverBoardItem : public output::items::DriverBoardItem
{
public:
DriverBoardItem(uint8_t address);
DriverBoardItem(const uint8_t address, const uint8_t pin_base);
~DriverBoardItem() override = default;

4
FlippR-Driver/src/output/items/detail/Lamp.cpp
View File

@@ -19,8 +19,8 @@ namespace items
namespace detail
{
Lamp::Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name) :
detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller)), activated(false)
Lamp::Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t address, const uint8_t pin_base, const std::string name) :
detail::Item(std::move(name)), DriverBoardItem(address, pin_base), pin_controller(std::move(pin_controller)), activated(false)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created lamp " << name << " with address " << address;
}

2
FlippR-Driver/src/output/items/detail/Lamp.h
View File

@@ -27,7 +27,7 @@ namespace detail
class Lamp : public detail::DriverBoardItem, public detail::Item, public items::Lamp
{
public:
Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name);
Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t address, const uint8_t pin_base, const std::string name);
~Lamp() override = default;
void activate() override;

4
FlippR-Driver/src/output/items/detail/Solenoid.cpp
View File

@@ -18,8 +18,8 @@ namespace items
namespace detail
{
Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time)
: detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time)
Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t address, const uint8_t pin_base, const std::string name, std::chrono::milliseconds deactivation_time)
: detail::Item(std::move(name)), DriverBoardItem(address, pin_base), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address;
}

2
FlippR-Driver/src/output/items/detail/Solenoid.h
View File

@@ -29,7 +29,7 @@ namespace detail
class Solenoid : public DriverBoardItem, public detail::Item, public items::Solenoid
{
public:
Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time);
Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t address, const uint8_t pin_base, const std::string name, std::chrono::milliseconds deactivation_time);
~Solenoid() override = default;
void trigger() override;

4
FlippR-Driver/src/output/items/detail/Sound.cpp
View File

@@ -20,8 +20,8 @@ namespace items
namespace detail
{
Sound::Sound(std::shared_ptr<SoundBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id)
: detail::Item(std::move(name)), DriverBoardItem(address), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time), id(id)
Sound::Sound(std::shared_ptr<SoundBoardPinController> pin_controller, const uint8_t address, const uint8_t pin_base, const std::string name, std::chrono::milliseconds deactivation_time, u_int id)
: detail::Item(std::move(name)), DriverBoardItem(address, pin_base), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time), id(id)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created sound " << id << " with name " << name << " and address " << address;
}

2
FlippR-Driver/src/output/items/detail/Sound.h
View File

@@ -35,7 +35,7 @@ public:
u_int id;
public:
Sound(std::shared_ptr<SoundBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id);
Sound(std::shared_ptr<SoundBoardPinController> pin_controller, const uint8_t address, const uint8_t pin_base, const std::string name, std::chrono::milliseconds deactivation_time, u_int id);
~Sound() override = default;
void play() override;