reafectored stuff and corrected shit to make everything compiling

This commit is contained in:
Johannes Wendel
2018-11-21 10:30:04 +01:00
parent d2379868ec
commit 03dc3c61ce
26 changed files with 183 additions and 144 deletions

View File

@@ -9,15 +9,16 @@
#define _SRC_OUTPUT_OUTPUTDRIVER_H_
#include "output/IOutputDriver.h"
#include "output/items/ILamp.h"
#include "output/items/ISolenoid.h"
#include "output/items/IDisplay.h"
#include "output/items/ISound.h"
#include <vector>
#include <map>
#include <memory>
#include "ILamp.h"
#include "ISolenoid.h"
#include "IDisplay.h"
#include "ISound.h"
namespace flippR_driver
{
namespace output
@@ -26,25 +27,25 @@ namespace output
class OutputDriver : public IOutputDriver
{
public:
OutputDriver(std::map<std::string, std::shared_ptr<ISolenoid>> solenoids, std::map<std::string, std::shared_ptr<ILamp>> lamps, std::map<char, std::shared_ptr<IDisplay>> displays, std::map<std::string, std::shared_ptr<ISound>> sounds);
OutputDriver(std::map<std::string, std::shared_ptr<items::ISolenoid>> solenoids, std::map<std::string, std::shared_ptr<items::ILamp>> lamps, std::map<char, std::shared_ptr<items::IDisplay>> displays, std::map<std::string, std::shared_ptr<items::ISound>> sounds);
virtual ~OutputDriver() = default;
std::vector<std::shared_ptr<ILamp>> get_lamps();
std::vector<std::shared_ptr<ISolenoid>> get_solenoids();
std::vector<std::shared_ptr<ISound>> get_sounds();
std::vector<std::shared_ptr<IDisplay>> get_displays();
std::vector<std::shared_ptr<items::ILamp>> get_lamps();
std::vector<std::shared_ptr<items::ISolenoid>> get_solenoids();
std::vector<std::shared_ptr<items::ISound>> get_sounds();
std::vector<std::shared_ptr<items::IDisplay>> get_displays();
std::shared_ptr<ILamp> get_lamp(std::string name);
std::shared_ptr<ISolenoid> get_solenoid(std::string name);
std::shared_ptr<ISound> get_sound(std::string name);
std::shared_ptr<IDisplay> get_display(char number);
std::shared_ptr<items::ILamp> get_lamp(std::string name);
std::shared_ptr<items::ISolenoid> get_solenoid(std::string name);
std::shared_ptr<items::ISound> get_sound(std::string name);
std::shared_ptr<items::IDisplay> get_display(char number);
private:
std::map<std::string, std::shared_ptr<ILamp>> lamps;
std::map<std::string, std::shared_ptr<ISolenoid>> solenoids;
std::map<char, std::shared_ptr<IDisplay>> displays;
std::map<std::string, std::shared_ptr<ISound>> sounds;
std::map<std::string, std::shared_ptr<items::ILamp>> lamps;
std::map<std::string, std::shared_ptr<items::ISolenoid>> solenoids;
std::map<char, std::shared_ptr<items::IDisplay>> displays;
std::map<std::string, std::shared_ptr<items::ISound>> sounds;
};
} /* namespace output */