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

2020-01-09 22:33:06 +01:00
parent dd0d7e71c5 ebf5a158b5
commit 7fad79bf1a
3 changed files with 5 additions and 19 deletions
--- a/FlippR-Driver/contrib/json_example/output/Sound_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Sound_Config.json
@@ -56,11 +56,11 @@
        "id" : 255,
        "address" : 0,
        "name" : "Deactivation Sound"
-      }
+      },
      {
        "id" : 0,
        "address" : 22,
-        "name" : "Sound 1",
+        "name" : "Sound 1"
      },
      {
        "id" : 1,
@@ -151,7 +151,7 @@
        "id" : 18,
        "address" : 40,
        "name" : "Sound 19"
-      },84.4932%
+      },
      {
        "id" : 19,
        "address" : 41,