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

some logs

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-19 23:28:13 +01:00
parent 423fb50096
commit bc35bcbea6
15 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp
View File

@@ -17,8 +17,9 @@ namespace detail
DisplayBoardPinController::DisplayBoardPinController(std::map<std::string, uint8_t> pins_display) :
pins_display_board(std::move(pins_display))
{
// todo init
initialize_pins_output(0, pins_display.begin(), pins_display.end());
CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayBoardPinController";
}
void DisplayBoardPinController::activate_displays() const

4
FlippR-Driver/src/output/detail/DisplayBoardPinController.h
View File

@@ -7,7 +7,7 @@
#include "output/DisplayBoardPinController.h"
#include "PinController.h"
#include "output/OutputPinController.h"
#include <map>
@@ -18,7 +18,7 @@ namespace output
namespace detail
{
class DisplayBoardPinController : public output::DisplayBoardPinController, public PinController
class DisplayBoardPinController : public output::DisplayBoardPinController, public OutputPinController
{
public:
explicit DisplayBoardPinController(std::map<std::string, uint8_t> pins_display);

6
FlippR-Driver/src/output/detail/DisplayController.cpp
View File

@@ -21,7 +21,9 @@ DisplayController::DisplayController(std::vector<std::shared_ptr<items::OutputDi
{
this->display_cycle_thread = std::thread(&DisplayController::cycle_displays, this);
CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayController and started writing them.";
CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayController and started cycling them.";
activate_displays();
}
DisplayController::~DisplayController()
@@ -44,11 +46,13 @@ void DisplayController::cycle_displays() const
void DisplayController::activate_displays() const
{
CLOG(INFO, OUTPUT_LOGGER) << "Activated all displays!";
pin_controller->activate_displays();
}
void DisplayController::deactivate_displays() const
{
CLOG(INFO, OUTPUT_LOGGER) << "Deactivated all displays!";
pin_controller->deactivate_displays();
}

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

@@ -4,6 +4,10 @@
#include "DriverBoardPinController.h"
#include "output/items/DriverBoardItem.h"
#include "utility/config.h"
namespace flippR_driver
{
namespace output
@@ -14,7 +18,13 @@ namespace detail
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))
{
// todo init
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;
}
void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_item)

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

@@ -9,8 +9,6 @@
#include "output/OutputPinController.h"
#include <output/items/DriverBoardItem.h>
#include <map>
#include <memory>

6
FlippR-Driver/src/output/detail/OutputDriver.cpp
View File

@@ -10,6 +10,8 @@
#include <boost/range/adaptor/map.hpp>
#include <boost/range/algorithm/copy.hpp>
#include "utility/config.h"
namespace flippR_driver
{
namespace output
@@ -21,7 +23,9 @@ using namespace items;
OutputDriver::OutputDriver(std::unique_ptr<output::DisplayController> display_controller, std::map<std::string, std::shared_ptr<Solenoid>> solenoids, std::map<std::string, std::shared_ptr<Lamp>> lamps, std::map<std::string, std::shared_ptr<Sound>> sounds, std::map<uint8_t, std::shared_ptr<items::Display>> displays)
: display_controller(std::move(display_controller)), solenoids(std::move(solenoids)), lamps(std::move(lamps)), sounds(std::move(sounds)), displays(std::move(displays))
{}
{
CLOG(INFO, OUTPUT_LOGGER) << "Created OutputDriver";
}
void OutputDriver::activate_displays() const
{

10
FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
View File

@@ -4,6 +4,8 @@
#include "SoundBoardPinController.h"
#include "utility/config.h"
namespace flippR_driver
{
namespace output
@@ -14,7 +16,13 @@ namespace detail
SoundBoardPinController::SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex) :
pins_sound(std::move(pins_sound)), output_item_mutex(std::move(output_item_mutex))
{
// todo init
uint8_t i2c_address = pins_sound.at("i2c_address");
uint8_t pin_base = pins_sound.at("pin_base");
initialize_i2c_address(i2c_address, pin_base);
initialize_pins_output(pin_base, pins_sound.begin(), pins_sound.end());
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController with i2c_address 0x" << std::hex << i2c_address << " and pin_base " << std::dec << pin_base;
}

3
FlippR-Driver/src/output/detail/SoundBoardPinController.h
View File

@@ -9,9 +9,8 @@
#include "output/OutputPinController.h"
#include <output/items/detail/Sound.h>
#include <map>
namespace flippR_driver
{
namespace output