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

2019-05-06 20:54:01 +02:00
parent 18b1b190be 4aeebb9291
commit 62bbcac6ce
12 changed files with 57 additions and 1006 deletions
--- a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
@@ -1,11 +1,18 @@
 {
  "deactivation_time_milliseconds" : 10,
-  "solenoids" :
+  "flippers" :
  [
-    { // todo is this solenoid?
+    {
      "address" : 61,
      "name" : "Flipper Relay"
    },
+    { 
+      "address" : 91,
+      "name" : "Top Flipper Relay"
+    }
+  ],
+  "solenoids" :
+  [
    {
      "address" : 79,
      "name" : "Out Hole",
@@ -15,10 +22,6 @@
      "address" : 82,
      "name" : "Bottom Right Pop"
    },
-    { // todo
-      "address" : 91,
-      "name" : "Top Flipper Relay"
-    },
    {
      "address" : 92,
      "name" : "Right Kicker"