ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix controller to serial "None" option as None correctly.

Browse source
This commit is contained in:
Matthew Stratford 2021-09-01 22:26:40 +01:00
parent 6c80a8c192
commit 0e040d2d22
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
controllers/mattchbox_usb.py
View file

@ -38,6 +38,7 @@ class MattchBox(Controller):
# Allow server config changes to trigger controller reload if required. # Allow server config changes to trigger controller reload if required.
self.port = None self.port = None
self.next_port = self.server_state.get()["serial_port"] self.next_port = self.server_state.get()["serial_port"]
self.logger.log.info("Server config gives port as: {}".format(self.next_port))
self.server_from_q = server_from_q self.server_from_q = server_from_q
self.server_to_q = server_to_q self.server_to_q = server_to_q
@ -57,10 +58,13 @@ class MattchBox(Controller):
self.port = None self.port = None
self.next_port = new_port self.next_port = new_port
def connect(self, port: Optional[str]): def _disconnected(self):
# If we loose the controller, make sure to set channels live, so we tracklist. # If we lose the controller, make sure to set channels live, so we tracklist.
for i in range(len(self.server_from_q)): for i in range(len(self.server_from_q)):
self.sendToPlayer(i, "SETLIVE:True") self.sendToPlayer(i, "SETLIVE:True")
self.server_state.update("ser_connected", False)
def connect(self, port: Optional[str]):
if port: if port:
# connect to serial port # connect to serial port
@ -71,8 +75,10 @@ class MattchBox(Controller):
self.logger.log.info("Connected to serial port {}".format(port)) self.logger.log.info("Connected to serial port {}".format(port))
except serial.SerialException as e: except serial.SerialException as e:
self.logger.log.error( self.logger.log.error(
"Could not open serial port {}: {}".format(port, e) "Could not open serial port" + str(port),
e
) )
self._disconnected()
self.ser = None self.ser = None
else: else:
self.ser = None self.ser = None
@ -89,7 +95,7 @@ class MattchBox(Controller):
) # Endianness doesn't matter for 1 byte. ) # Endianness doesn't matter for 1 byte.
self.logger.log.info("Received from controller: " + str(line)) self.logger.log.info("Received from controller: " + str(line))
if line == 255: if line == 255:
self.ser.write(b"\xff") # Send 255 back self.ser.write(b"\xff") # Send 255 back, this is a keepalive.
elif line in [51,52,53]: elif line in [51,52,53]:
# We've received a status update about fader live status, fader is down. # We've received a status update about fader live status, fader is down.
self.sendToPlayer(line-51, "SETLIVE:False") self.sendToPlayer(line-51, "SETLIVE:False")
@ -108,7 +114,7 @@ class MattchBox(Controller):
elif self.port: elif self.port:
# If there's still a port set, just wait a moment and see if it's been reconnected. # If there's still a port set, just wait a moment and see if it's been reconnected.
self.server_state.update("ser_connected", False) self._disconnected()
time.sleep(10) time.sleep(10)
self.connect(self.port) self.connect(self.port)
@ -116,7 +122,7 @@ class MattchBox(Controller):
# We're not already connected, or a new port connection is to be made. # We're not already connected, or a new port connection is to be made.
if self.ser: if self.ser:
self.ser.close() self.ser.close()
self.server_state.update("ser_connected", False) self._disconnected()
if self.next_port is not None: if self.next_port is not None:
self.connect(self.next_port) self.connect(self.next_port)

4
web_server.py
View file

@ -164,7 +164,9 @@ def ui_config_server_update(request):
server_state.update("port", int(request.form.get("port"))) server_state.update("port", int(request.form.get("port")))
server_state.update("num_channels", int(request.form.get("channels"))) server_state.update("num_channels", int(request.form.get("channels")))
server_state.update("ws_port", int(request.form.get("ws_port"))) server_state.update("ws_port", int(request.form.get("ws_port")))
server_state.update("serial_port", request.form.get("serial_port"))
serial_port = request.form.get("serial_port")
server_state.update("serial_port", None if serial_port == "None" else serial_port)
# Because we're not showing the api key once it's set. # Because we're not showing the api key once it's set.
if "myradio_api_key" in request.form and request.form.get("myradio_api_key") != "": if "myradio_api_key" in request.form and request.form.get("myradio_api_key") != "":