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

json bug

Browse Source
This commit is contained in:
Jonas Zeunert
2020-03-09 20:29:05 +01:00
parent 71cab5b474
commit bb1f79de75
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
networking/Networking.py
View File

@@ -1,5 +1,6 @@
import requests_unixsocket as req import requests_unixsocket as req
import socket import socket
import json
import asyncio import asyncio
from utils.Singleton import Singleton from utils.Singleton import Singleton
@@ -19,16 +20,16 @@ class Networking(metaclass=Singleton):
return response return response
def getSolenoids(self): def getSolenoids(self):
return self.get("/solenoids").json() return json.loads(self.get("/solenoids"))
def getSounds(self): def getSounds(self):
return self.get("/sounds").json() return json.loads(self.get("/sounds"))
def getLamps(self): def getLamps(self):
return self.get("/lamps").json() return json.loads(self.get("/lamps"))
def getDisplays(self): def getDisplays(self):
return self.get("/displays").json() return json.loads(self.get("/displays"))
def triggerSolenoid(self, solenoid): def triggerSolenoid(self, solenoid):
self.get("/solenoids/" + solenoid + "/trigger") self.get("/solenoids/" + solenoid + "/trigger")
@@ -43,7 +44,7 @@ class Networking(metaclass=Singleton):
self.get("/lamps/" + lamp + "/deactivate") self.get("/lamps/" + lamp + "/deactivate")
def lampStatus(self, lamp): def lampStatus(self, lamp):
return self.get("/lamps/" + lamp + "/status").json() return json.loads(self.get("/lamps/" + lamp + "/status"))
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))