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

Merge branch 'master' of https://github.com/swinginbird/flippr-code

Browse Source
This commit is contained in:
Neeflix
2018-08-08 11:16:31 +02:00
parent 844847edca 094d76181e
commit 67e70405e0
15 changed files with 46 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/src/output/CabinetItem.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_
#ifndef _SRC_OUTPUT_CABINETITEM_H_
#define _SRC_OUTPUT_CABINETITEM_H_
#include "ICabinetItem.h"
@@ -30,4 +30,4 @@ protected:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_ */
#endif /* _SRC_OUTPUT_CABINETITEM_H_ */

6
FlippR-Driver/src/output/Display.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAY_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAY_H_
#ifndef _SRC_OUTPUT_DISPLAY_H_
#define _SRC_OUTPUT_DISPLAY_H_
#include "IDisplay.h"
@@ -30,4 +30,4 @@ private:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAY_H_ */
#endif /* _SRC_OUTPUT_DISPLAY_H_ */

13
FlippR-Driver/src/output/DisplayController.h
View File

@@ -5,25 +5,26 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_
#ifndef _SRC_OUTPUT_DISPLAYCONTROLLER_H_
#define _SRC_OUTPUT_DISPLAYCONTROLLER_H_
#include "IDisplayController.h"
#include "utilities/config.h"
#include "Display.h"
#include "IDisplay.h"
#include <array>
namespace output
{
class DisplayController: public output::IDisplayController {
class DisplayController: public IDisplayController {
public:
DisplayController();
virtual ~DisplayController();
private:
std::array<Display, NUMBER_OF_DISPLAYS> displays;
std::array<std::unique_ptr<IDisplay>, NUMBER_OF_DISPLAYS> displays;
};
}
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_ */
#endif /* _SRC_OUTPUT_DISPLAYCONTROLLER_H_ */

6
FlippR-Driver/src/output/ICabinetItem.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_
#ifndef _SRC_OUTPUT_ICABINETITEM_H_
#define _SRC_OUTPUT_ICABINETITEM_H_
class ICabinetItem
@@ -18,4 +18,4 @@ class ICabinetItem
};
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_ */
#endif /* _SRC_OUTPUT_ICABINETITEM_H_ */

6
FlippR-Driver/src/output/IDisplay.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAY_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAY_H_
#ifndef _SRC_OUTPUT_IDISPLAY_H_
#define _SRC_OUTPUT_IDISPLAY_H_
namespace output {
@@ -22,4 +22,4 @@ public:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAY_H_ */
#endif /* _SRC_OUTPUT_IDISPLAY_H_ */

12
FlippR-Driver/src/output/IDisplayController.h
View File

@@ -5,11 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_
#include "utilities/config.h"
#include "IDisplay.h"
#include <array>
#ifndef _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
#define _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
namespace output {
@@ -17,11 +14,8 @@ class IDisplayController {
public:
IDisplayController();
virtual ~IDisplayController();
private:
std::array<IDisplay, NUMBER_OF_DISPLAYS> displays;
};
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_ */
#endif /* _SRC_OUTPUT_IDISPLAYCONTROLLER_H_ */

6
FlippR-Driver/src/output/ILamp.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_
#ifndef _SRC_OUTPUT_ILAMP_H_
#define _SRC_OUTPUT_ILAMP_H_
class ILamp
{
@@ -14,4 +14,4 @@ class ILamp
};
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_ */
#endif /* _SRC_OUTPUT_ILAMP_H_ */

6
FlippR-Driver/src/output/IOutputDriver.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IOUTPUTDRIVER_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_IOUTPUTDRIVER_H_
#ifndef _SRC_OUTPUT_IOUTPUTDRIVER_H_
#define _SRC_OUTPUT_IOUTPUTDRIVER_H_
namespace output {
@@ -18,4 +18,4 @@ public:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_IOUTPUTDRIVER_H_ */
#endif /* _SRC_OUTPUT_IOUTPUTDRIVER_H_ */

6
FlippR-Driver/src/output/ISolenoid.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_
#ifndef _SRC_OUTPUT_ISOLENOID_H_
#define _SRC_OUTPUT_ISOLENOID_H_
class ISolenoid
{
@@ -15,4 +15,4 @@ class ISolenoid
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_ */
#endif /* _SRC_OUTPUT_ISOLENOID_H_ */

6
FlippR-Driver/src/output/ISound.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ISOUND_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_ISOUND_H_
#ifndef _SRC_OUTPUT_ISOUND_H_
#define _SRC_OUTPUT_ISOUND_H_
namespace output {
@@ -20,4 +20,4 @@ public:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ISOUND_H_ */
#endif /* _SRC_OUTPUT_ISOUND_H_ */

6
FlippR-Driver/src/output/Lamp.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_LAMP_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_LAMP_H_
#ifndef _SRC_OUTPUT_LAMP_H_
#define _SRC_OUTPUT_LAMP_H_
#include "CabinetItem.h"
@@ -20,4 +20,4 @@ public:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_LAMP_H_ */
#endif /* _SRC_OUTPUT_LAMP_H_ */

6
FlippR-Driver/src/output/OutputDriver.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_OUTPUTDRIVER_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_OUTPUTDRIVER_H_
#ifndef _SRC_OUTPUT_OUTPUTDRIVER_H_
#define _SRC_OUTPUT_OUTPUTDRIVER_H_
#include "IOutputDriver.h"
@@ -20,4 +20,4 @@ public:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_OUTPUTDRIVER_H_ */
#endif /* _SRC_OUTPUT_OUTPUTDRIVER_H_ */

6
FlippR-Driver/src/output/Solenoid.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_SOLENOID_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_SOLENOID_H_
#ifndef _SRC_OUTPUT_SOLENOID_H_
#define _SRC_OUTPUT_SOLENOID_H_
#include "CabinetItem.h"
@@ -20,4 +20,4 @@ public:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_SOLENOID_H_ */
#endif /* _SRC_OUTPUT_SOLENOID_H_ */

6
FlippR-Driver/src/output/Sound.h
View File

@@ -5,8 +5,8 @@
* Author: rhetenor
*/
#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_SOUND_H_
#define SOURCE_DIRECTORY__SRC_OUTPUT_SOUND_H_
#ifndef _SRC_OUTPUT_SOUND_H_
#define _SRC_OUTPUT_SOUND_H_
#include "ISound.h"
@@ -27,4 +27,4 @@ private:
} /* namespace output */
#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_SOUND_H_ */
#endif /* _SRC_OUTPUT_SOUND_H_ */

25
FlippR-Driver/tests/output/TestInputDriverFactory.cpp
View File

@@ -1,25 +0,0 @@
/*
* TestInputDriverFactory.cpp
*
* Created on: Jul 11, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Oliver Martin, Dr. Franca Rupprecht
*/
#include "catch.hpp"
#include "fakeit.hpp"
#include "utilities/LoggerFactory.hpp"
// testing purposes
#define private public
#include "output/Solenoid.h"
using namespace Output;
using namespace fakeit;
SCENARIO("")
{
}