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

Implements and integrates SolenoidFactory

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-06 09:20:53 +01:00
parent 06663751d7
commit d90e904b4c
9 changed files with 96 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@
#include <output/factories/LampFactory.h>
#include <output/factories/SoundFactory.h>
#include <output/factories/FlipperFactory.h>
#include <output/factories/SolenoidFactory.h>
#include "OutputDriverFactory.h"
#include "utility/LoggerFactory.h"
@@ -38,6 +39,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(const std::string & solenoid_conf
std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new detail::DriverBoardPinController(output_pin_mutex));
auto flippers = get_items<FlipperFactory, detail::DriverBoardPinController>(solenoid_config_path, driver_board_pin_controller);
auto solenoids = get_items<SolenoidFactory, detail::DriverBoardPinController>(solenoid_config_path, driver_board_pin_controller);
auto lamps = get_items<LampFactory, detail::DriverBoardPinController>(lamp_config_path, driver_board_pin_controller);
auto sound_board_pin_controller = create_SoundBoardPinController();
@@ -138,7 +140,7 @@ std::map<std::string, std::shared_ptr<items::Item>> get_items(const std::string
config_stream >> config_json;
FactoryType factory{config_json, std::static_pointer_cast<ControllerType>(pin_controller)};
std::map<std::string, std::shared_ptr<items::Item>> map;
try{
map = factory.getItemMap();