factoryyyyyN

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

@@ -1,29 +0,0 @@
-//
-// Created by rhetenor on 23.11.18.
-//
-
-#ifndef FLIPPR_DRIVER_IDRIVERBOARDITEM_H
-#define FLIPPR_DRIVER_IDRIVERBOARDITEM_H
-
-#include "output/items/IItem.h"
-
-#include <cstdint>
-
-namespace flippR_driver
-{
-namespace output
-{
-namespace items
-{
-
-class IDriverBoardItem : public IItem
-{
-public:
-  ~IDriverBoardItem() override = default;
-};
-
-}
-}
-}
-
-#endif //FLIPPR_DRIVER_IDRIVERBOARDITEM_H

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

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

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

@@ -10,7 +10,6 @@
 
 #include "Item.h"
 #include "output/items/ILamp.h"
-#include "IDriverBoardItem.h"
 
 namespace flippR_driver
 {
@@ -19,7 +18,7 @@ namespace output
 namespace items
 {
 
-class Lamp : public Item, ILamp, IDriverBoardItem
+class Lamp : public Item, public ILamp
 {
 public:
   Lamp(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name);

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

@@ -10,7 +10,6 @@
 
 #include "output/items/ISolenoid.h"
 #include "Item.h"
-#include "IDriverBoardItem.h"
 
 #include <future>
 #include <chrono>
@@ -22,7 +21,7 @@ namespace output
 namespace items
 {
 
-class Solenoid : public Item, ISolenoid, IDriverBoardItem
+class Solenoid : public Item, public ISolenoid
 {
 public:
   Solenoid(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, u_int8_t address,  std::string name, std::chrono::milliseconds deactivation_time);

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

@@ -24,7 +24,7 @@ namespace output
 namespace items
 {
 
-class Sound : public ISound, Item
+class Sound : public ISound, public Item
 {
 public:
 	u_int id;