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

Update configs to our flippr

Browse Source
This commit is contained in:
Jonas Zeunert
2022-06-06 17:47:12 +02:00
parent f68f9fc8cc
commit 1e91fdd175
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
View File

@@ -1,20 +1,20 @@
{ {
"port_extenders" : "port_extenders" :
[ [
{ {
"name" : "extender_0", "name" : "extender_0",
"i2c_address" : 32, "i2c_address" : 32,
"pin_base" : 65 "pin_base" : 65
} }
], ],
"deactivation_time_milliseconds" : 10, "deactivation_time_milliseconds" : 55,
"flippers" : "flippers" :
[ [
{ {
"address" : 60, "address" : 60,
"name" : "Flipper Relay" "name" : "Flipper Relay"
}, },
{ {
"address" : 92, "address" : 92,
"name" : "Top Flipper Relay" "name" : "Top Flipper Relay"
} }
@@ -25,7 +25,7 @@
"_comment" :"addresses relative to port_extender", "_comment" :"addresses relative to port_extender",
"address" : 80, "address" : 80,
"name" : "Out Hole", "name" : "Out Hole",
"deactivation_time_milliseconds" : 15 "deactivation_time_milliseconds" : 25
}, },
{ {
"address" : 83, "address" : 83,
@@ -37,7 +37,8 @@
}, },
{ {
"address" : 95, "address" : 95,
"name" : "Top Central Bank" "name" : "Top Central Bank",
"deactivation_time_milliseconds" : 55
}, },
{ {
"address" : 96, "address" : 96,
@@ -49,11 +50,13 @@
}, },
{ {
"address" : 98, "address" : 98,
"name" : "Bottom Right Bank" "name" : "Bottom Right Bank",
"deactivation_time_milliseconds" : 40
}, },
{ {
"address" : 99, "address" : 99,
"name" : "Bottom Left Bank" "name" : "Bottom Left Bank",
"deactivation_time_milliseconds" : 400
}, },
{ {
"address" : 100, "address" : 100,

12
FlippR-Driver/contrib/json_example/server_config.json
View File

@@ -1,8 +1,8 @@
{ {
"input-config" :"../../contrib/json_example/input/Input_Pin_Config.json", "input-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/input/Input_Pin_Config.json",
"matrix-config" :"../../contrib/json_example/input/Input_Matrix_Config.json", "matrix-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json",
"lamp-config" :"../../contrib/json_example/output/Lamp_Config.json", "lamp-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Lamp_Config.json",
"solenoid-config" :"../../contrib/json_example/output/Solenoid_Config.json", "solenoid-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json",
"sound-config" :"../../contrib/json_example/output/Sound_Config.json", "sound-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Sound_Config.json",
"display-config" :"../../contrib/json_example/output/Display_Config.json" "display-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Display_Config.json"
} }

4
cli/FlippR_Networking.py
View File

@@ -45,7 +45,7 @@ class Networking:
self.get("/flippers/" + name + "/activate") self.get("/flippers/" + name + "/activate")
def deactivateFlipper(self, name): def deactivateFlipper(self, name):
self.get("/flippers/" + name + "/deactivate") self.get("/flippers/" + name + "deactivate")
def lampStatus(self, lamp): def lampStatus(self, lamp):
return json.loads(self.get("/lamps/" + lamp + "/status")) return json.loads(self.get("/lamps/" + lamp + "/status"))
@@ -53,7 +53,7 @@ class Networking:
def writeDisplayScore(self, display, score): def writeDisplayScore(self, display, score):
self.get("/displays/" + display + "/write_score/" + str(score)) self.get("/displays/" + display + "/write_score/" + str(score))
async def getInputEvent(self): def getInputEvent(self):
header = list() header = list()
while b'\x02' not in header: while b'\x02' not in header:
byte = self.input_socket.recv(1) byte = self.input_socket.recv(1)