Jukebox/jukebox-software
10
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 2 Wiki Activity

Update web, disable sensors in testing mode

Browse Source
This commit is contained in:
Cole Deck 2024-07-29 12:06:15 -05:00
parent af91817a98
commit 1ac8712e0f
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jukebox-web

@ -1 +1 @@
Subproject commit a2e94baadc8a8cc702d2a5ceb1170914e690d0e7 Subproject commit 5a3943ae46b62112017641adb06ed48969ae6298

BIN
map.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 340 KiB

2
requirements.txt
View File

@ -1,6 +1,6 @@
# Runtime # Runtime
camelot-py[base]==0.9.0 camelot-py[base]==0.9.0
#opencv-python opencv-python
pypdf2==2.12.1 pypdf2==2.12.1
alive-progress alive-progress
requests requests

6
run.py
View File

@ -32,7 +32,7 @@ from uptime import uptime
import fileserver import fileserver
# set to false to run without real hardware for development # set to false to run without real hardware for development
real = True real = False
skip_scanning = True skip_scanning = True
mbconn = None mbconn = None
@ -423,6 +423,7 @@ def setup_server(pool, manager):
if sensor_ready is False: if sensor_ready is False:
fprint("waiting for " + "Sensor Initialization" + " to complete...", sendqueue=to_server_queue) fprint("waiting for " + "Sensor Initialization" + " to complete...", sendqueue=to_server_queue)
global mbconn global mbconn
if real:
mbconn = ModbusClient(host="192.168.1.20", port=502, auto_open=False, auto_close=False) mbconn = ModbusClient(host="192.168.1.20", port=502, auto_open=False, auto_close=False)
get_sensors() get_sensors()
fprint("Sensors initialized.", sendqueue=to_server_queue) fprint("Sensors initialized.", sendqueue=to_server_queue)
@ -772,7 +773,10 @@ def mainloop_server(pool, manager):
else: else:
global mainloop_get global mainloop_get
#print("Checking sensors..") #print("Checking sensors..")
if real:
newtube = get_sensors() newtube = get_sensors()
else:
newtube = -1
if newtube >= 0: if newtube >= 0:
# need to return a cable # need to return a cable
mainloop_get.put(("return", newtube)) mainloop_get.put(("return", newtube))