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

Did some further adaptions to new board layout.

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-15 15:39:37 +02:00
parent f129f8bf74
commit 25a937cc2d
14 changed files with 74 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,19 +12,12 @@ namespace flippR_driver
{
namespace output
{
namespace detail
DriverBoardPinController::DriverBoardPinController(std::shared_ptr<std::mutex> output_item_mutex) :
output_item_mutex(std::move(output_item_mutex))
{
DriverBoardPinController::DriverBoardPinController(std::map<std::string, uint8_t> pins_driver_board, std::shared_ptr<std::mutex> output_item_mutex) :
pins_driver_board(std::move(pins_driver_board)), output_item_mutex(std::move(output_item_mutex))
{
uint8_t i2c_address = pins_driver_board.at("i2c_address");
uint8_t pin_base = pins_driver_board.at("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;
CLOG(INFO, OUTPUT_LOGGER) << "Created DriverBoardPinController.";
}
void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_item)
@@ -43,9 +36,8 @@ void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_i
void DriverBoardPinController::write_pin(uint8_t pin, bool value) const
{
PinController::write_pin(pins_driver_board.at("pin_base") + pin, value);
PinController::write_pin(pin, value);
}
}
}
}

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

@@ -1,46 +0,0 @@
//
// Created by rhetenor on 14.12.18.
//
#ifndef FLIPPR_DRIVER_OUTPUT_IMPL_DRIVERBOARDPINCONTROLLER_H
#define FLIPPR_DRIVER_OUTPUT_IMPL_DRIVERBOARDPINCONTROLLER_H
#include "output/DriverBoardPinController.h"
#include <map>
#include <memory>
#include <mutex>
namespace flippR_driver
{
namespace output
{
namespace detail
{
class DriverBoardPinController : public output::DriverBoardPinController
{
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 initialize_port_expander(const uint8_t i2c_address, const uint8_t pin_base);
void initialize_pin(const uint8_t address);
private:
void write_pin(uint8_t pin, bool value) const;
private:
std::shared_ptr<std::mutex> output_item_mutex;
const std::map<std::string, uint8_t> pins_driver_board;
};
}
}
}
#endif //FLIPPR_DRIVER_DRIVERBOARDPINCONTROLLER_H