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

Did big refactoring and further adapted OutputDriverFactory as well as uptuput dricer to new board layouts.

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-16 21:20:03 +02:00
parent de57b6590f
commit 264044393f
34 changed files with 332 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,22 +2,17 @@
// Created by rhetenor on 04.10.18.
//
#include "OutputDriverFactory.h"
#include "utility/LoggerFactory.h"
#include "output/detail/OutputDriver.h"
#include "output/detail/DisplayController.h"
#include "output/detail/DisplayBoardPinController.h"
#include "output/detail/SoundBoardPinController.h"
#include "output/DisplayController.h"
#include "output/SoundBoardPinController.h"
#include "output/items/detail/EightDigitDisplay.h"
#include "output/DisplayBoardPinController.h"
#include "output/items/detail/SevenDigitDisplay.h"
#include "output/items/Flipper.h"
#include "output/items/detail/Flipper.h"
namespace flippR_driver
{
@@ -28,8 +23,7 @@ namespace OutputDriverFactory
using namespace nlohmann;
std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& output_pin_config,
std::istream& solenoid_config,
std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
std::istream& lamp_config,
std::istream& sound_config,
std::istream& display_config)
@@ -38,29 +32,21 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& output_pin_config,
std::shared_ptr<std::mutex> output_pin_mutex;
json output_config;
output_pin_config >> output_config;
std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new DriverBoardPinController(output_pin_mutex));
auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller);
//TODO create flippers
auto flippers = create_flippers(solenoid_config, driver_board_pin_controller);
auto lamps = create_lamps(lamp_config, driver_board_pin_controller);
uint8_t sound_fire_address = get_sound_fire_address(sound_config);
std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new detail::SoundBoardPinController(output_pin_mutex, sound_fire_address));
std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new SoundBoardPinController(output_pin_mutex, sound_fire_address));
auto sounds = create_sounds(sound_config, sound_board_pin_controller);
// json display_board_config = output_config.at("display_board");
// std::unique_ptr<DisplayBoardPinController> display_board_pin_controller(new detail::DisplayBoardPinController(parse_pins_display_board(display_board_config)));
// auto displays = create_displays(display_config);
//
// std::unique_ptr<DisplayController> display_controller(new detail::DisplayController(displays, std::move(display_board_pin_controller)));
//
// auto display_map = map_displays(displays);
//
// return std::make_shared<detail::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, display_map);
// return std::make_shared<detail::OutputDriver>(NULL, NULL, NULL, NULL, NULL);
std::unique_ptr<DisplayBoardPinController> display_board_pin_controller(new DisplayBoardPinController(parse_pins_display_board(display_config)));
auto displays = create_displays(display_config);
std::unique_ptr<DisplayController> display_controller(new DisplayController(displays, std::move(display_board_pin_controller)));
auto display_map = map_displays(displays);
return std::make_shared<OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, flippers, display_map);
}
std::map<std::string, std::shared_ptr<items::Solenoid>> create_solenoids(std::istream & solenoid_config, std::shared_ptr<DriverBoardPinController> &pin_controller)
@@ -210,7 +196,86 @@ uint8_t get_sound_fire_address(std::istream &sound_config)
return pin_base + address;
}
void initialize_port_extenders(nlohmann::json &port_extenders, PinController * pin_controller, const std::string & file_name)
std::map<std::string, uint8_t> parse_pins_display_board(std::istream &display_config)
{
std::string config_file = "display_config.json";
json display_config_json;
display_config >> display_config_json;
json display_board_config = get_element("display_board", display_config_json, config_file);
std::map<std::string, uint8_t> pins_display;
pins_display["run"] = get_value<uint8_t>("run", display_board_config, config_file);
json display_select = display_board_config.at("display_select");
for(int i = 1; i < 6; i++)
{
pins_display["display_select" + std::to_string(i)] = get_value<uint8_t>(std::to_string(i), display_select, config_file);
}
json segment_select = display_board_config.at("segment_select");
pins_display["segment_select_A"] = get_value<uint8_t>("A", segment_select, config_file);
pins_display["segment_select_B"] = get_value<uint8_t>("B", segment_select, config_file);
pins_display["segment_select_C"] = get_value<uint8_t>("C", segment_select, config_file);
json digit_select = display_board_config.at("digit_select");
pins_display["digit_select_A"] = get_value<uint8_t>("A", digit_select, config_file);
pins_display["digit_select_B"] = get_value<uint8_t>("B", digit_select, config_file);
pins_display["digit_select_C"] = get_value<uint8_t>("C", digit_select, config_file);
pins_display["digit_select_D"] = get_value<uint8_t>("D", digit_select, config_file);;
return pins_display;
}
std::vector<std::shared_ptr<items::OutputDisplay>> create_displays(std::istream &display_config)
{
json display_config_json;
display_config >> display_config_json;
json displays_json = get_element("displays", display_config_json, "display_config.json");
std::vector<std::shared_ptr<items::OutputDisplay>> displays;
for(json &display_json : displays_json)
{
auto display = create_display(display_json);
displays.push_back(display);
}
return displays;
}
std::shared_ptr<items::OutputDisplay> create_display(json & display_json)
{
std::string config_file = "display_config.json";
auto id = get_value<uint8_t>("id", display_json, config_file);
auto address = get_value<uint8_t>("address", display_json, config_file);
auto digits = get_value<uint8_t>("digits", display_json, config_file);
if(digits == 8)
return std::make_shared<items::detail::EightDigitDisplay>(address, id);
else if(digits == 7)
return std::make_shared<items::detail::SevenDigitDisplay>(address, id);
else
throw new std::logic_error("Display digits can either be 7 or 8");
}
std::map<uint8_t, std::shared_ptr<items::Display>> map_displays(const std::vector<std::shared_ptr<items::OutputDisplay>> &displays)
{
std::map<uint8_t, std::shared_ptr<items::Display>> display_map;
for(auto &display : displays)
{
display_map.emplace(display->get_address(), display);
}
return display_map;
}
void initialize_port_extenders(json &port_extenders, PinController * pin_controller, const std::string & file_name)
{
for (auto & extender_json : port_extenders)