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

Adds output factory-prototypes

Browse Source
This commit is contained in:
Johannes Wendel
2019-12-28 16:39:14 +01:00
parent 6d5173424f
commit 2e37542467
14 changed files with 289 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
std::istream& sound_config,
std::istream& display_config)
{
utility::LoggerFactory::CreateOutputLogger();
/* utility::LoggerFactory::CreateOutputLogger();
solenoid_config >> config::solenoids;
lamp_config >> config::lamps;
@@ -59,7 +59,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_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<OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, flippers, display_map);
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::shared_ptr<DriverBoardPinController> &pin_controller)
@@ -235,7 +235,7 @@ std::vector<std::shared_ptr<items::OutputDisplay>> create_displays(std::istream
std::shared_ptr<items::OutputDisplay> create_display(json & display_json)
{
std::string config_file = "display_config.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);
@@ -246,7 +246,7 @@ std::shared_ptr<items::OutputDisplay> create_display(json & display_json)
return std::make_shared<items::detail::SevenDigitDisplay>(address, id);
else
throw new std::logic_error("Display digits can either be 7 or 8");
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)