factory

FlippR-Driver/src/output/items/IDriverBoardItem.h

@@ -5,7 +5,7 @@
 #ifndef FLIPPR_DRIVER_IDRIVERBOARDITEM_H
 #define FLIPPR_DRIVER_IDRIVERBOARDITEM_H
 
-#include "IItem.h"
+#include "output/items/IItem.h"
 
 #include <cstdint>
 

FlippR-Driver/src/output/items/IItem.h

@@ -1,32 +0,0 @@
-/*
- * ICabinetItem.h
- *
- *  Created on: Aug 7, 2018
- *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
- */
-
-#ifndef _SRC_OUTPUT_ICABINETITEM_H_
-#define _SRC_OUTPUT_ICABINETITEM_H_
-
-#include <cstdint>
-
-namespace flippR_driver
-{
-namespace output
-{
-namespace items
-{
-
-class IItem
-{
-public:
-  virtual ~IItem() = default;
-
-  virtual uint8_t get_address() = 0;
-};
-
-}
-}
-}
-
-#endif

FlippR-Driver/src/output/items/ISoundItem.h

@@ -1,24 +0,0 @@
-//
-// Created by rhetenor on 23.11.18.
-//
-
-#ifndef FLIPPR_DRIVER_ISOUNDITEM_H
-#define FLIPPR_DRIVER_ISOUNDITEM_H
-
-#include "IItem.h"
-namespace flippR_driver
-{
-namespace output
-{
-namespace items
-{
-class ISoundItem : public IItem
-{
-
-};
-
-}
-}
-}
-
-#endif //FLIPPR_DRIVER_ISOUNDITEM_H

FlippR-Driver/src/output/items/Item.cpp

@@ -21,6 +21,10 @@ uint8_t Item::get_address()
 {
   return this->address;
 }
+std::string Item::get_name()
+{
+  return this->name;
+}
 
 }
 }

FlippR-Driver/src/output/items/Item.h

@@ -8,7 +8,7 @@
 #ifndef _SRC_OUTPUT_CABINETITEM_H_
 #define _SRC_OUTPUT_CABINETITEM_H_
 
-#include "IItem.h"
+#include "output/items/IItem.h"
 
 #include "output/IOutputGPIOInterface.h"
 
@@ -29,6 +29,7 @@ public:
   ~Item() override = default;
 
   uint8_t get_address() override;
+  std::string get_name() override;
 
 protected:
   const uint8_t address;

FlippR-Driver/src/output/items/Sound.h

@@ -9,7 +9,6 @@
 #define _SRC_OUTPUT_SOUND_H_
 
 #include "output/items/ISound.h"
-#include "ISoundItem.h"
 #include "Item.h"
 
 #include <memory>
@@ -25,7 +24,7 @@ namespace output
 namespace items
 {
 
-class Sound : public ISound, Item, ISoundItem
+class Sound : public ISound, Item
 {
 public:
 	u_int id;