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

changed everything to impl

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 03:14:50 +01:00
parent ff3376b9d7
commit 2b9981e521
40 changed files with 271 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream &output_pin_config,
auto displays = create_displays(display_config);
// todo
std::vector<std::shared_ptr<items::IDisplay>> displays_vec;
std::vector<std::shared_ptr<items::Display>> displays_vec;
boost::copy(displays | boost::adaptors::map_values, std::back_inserter(displays_vec));
std::unique_ptr<DisplayController> display_controller(new impl::DisplayController(displays_vec, std::move(display_board_pin_controller)));
@@ -131,9 +131,9 @@ std::map<std::string, uint8_t> parse_pins_display_board(json &display_board_conf
return pins_display;
}
std::map<std::string, std::shared_ptr<items::ISolenoid>> create_solenoids(std::istream &solenoid_config, std::shared_ptr<DriverBoardPinController> &output_gpio_interface)
std::map<std::string, std::shared_ptr<items::Solenoid>> create_solenoids(std::istream &solenoid_config, std::shared_ptr<DriverBoardPinController> &output_gpio_interface)
{
std::map<std::string, std::shared_ptr<items::ISolenoid>> solenoids;
std::map<std::string, std::shared_ptr<items::Solenoid>> solenoids;
json solenoids_json;
solenoid_config >> solenoids_json;
@@ -145,12 +145,13 @@ std::map<std::string, std::shared_ptr<items::ISolenoid>> create_solenoids(std::i
auto solenoid = create_solenoid(solenoid_json, output_gpio_interface, deactivation_time);
solenoids.emplace(solenoid->get_name(), solenoid);
}
return solenoids;
}
std::map<std::string, std::shared_ptr<items::ILamp>> create_lamps(std::istream &lamp_config, std::shared_ptr<DriverBoardPinController> &output_gpio_interface)
std::map<std::string, std::shared_ptr<items::Lamp>> create_lamps(std::istream &lamp_config, std::shared_ptr<DriverBoardPinController> &output_gpio_interface)
{
std::map<std::string, std::shared_ptr<items::ILamp>> lamps;
std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
json lamps_json;
lamp_config >> lamps_json;
@@ -164,9 +165,9 @@ std::map<std::string, std::shared_ptr<items::ILamp>> create_lamps(std::istream &
return lamps;
}
std::map<std::string, std::shared_ptr<items::ISound>> create_sounds(std::istream &sound_config, std::shared_ptr<SoundBoardPinController> &output_gpio_interface)
std::map<std::string, std::shared_ptr<items::Sound>> create_sounds(std::istream &sound_config, std::shared_ptr<SoundBoardPinController> &output_gpio_interface)
{
std::map<std::string, std::shared_ptr<items::ISound>> sounds;
std::map<std::string, std::shared_ptr<items::Sound>> sounds;
json sounds_json;
sound_config >> sounds_json;
@@ -196,7 +197,7 @@ std::chrono::milliseconds get_deactivation_time(nlohmann::json &json)
}
}
std::shared_ptr<items::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
{
try
{
@@ -208,7 +209,7 @@ std::shared_ptr<items::Solenoid> create_solenoid(nlohmann::json &solenoid_json,
deactivation_time = get_deactivation_time(solenoid_json);
}
return std::make_shared<items::Solenoid>(pin_controller, address, name, deactivation_time);
return std::make_shared<items::impl::Solenoid>(pin_controller, address, name, deactivation_time);
}
catch(json::type_error &e)
{
@@ -217,13 +218,13 @@ std::shared_ptr<items::Solenoid> create_solenoid(nlohmann::json &solenoid_json,
}
}
std::shared_ptr<items::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller)
std::shared_ptr<items::impl::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller)
{
try
{
std::string name = lamp_json.at("name");
auto address = lamp_json.at("address").get<uint8_t>();
return std::make_shared<items::Lamp>(pin_controller, address, name);
return std::make_shared<items::impl::Lamp>(pin_controller, address, name);
}
catch(json::type_error &e)
{
@@ -232,14 +233,14 @@ std::shared_ptr<items::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_
}
}
std::shared_ptr<items::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
std::shared_ptr<items::impl::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
{
try
{
auto id = sound_json.at("id").get<uint>();
std::string description = sound_json.at("description");
auto address = sound_json.at("address").get<uint8_t>();
return std::make_shared<items::Sound>(pin_controller, address, description, deactivation_time, id);
return std::make_shared<items::impl::Sound>(pin_controller, address, description, deactivation_time, id);
}
catch(json::type_error &e)
{
@@ -247,9 +248,9 @@ std::shared_ptr<items::Sound> create_sound(nlohmann::json &sound_json, std::shar
exit(EXIT_FAILURE);
}
}
std::map<char, std::shared_ptr<items::IDisplay>> create_displays(std::istream &display_config)
std::map<char, std::shared_ptr<items::Display>> create_displays(std::istream &display_config)
{
std::map<char, std::shared_ptr<items::IDisplay>> displays;
std::map<char, std::shared_ptr<items::Display>> displays;
return displays;
}