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/contrib/json_example/Output_Config.json
View File

@@ -18,10 +18,10 @@
"latch-select" :
{
"mux1" : 8,
"mux2" : 9
"mux2" : 9,
"A" : 5,
"B" : 6,
"C" : 7,
"C" : 7
}
},

149
FlippR-Driver/contrib/json_example/output_item_config.json
View File

@@ -1,8 +1,153 @@
{
"sounds" :
{
[
{
"id:": 0,
"address" : "22",
"description" : "Sound 1"
},
{
"id:": 1,
"address" : "23",
"description" : "Sound 2"
},
{
"id:": 2,
"address" : "24",
"description" : "Sound 3"
},
{
"id:": 3,
"address" : "25",
"description" : "Sound 4"
},
{
"id:": 4,
"address" : "26",
"description" : "Sound 5"
},
{
"id:": 5,
"address" : "27",
"description" : "Sound 6"
},
{
"id:": 6,
"address" : "28",
"description" : "Sound 7"
},
{
"id:": 7,
"address" : "29",
"description" : "Sound 8"
},
{
"id:": 8,
"address" : "30",
"description" : "Sound 9"
},
{
"id:": 9,
"address" : "31",
"description" : "Sound 10"
},
{
"id:": 10,
"address" : "32",
"description" : "Sound 11"
},
{
"id:": 11,
"address" : "33",
"description" : "Sound 12"
},
{
"id:": 12,
"address" : "34",
"description" : "Sound 13"
},
{
"id:": 13,
"address" : "35",
"description" : "Sound 14"
},
{
"id:": 14,
"address" : "36",
"description" : "Sound 15"
},
{
"id:": 15,
"address" : "37",
"description" : "Sound 16"
},
{
"id:": 16,
"address" : "38",
"description" : "Sound 17"
},
{
"id:": 17,
"address" : "39",
"description" : "Sound 18"
},
{
"id:": 18,
"address" : "40",
"description" : "Sound 19"
},
{
"id:": 19,
"address" : "41",
"description" : "Sound 20"
},
{
"id:": 20,
"address" : "42",
"description" : "Sound 21"
},
{
"id:": 21,
"address" : "43",
"description" : "Sound 22"
},
{
"id:": 22,
"address" : "44",
"description" : "Sound 23"
},
{
"id:": 23,
"address" : "45",
"description" : "Sound 24"
},
{
"id:": 24,
"address" : "46",
"description" : "Sound 25"
},
{
"id:": 25,
"address" : "47",
"description" : "Sound 26"
},
{
"id:": 26,
"address" : "48",
"description" : "Sound 27"
},
{
"id:": 27,
"address" : "49",
"description" : "Sound 28"
},
{
"id:": 28,
"address" : "50",
"description" : "Speech 1: \"You're good! But I'm still the Champ!\""
},
},
],
"lamps" :
{

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();
};