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

updated sound json

Browse Source
This commit is contained in:
Jonas Zeunert
2018-11-23 15:57:15 +01:00
parent 48e6507293
commit 5a3665a4cc
4 changed files with 155 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/src/output/items/Sound.cpp
View File

@@ -16,8 +16,8 @@ namespace output
namespace items
{
Sound::Sound(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) :
Item(output_gpio_interface, address, i2c_address, data_pin, name),
Sound::Sound(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time) :
Item(output_gpio_interface, address, name),
deactivation_time(deactivation_time)
{}

7
FlippR-Driver/src/output/items/Sound.h
View File

@@ -27,7 +27,10 @@ namespace items
class Sound : public ISound, Item
{
public:
Sound(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);
u_int id;
public:
Sound(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time);
virtual ~Sound() = default;
virtual void play();
@@ -35,8 +38,6 @@ public:
private:
std::chrono::milliseconds deactivation_time;
std::future<void> play_task;
private:
virtual void playTask();
};