nearly compiling

This commit is contained in:
Jonas Zeunert
2019-05-06 21:41:05 +02:00
parent 8b67be312a
commit 2e7a60c0de
9 changed files with 14 additions and 18 deletions

View File

@@ -9,7 +9,7 @@
#define _SRC_FLIPPR_CODE_FLIPPER_H
#include "output/items/Flipper.h"
#include "output/items/DriverBoardItem.h"
#include "output/items/detail/DriverBoardItem.h"
namespace flippR_driver
{
@@ -20,7 +20,7 @@ namespace items
namespace detail
{
class Flipper : public detail::Item, public items::Flipper, public DriverBoardItem
class Flipper : public detail::Item, public items::Flipper, public detail::DriverBoardItem
{
public:
Flipper(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name);
@@ -31,6 +31,7 @@ public:
bool is_activated() override;
private:
const std::shared_ptr<DriverBoardPinController> pin_controller;
bool activated;
};