From 1e91fdd175db5902bc6993fe814954a2b187ed6b Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Mon, 6 Jun 2022 17:47:12 +0200
Subject: [PATCH] Update configs to our flippr

---
 .../json_example/output/Solenoid_Config.json  | 23 +++++++++++--------
 .../contrib/json_example/server_config.json   | 12 +++++-----
 cli/FlippR_Networking.py                      |  4 ++--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
index a024e3e..df3d082 100644
--- a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
@@ -1,20 +1,20 @@
 {
-  "port_extenders" : 
+  "port_extenders" :
   [
     {
-        "name" : "extender_0",
-        "i2c_address" : 32,
-        "pin_base" : 65
+      "name" : "extender_0",
+      "i2c_address" : 32,
+      "pin_base" : 65
     }
   ],
-  "deactivation_time_milliseconds" : 10,
+  "deactivation_time_milliseconds" : 55,
   "flippers" :
   [
     {
       "address" : 60,
       "name" : "Flipper Relay"
     },
-    { 
+    {
       "address" : 92,
       "name" : "Top Flipper Relay"
     }
@@ -25,7 +25,7 @@
       "_comment" :"addresses relative to port_extender",
       "address" : 80,
       "name" : "Out Hole",
-      "deactivation_time_milliseconds" : 15
+      "deactivation_time_milliseconds" : 25
     },
     {
       "address" : 83,
@@ -37,7 +37,8 @@
     },
     {
       "address" : 95,
-      "name" : "Top Central Bank"
+      "name" : "Top Central Bank",
+      "deactivation_time_milliseconds" : 55
     },
     {
       "address" : 96,
@@ -49,11 +50,13 @@
     },
     {
       "address" : 98,
-      "name" : "Bottom Right Bank"
+      "name" : "Bottom Right Bank",
+      "deactivation_time_milliseconds" : 40
     },
     {
       "address" : 99,
-      "name" : "Bottom Left Bank"
+      "name" : "Bottom Left Bank",
+      "deactivation_time_milliseconds" : 400
     },
     {
       "address" : 100,
diff --git a/FlippR-Driver/contrib/json_example/server_config.json b/FlippR-Driver/contrib/json_example/server_config.json
index d8109d3..3a81951 100644
--- a/FlippR-Driver/contrib/json_example/server_config.json
+++ b/FlippR-Driver/contrib/json_example/server_config.json
@@ -1,8 +1,8 @@
 {
-    "input-config"      :"../../contrib/json_example/input/Input_Pin_Config.json",
-    "matrix-config"     :"../../contrib/json_example/input/Input_Matrix_Config.json",
-    "lamp-config"       :"../../contrib/json_example/output/Lamp_Config.json",
-    "solenoid-config"   :"../../contrib/json_example/output/Solenoid_Config.json",
-    "sound-config"      :"../../contrib/json_example/output/Sound_Config.json",
-    "display-config"    :"../../contrib/json_example/output/Display_Config.json"
+    "input-config"      :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/input/Input_Pin_Config.json",
+    "matrix-config"     :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json",
+    "lamp-config"       :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Lamp_Config.json",
+    "solenoid-config"   :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json",
+    "sound-config"      :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Sound_Config.json",
+    "display-config"    :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Display_Config.json"
 }
diff --git a/cli/FlippR_Networking.py b/cli/FlippR_Networking.py
index 36e3173..5f7afa7 100644
--- a/cli/FlippR_Networking.py
+++ b/cli/FlippR_Networking.py
@@ -45,7 +45,7 @@ class Networking:
         self.get("/flippers/" + name + "/activate")
 
     def deactivateFlipper(self, name):
-        self.get("/flippers/" + name + "/deactivate")
+        self.get("/flippers/" + name + "deactivate")
 
     def lampStatus(self, lamp):
         return json.loads(self.get("/lamps/" + lamp + "/status"))
@@ -53,7 +53,7 @@ class Networking:
     def writeDisplayScore(self, display, score):
         self.get("/displays/" + display + "/write_score/" + str(score))
 
-    async def getInputEvent(self):
+    def getInputEvent(self):
         header = list()
         while b'\x02' not in header:
             byte = self.input_socket.recv(1)