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

renamed impl to detail

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 16:16:44 +01:00
parent b663e130ac
commit 3b72274d6b
43 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,15 +8,15 @@
#include "utility/LoggerFactory.h"
#include "output/impl/OutputDriver.h"
#include "output/impl/DisplayController.h"
#include "output/detail/OutputDriver.h"
#include "output/detail/DisplayController.h"
#include "output/impl/DisplayBoardPinController.h"
#include "output/impl/DriverBoardPinController.h"
#include "output/impl/SoundBoardPinController.h"
#include "output/detail/DisplayBoardPinController.h"
#include "output/detail/DriverBoardPinController.h"
#include "output/detail/SoundBoardPinController.h"
#include "output/items/impl/EightDigitDisplay.h"
#include "output/items/impl/SevenDigitDisplay.h"
#include "output/items/detail/EightDigitDisplay.h"
#include "output/items/detail/SevenDigitDisplay.h"
namespace flippR_driver
@@ -41,24 +41,24 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream &output_pin_config,
output_pin_config >> output_config;
json driver_board_config = output_config.at("driver_board");
std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new impl::DriverBoardPinController(parse_pins_driver_board(driver_board_config), output_pin_mutex));
std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new detail::DriverBoardPinController(parse_pins_driver_board(driver_board_config), output_pin_mutex));
auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller);
auto lamps = create_lamps(lamp_config, driver_board_pin_controller);
json sound_board_config = output_config.at("sound_board");
std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new impl::SoundBoardPinController(parse_pins_sound_board(sound_board_config), output_pin_mutex));
std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new detail::SoundBoardPinController(parse_pins_sound_board(sound_board_config), output_pin_mutex));
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 impl::DisplayBoardPinController(parse_pins_display_board(display_board_config)));
std::unique_ptr<DisplayBoardPinController> display_board_pin_controller(new detail::DisplayBoardPinController(parse_pins_display_board(display_board_config)));
auto displays = create_displays(display_config);
// todo
std::vector<std::shared_ptr<items::OutputDisplay>> 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)));
std::unique_ptr<DisplayController> display_controller(new detail::DisplayController(displays_vec, std::move(display_board_pin_controller)));
return std::make_shared<impl::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, displays);
return std::make_shared<detail::OutputDriver>(std::move(display_controller), solenoids, lamps, sounds, displays);
}
std::map<std::string, uint8_t> parse_pins_driver_board(json &driver_board_config)
@@ -204,7 +204,7 @@ std::chrono::milliseconds get_deactivation_time(nlohmann::json &json)
}
}
std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoid_json, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
{
try
{
@@ -216,7 +216,7 @@ std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_
deactivation_time = get_deactivation_time(solenoid_json);
}
return std::make_shared<items::impl::Solenoid>(pin_controller, address, name, deactivation_time);
return std::make_shared<items::detail::Solenoid>(pin_controller, address, name, deactivation_time);
}
catch(json::exception &e)
{
@@ -225,13 +225,13 @@ std::shared_ptr<items::impl::Solenoid> create_solenoid(nlohmann::json &solenoid_
}
}
std::shared_ptr<items::impl::Lamp> create_lamp(nlohmann::json &lamp_json, std::shared_ptr<DriverBoardPinController> &pin_controller)
std::shared_ptr<items::detail::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::impl::Lamp>(pin_controller, address, name);
return std::make_shared<items::detail::Lamp>(pin_controller, address, name);
}
catch(json::exception &e)
{
@@ -240,14 +240,14 @@ std::shared_ptr<items::impl::Lamp> create_lamp(nlohmann::json &lamp_json, std::s
}
}
std::shared_ptr<items::impl::Sound> create_sound(nlohmann::json &sound_json, std::shared_ptr<SoundBoardPinController> &pin_controller, std::chrono::milliseconds &deactivation_time)
std::shared_ptr<items::detail::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::impl::Sound>(pin_controller, address, description, deactivation_time, id);
return std::make_shared<items::detail::Sound>(pin_controller, address, description, deactivation_time, id);
}
catch(json::exception &e)
{
@@ -282,11 +282,11 @@ std::shared_ptr<items::OutputDisplay> create_display(nlohmann::json &display_jso
auto digits = display_json.at("digits").get<uint8_t>();
if(digits == 8)
{
return std::make_shared<items::impl::EightDigitDisplay>(address, id);
return std::make_shared<items::detail::EightDigitDisplay>(address, id);
}
else if(digits == 7)
{
return std::make_shared<items::impl::SevenDigitDisplay>(address, id);
return std::make_shared<items::detail::SevenDigitDisplay>(address, id);
}
else
{