From 8fad51dfac9d8dedde923903c74888933b0a924e Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 4 Oct 2018 20:57:43 +0200 Subject: [PATCH] namespace refactored --- FlippR-Driver/src/output/CabinetItem.h | 33 +++++++++++-------- FlippR-Driver/src/output/Display.cpp | 21 +++++++----- FlippR-Driver/src/output/Display.h | 28 ++++++++++------ .../src/output/DisplayController.cpp | 14 +++++--- FlippR-Driver/src/output/DisplayController.h | 12 +++++-- FlippR-Driver/src/output/ICabinetItem.h | 7 ++++ FlippR-Driver/src/output/IDisplay.h | 10 ++++-- FlippR-Driver/src/output/IDisplayController.h | 11 ++++--- FlippR-Driver/src/output/ILamp.h | 7 ++++ FlippR-Driver/src/output/IOutputDriver.h | 10 ++++-- FlippR-Driver/src/output/ISolenoid.h | 8 ++++- FlippR-Driver/src/output/ISound.h | 10 ++++-- FlippR-Driver/src/output/Lamp.cpp | 16 ++++++--- FlippR-Driver/src/output/Lamp.h | 10 ++++-- FlippR-Driver/src/output/OutputDriver.cpp | 16 ++++++--- FlippR-Driver/src/output/OutputDriver.h | 10 ++++-- .../src/output/OutputDriverFactory.cpp | 13 ++++++++ .../src/output/OutputDriverFactory.h | 20 +++++++++++ FlippR-Driver/src/output/Solenoid.cpp | 3 ++ FlippR-Driver/src/output/Solenoid.h | 10 ++++-- FlippR-Driver/src/output/Sound.cpp | 3 ++ FlippR-Driver/src/output/Sound.h | 11 +++++-- 22 files changed, 208 insertions(+), 75 deletions(-) create mode 100644 FlippR-Driver/src/output/OutputDriverFactory.cpp create mode 100644 FlippR-Driver/src/output/OutputDriverFactory.h diff --git a/FlippR-Driver/src/output/CabinetItem.h b/FlippR-Driver/src/output/CabinetItem.h index a857538..2d601c7 100644 --- a/FlippR-Driver/src/output/CabinetItem.h +++ b/FlippR-Driver/src/output/CabinetItem.h @@ -11,23 +11,28 @@ #include "ICabinetItem.h" #include -namespace output { -class CabinetItem : public ICabinetItem { -public: - CabinetItem(); - virtual ~CabinetItem(); - virtual bool isActivated(); - virtual bool activate(); - virtual bool deactivate(); +namespace FlippR_Driver +{ +namespace output +{ -protected: - int address; - std::string name; + class CabinetItem : public ICabinetItem + { + public: + CabinetItem(); + virtual ~CabinetItem(); + virtual bool isActivated(); + virtual bool activate(); + virtual bool deactivate(); - bool activated; -}; + protected: + int address; + std::string name; + + bool activated; + }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/Display.cpp b/FlippR-Driver/src/output/Display.cpp index 0a89ba9..98c61e3 100644 --- a/FlippR-Driver/src/output/Display.cpp +++ b/FlippR-Driver/src/output/Display.cpp @@ -6,16 +6,21 @@ */ #include "Display.h" +namespace FlippR_Driver +{ +namespace output +{ -namespace output { + Display::Display() + { + // TODO Auto-generated constructor stub -Display::Display() { - // TODO Auto-generated constructor stub + } -} - -Display::~Display() { - // TODO Auto-generated destructor stub -} + Display::~Display() + { + // TODO Auto-generated destructor stub + } } /* namespace output */ +} \ No newline at end of file diff --git a/FlippR-Driver/src/output/Display.h b/FlippR-Driver/src/output/Display.h index c7c18df..eb63a9d 100644 --- a/FlippR-Driver/src/output/Display.h +++ b/FlippR-Driver/src/output/Display.h @@ -10,24 +10,32 @@ #include "IDisplay.h" -namespace output { +#include -class Display: public IDisplay { +namespace FlippR_Driver +{ +namespace output +{ +template +class Display : public IDisplay +{ public: - Display(); - virtual ~Display(); + Display(); + virtual ~Display(); - virtual int getID(); - virtual void write(); + virtual int getID(); + + virtual void write_score(int score); + virtual void write_content(std::array content); public: - int score; + std::array content; private: - int address; - int id; + int address; + int id; }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/DisplayController.cpp b/FlippR-Driver/src/output/DisplayController.cpp index 66df9fa..5c8274a 100644 --- a/FlippR-Driver/src/output/DisplayController.cpp +++ b/FlippR-Driver/src/output/DisplayController.cpp @@ -7,17 +7,21 @@ #include "DisplayController.h" +namespace FlippR_Driver +{ namespace output { -DisplayController::DisplayController() { - // TODO Auto-generated constructor stub +DisplayController::DisplayController() +{ + // TODO Auto-generated constructor stub } -DisplayController::~DisplayController() { - // TODO Auto-generated destructor stub +DisplayController::~DisplayController() +{ + // TODO Auto-generated destructor stub } } - +} diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h index ca10701..d5c75f4 100644 --- a/FlippR-Driver/src/output/DisplayController.h +++ b/FlippR-Driver/src/output/DisplayController.h @@ -14,17 +14,25 @@ #include "IDisplay.h" #include + +namespace FlippR_Driver +{ namespace output { -class DisplayController: public IDisplayController { +class DisplayController : public IDisplayController +{ public: DisplayController(); virtual ~DisplayController(); private: - std::array, NUMBER_OF_DISPLAYS> displays; + void cycleDisplays(); + +private: + std::vector> displays; }; +} } #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/ICabinetItem.h b/FlippR-Driver/src/output/ICabinetItem.h index cda9643..5c83b80 100644 --- a/FlippR-Driver/src/output/ICabinetItem.h +++ b/FlippR-Driver/src/output/ICabinetItem.h @@ -9,6 +9,11 @@ #define _SRC_OUTPUT_ICABINETITEM_H_ +namespace FlippR_Driver +{ +namespace output +{ + class ICabinetItem { virtual ~ICabinetItem(); @@ -17,5 +22,7 @@ class ICabinetItem virtual bool deactivate() = 0; }; +} +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/IDisplay.h b/FlippR-Driver/src/output/IDisplay.h index 2afd4fd..362278a 100644 --- a/FlippR-Driver/src/output/IDisplay.h +++ b/FlippR-Driver/src/output/IDisplay.h @@ -8,9 +8,13 @@ #ifndef _SRC_OUTPUT_IDISPLAY_H_ #define _SRC_OUTPUT_IDISPLAY_H_ -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -class IDisplay { +class IDisplay +{ public: IDisplay(); virtual ~IDisplay(); @@ -21,5 +25,5 @@ public: }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/IDisplayController.h b/FlippR-Driver/src/output/IDisplayController.h index d05f85f..1fade72 100644 --- a/FlippR-Driver/src/output/IDisplayController.h +++ b/FlippR-Driver/src/output/IDisplayController.h @@ -7,15 +7,18 @@ #ifndef _SRC_OUTPUT_IDISPLAYCONTROLLER_H_ #define _SRC_OUTPUT_IDISPLAYCONTROLLER_H_ +namespace FlippR_Driver +{ +namespace output +{ -namespace output { - -class IDisplayController { +class IDisplayController +{ public: IDisplayController(); virtual ~IDisplayController(); }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/ILamp.h b/FlippR-Driver/src/output/ILamp.h index 3e067f2..08b8ec3 100644 --- a/FlippR-Driver/src/output/ILamp.h +++ b/FlippR-Driver/src/output/ILamp.h @@ -8,10 +8,17 @@ #ifndef _SRC_OUTPUT_ILAMP_H_ #define _SRC_OUTPUT_ILAMP_H_ +namespace FlippR_Driver +{ +namespace output +{ + class ILamp { }; +} +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/IOutputDriver.h b/FlippR-Driver/src/output/IOutputDriver.h index f77d71c..81a3e9a 100644 --- a/FlippR-Driver/src/output/IOutputDriver.h +++ b/FlippR-Driver/src/output/IOutputDriver.h @@ -8,14 +8,18 @@ #ifndef _SRC_OUTPUT_IOUTPUTDRIVER_H_ #define _SRC_OUTPUT_IOUTPUTDRIVER_H_ -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -class IOutputDriver { +class IOutputDriver +{ public: IOutputDriver(); virtual ~IOutputDriver(); }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/ISolenoid.h b/FlippR-Driver/src/output/ISolenoid.h index 8407ecd..cd3621e 100644 --- a/FlippR-Driver/src/output/ISolenoid.h +++ b/FlippR-Driver/src/output/ISolenoid.h @@ -8,11 +8,17 @@ #ifndef _SRC_OUTPUT_ISOLENOID_H_ #define _SRC_OUTPUT_ISOLENOID_H_ +namespace FlippR_Driver +{ +namespace output +{ + class ISolenoid { }; - +} +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/ISound.h b/FlippR-Driver/src/output/ISound.h index b2964e3..2c63f65 100644 --- a/FlippR-Driver/src/output/ISound.h +++ b/FlippR-Driver/src/output/ISound.h @@ -8,9 +8,13 @@ #ifndef _SRC_OUTPUT_ISOUND_H_ #define _SRC_OUTPUT_ISOUND_H_ -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -class ISound { +class ISound +{ public: ISound(); virtual ~ISound(); @@ -19,5 +23,5 @@ public: }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/Lamp.cpp b/FlippR-Driver/src/output/Lamp.cpp index 4c91111..74d4c4b 100644 --- a/FlippR-Driver/src/output/Lamp.cpp +++ b/FlippR-Driver/src/output/Lamp.cpp @@ -7,15 +7,21 @@ #include "Lamp.h" -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -Lamp::Lamp() { - // TODO Auto-generated constructor stub +Lamp::Lamp() +{ + // TODO Auto-generated constructor stub } -Lamp::~Lamp() { - // TODO Auto-generated destructor stub +Lamp::~Lamp() +{ + // TODO Auto-generated destructor stub } } /* namespace output */ +} \ No newline at end of file diff --git a/FlippR-Driver/src/output/Lamp.h b/FlippR-Driver/src/output/Lamp.h index 1792fdb..0ca3578 100644 --- a/FlippR-Driver/src/output/Lamp.h +++ b/FlippR-Driver/src/output/Lamp.h @@ -10,14 +10,18 @@ #include "CabinetItem.h" -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -class Lamp: public CabinetItem { +class Lamp : public CabinetItem +{ public: Lamp(); virtual ~Lamp(); }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/OutputDriver.cpp b/FlippR-Driver/src/output/OutputDriver.cpp index adc247f..3262c81 100644 --- a/FlippR-Driver/src/output/OutputDriver.cpp +++ b/FlippR-Driver/src/output/OutputDriver.cpp @@ -7,15 +7,21 @@ #include "OutputDriver.h" -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -OutputDriver::OutputDriver() { - // TODO Auto-generated constructor stub +OutputDriver::OutputDriver() +{ + // TODO Auto-generated constructor stub } -OutputDriver::~OutputDriver() { - // TODO Auto-generated destructor stub +OutputDriver::~OutputDriver() +{ + // TODO Auto-generated destructor stub } } /* namespace output */ +} \ No newline at end of file diff --git a/FlippR-Driver/src/output/OutputDriver.h b/FlippR-Driver/src/output/OutputDriver.h index b137210..da4bd3b 100644 --- a/FlippR-Driver/src/output/OutputDriver.h +++ b/FlippR-Driver/src/output/OutputDriver.h @@ -17,9 +17,13 @@ #include "IDisplay.h" #include "ISound.h" -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -class OutputDriver: public IOutputDriver { +class OutputDriver : public IOutputDriver +{ public: OutputDriver(); virtual ~OutputDriver(); @@ -39,5 +43,5 @@ private: }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp new file mode 100644 index 0000000..5fc8d1d --- /dev/null +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -0,0 +1,13 @@ +// +// Created by rhetenor on 04.10.18. +// + +#include "OutputDriverFactory.h" + +namespace FlippR_Driver +{ +namespace output +{ + +} +} \ No newline at end of file diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h new file mode 100644 index 0000000..9627738 --- /dev/null +++ b/FlippR-Driver/src/output/OutputDriverFactory.h @@ -0,0 +1,20 @@ +// +// Created by rhetenor on 04.10.18. +// + +#ifndef FLIPPR_DRIVER_OUTPUTDRIVERFACTORY_H +#define FLIPPR_DRIVER_OUTPUTDRIVERFACTORY_H + +namespace FlippR_Driver +{ +namespace output +{ +class OutputDriverFactory +{ +public: + std::shared_ptr getOutputDriver(std::ifstream &output_gpio_config, std::ifstream &output_config); +}; +} +} + +#endif //FLIPPR_DRIVER_OUTPUTDRIVERFACTORY_H diff --git a/FlippR-Driver/src/output/Solenoid.cpp b/FlippR-Driver/src/output/Solenoid.cpp index 534e3d2..6dbb635 100644 --- a/FlippR-Driver/src/output/Solenoid.cpp +++ b/FlippR-Driver/src/output/Solenoid.cpp @@ -7,6 +7,8 @@ #include "Solenoid.h" +namespace FlippR_Driver +{ namespace output { Solenoid::Solenoid() { @@ -19,3 +21,4 @@ Solenoid::~Solenoid() { } } /* namespace output */ +} diff --git a/FlippR-Driver/src/output/Solenoid.h b/FlippR-Driver/src/output/Solenoid.h index 87de4c7..6d8b137 100644 --- a/FlippR-Driver/src/output/Solenoid.h +++ b/FlippR-Driver/src/output/Solenoid.h @@ -10,14 +10,18 @@ #include "CabinetItem.h" -namespace output { +namespace FlippR_Driver +{ +namespace output +{ -class Solenoid: public CabinetItem { +class Solenoid : public CabinetItem +{ public: Solenoid(); virtual ~Solenoid(); }; } /* namespace output */ - +} #endif \ No newline at end of file diff --git a/FlippR-Driver/src/output/Sound.cpp b/FlippR-Driver/src/output/Sound.cpp index 696a37f..8c8d98f 100644 --- a/FlippR-Driver/src/output/Sound.cpp +++ b/FlippR-Driver/src/output/Sound.cpp @@ -7,6 +7,8 @@ #include "Sound.h" +namespace FlippR_Driver +{ namespace output { Sound::Sound() { @@ -19,3 +21,4 @@ Sound::~Sound() { } } /* namespace output */ +} \ No newline at end of file diff --git a/FlippR-Driver/src/output/Sound.h b/FlippR-Driver/src/output/Sound.h index a797d02..2280d3c 100644 --- a/FlippR-Driver/src/output/Sound.h +++ b/FlippR-Driver/src/output/Sound.h @@ -11,9 +11,14 @@ #include "ISound.h" #include -namespace output { -class Sound : ISound { +namespace FlippR_Driver +{ +namespace output +{ + +class Sound : ISound +{ public: Sound(); virtual ~Sound(); @@ -26,5 +31,5 @@ private: }; } /* namespace output */ - +} #endif \ No newline at end of file