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

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

Browse Source
This commit is contained in:
Johannes Wendel
2019-05-06 21:19:00 +02:00
parent 72ac2c88a0 bc583a5a92
commit 3bf4dcac4c
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FlippR-Driver/include/output/items/Flipper.h
View File

@@ -9,6 +9,7 @@
#define _INCLUDE_FLIPPR_CODE_FLIPPER_H #define _INCLUDE_FLIPPR_CODE_FLIPPER_H
#include "Item.h" #include "Item.h"
namespace flippR_driver namespace flippR_driver
{ {
namespace output namespace output

1
FlippR-Driver/src/output/items/detail/DriverBoardItem.h
View File

@@ -8,6 +8,7 @@
#include "output/items/DriverBoardItem.h" #include "output/items/DriverBoardItem.h"
#include <memory> #include <memory>
namespace flippR_driver namespace flippR_driver
{ {
namespace output namespace output

2
FlippR-Driver/src/output/items/detail/Flipper.h
View File

@@ -20,7 +20,7 @@ namespace items
namespace detail namespace detail
{ {
class Flipper : public items::Flipper, public DriverBoardItem class Flipper : public detail::Item, public items::Flipper, public DriverBoardItem
{ {
public: public:
Flipper(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name); Flipper(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name);