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

merged

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-16 22:38:29 +02:00
parent 5fe28d46d9 264044393f
commit 5e5c196a25
7 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/contrib/json_example/output/Sound_Config.json
View File

@@ -2,11 +2,17 @@
"deactivation_time_milliseconds" : 10,
"port_extenders" :
[
<<<<<<< HEAD
{
"name" : "extender_0",
"i2c_address" : 33,
"pin_base" : 81
}
=======
"name" : "extender_0",
"i2c_address" : 33,
"pin_base" : 81
>>>>>>> aa1d6409ea18cff1ad4b0ef06804fcf5a521dee9
],
"fire_pin" :
{