diff --git a/jukebox-web b/jukebox-web index a2e94ba..5a3943a 160000 --- a/jukebox-web +++ b/jukebox-web @@ -1 +1 @@ -Subproject commit a2e94baadc8a8cc702d2a5ceb1170914e690d0e7 +Subproject commit 5a3943ae46b62112017641adb06ed48969ae6298 diff --git a/map.png b/map.png index 21f1e0c..f0f08f2 100644 Binary files a/map.png and b/map.png differ diff --git a/requirements.txt b/requirements.txt index 3d5ce98..7081cad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Runtime camelot-py[base]==0.9.0 -#opencv-python +opencv-python pypdf2==2.12.1 alive-progress requests diff --git a/run.py b/run.py index f403264..8edaf46 100755 --- a/run.py +++ b/run.py @@ -32,7 +32,7 @@ from uptime import uptime import fileserver # set to false to run without real hardware for development -real = True +real = False skip_scanning = True mbconn = None @@ -423,8 +423,9 @@ def setup_server(pool, manager): if sensor_ready is False: fprint("waiting for " + "Sensor Initialization" + " to complete...", sendqueue=to_server_queue) global mbconn - mbconn = ModbusClient(host="192.168.1.20", port=502, auto_open=False, auto_close=False) - get_sensors() + if real: + mbconn = ModbusClient(host="192.168.1.20", port=502, auto_open=False, auto_close=False) + get_sensors() fprint("Sensors initialized.", sendqueue=to_server_queue) if camera_ready is False: @@ -772,7 +773,10 @@ def mainloop_server(pool, manager): else: global mainloop_get #print("Checking sensors..") - newtube = get_sensors() + if real: + newtube = get_sensors() + else: + newtube = -1 if newtube >= 0: # need to return a cable mainloop_get.put(("return", newtube))