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

reafectored stuff and corrected shit to make everything compiling

Browse Source
This commit is contained in:
Johannes Wendel
2018-11-21 10:30:04 +01:00
parent d2379868ec
commit 03dc3c61ce
26 changed files with 183 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FlippR-Driver/src/output/items/Solenoid.h
View File

@@ -8,11 +8,10 @@
#ifndef _SRC_OUTPUT_SOLENOID_H_
#define _SRC_OUTPUT_SOLENOID_H_
#include "output/items/ISolenoid.h"
#include "OutputItem.h"
#include "../../../include/output/output_items/ISolenoid.h"
#include <future>
#include <thread>
#include <chrono>
namespace flippR_driver
@@ -22,7 +21,7 @@ namespace output
namespace items
{
class Solenoid : public ISolenoid, OutputItem
class Solenoid : public OutputItem, ISolenoid
{
public:
Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, unsigned int address, unsigned int i2c_address, unsigned int data_pin, std::string name, std::chrono::milliseconds deactivation_time);
@@ -33,10 +32,14 @@ public:
private:
std::chrono::milliseconds deactivation_time;
std::future<void> trigger_task;
private:
virtual void triggerTask();
}
};
} /* namespace output */
}
}
#endif