From 0c08b940f3acfc54a2be5ebd1640b54240d919d4 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Tue, 7 Aug 2018 20:44:21 +0200 Subject: [PATCH] added interfaces. not compiling --- FlippR-Driver/src/output/CabinetItem.h | 4 +++- .../src/output/DisplayController.cpp | 4 ++++ FlippR-Driver/src/output/DisplayController.h | 10 +++++++++ FlippR-Driver/src/output/ICabinetItem.h | 21 +++++++++++++++++++ FlippR-Driver/src/output/IDisplay.h | 2 +- FlippR-Driver/src/output/IDisplayController.h | 2 +- FlippR-Driver/src/output/ILamp.h | 17 +++++++++++++++ FlippR-Driver/src/output/ISolenoid.h | 18 ++++++++++++++++ 8 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 FlippR-Driver/src/output/ICabinetItem.h create mode 100644 FlippR-Driver/src/output/ILamp.h create mode 100644 FlippR-Driver/src/output/ISolenoid.h diff --git a/FlippR-Driver/src/output/CabinetItem.h b/FlippR-Driver/src/output/CabinetItem.h index 78d5210..c2fb837 100644 --- a/FlippR-Driver/src/output/CabinetItem.h +++ b/FlippR-Driver/src/output/CabinetItem.h @@ -8,10 +8,12 @@ #ifndef SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_ #define SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_ +#include "ICabinetItem.h" + #include namespace output { -class CabinetItem { +class CabinetItem : public ICabinetItem { public: CabinetItem(); virtual ~CabinetItem(); diff --git a/FlippR-Driver/src/output/DisplayController.cpp b/FlippR-Driver/src/output/DisplayController.cpp index 9e183d0..1c27f99 100644 --- a/FlippR-Driver/src/output/DisplayController.cpp +++ b/FlippR-Driver/src/output/DisplayController.cpp @@ -7,6 +7,9 @@ #include "DisplayController.h" +namespace output +{ + DisplayController::DisplayController() { // TODO Auto-generated constructor stub @@ -16,3 +19,4 @@ DisplayController::~DisplayController() { // TODO Auto-generated destructor stub } +} diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h index 8c39c0d..2a9563f 100644 --- a/FlippR-Driver/src/output/DisplayController.h +++ b/FlippR-Driver/src/output/DisplayController.h @@ -10,10 +10,20 @@ #include "IDisplayController.h" +#include "utilities/config.h" +#include "Display.h" +#include +namespace output +{ + class DisplayController: public output::IDisplayController { public: DisplayController(); virtual ~DisplayController(); + +private: + std::array displays; }; +} #endif /* SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_ */ diff --git a/FlippR-Driver/src/output/ICabinetItem.h b/FlippR-Driver/src/output/ICabinetItem.h new file mode 100644 index 0000000..760cf3b --- /dev/null +++ b/FlippR-Driver/src/output/ICabinetItem.h @@ -0,0 +1,21 @@ +/* + * ICabinetItem.h + * + * Created on: Aug 7, 2018 + * Author: rhetenor + */ + +#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_ +#define SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_ + + +class ICabinetItem +{ + virtual ~ICabinetItem(); + virtual bool isActivated() = 0; + virtual bool activate() = 0; + virtual bool deactivate() = 0; +}; + + +#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_ */ diff --git a/FlippR-Driver/src/output/IDisplay.h b/FlippR-Driver/src/output/IDisplay.h index d49e300..3445463 100644 --- a/FlippR-Driver/src/output/IDisplay.h +++ b/FlippR-Driver/src/output/IDisplay.h @@ -15,7 +15,7 @@ public: IDisplay(); virtual ~IDisplay(); - virtual int getID(); + virtual int getID() = 0; virtual void write() = 0; }; diff --git a/FlippR-Driver/src/output/IDisplayController.h b/FlippR-Driver/src/output/IDisplayController.h index 5b7735c..663b74f 100644 --- a/FlippR-Driver/src/output/IDisplayController.h +++ b/FlippR-Driver/src/output/IDisplayController.h @@ -7,7 +7,7 @@ #ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_ #define SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_ -#include "config.h" +#include "utilities/config.h" #include "IDisplay.h" #include diff --git a/FlippR-Driver/src/output/ILamp.h b/FlippR-Driver/src/output/ILamp.h new file mode 100644 index 0000000..972192a --- /dev/null +++ b/FlippR-Driver/src/output/ILamp.h @@ -0,0 +1,17 @@ +/* + * ILamp.h + * + * Created on: Aug 7, 2018 + * Author: rhetenor + */ + +#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_ +#define SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_ + +class ILamp +{ + +}; + + +#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_ */ diff --git a/FlippR-Driver/src/output/ISolenoid.h b/FlippR-Driver/src/output/ISolenoid.h new file mode 100644 index 0000000..b2e8556 --- /dev/null +++ b/FlippR-Driver/src/output/ISolenoid.h @@ -0,0 +1,18 @@ +/* + * ISolenoid.h + * + * Created on: Aug 7, 2018 + * Author: rhetenor + */ + +#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_ +#define SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_ + +class ISolenoid +{ + +}; + + + +#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_ */