Skip to content

Commit

Permalink
Optimize and clean up Python3 code (#3)
Browse files Browse the repository at this point in the history 
* Optimize Python3 code

Multiple encoding translations is slowing down the app enough to miss
messages occasionally causing the main controller to restart.  Optimize
out meaningless translations, etc. to make faster.

* Make RS485 CMD be an integer, not hex string

* ret['dest'] is also an int

* Ack and nextAck are ints, too

* We only support single post method, no Message needed

* Fix SPA status report
  • Loading branch information
@earlephilhower
earlephilhower authored Feb 1, 2023
1 parent ee8be2c commit 0639230
Showing 1 changed file with 56 additions and 81 deletions.
137 changes: 56 additions & 81 deletions aquaweb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import socket
import os
from http.server import BaseHTTPRequestHandler, HTTPServer
from email.message import Message
import urllib
from functools import reduce

Expand Down Expand Up @@ -254,23 +253,10 @@ def do_GET(self):

def do_POST(self):
"""HTTP POST handler. CGI "scripts" handled here."""
#ctype, pdict = urllib.parse_header(self.headers.get('content-type'))
m = Message()
m['content-type'] = self.headers.get('content-type')
ctype = m.get_params()[0][0]
try:
pdict = m.get_params()[1]
except:
pdict = {}
try:
if ctype == 'multipart/form-data':
postvars = urllib.parse_multipart(self.rfile, pdict)
elif ctype == 'application/x-www-form-urlencoded':
length = int(self.headers.get('content-length'))
data = self.rfile.read(length).decode("UTF-8")
postvars = urllib.parse.parse_qs(data, keep_blank_values=1)
else:
postvars = {}
length = int(self.headers.get('content-length'))
data = self.rfile.read(length).decode("UTF-8")
postvars = urllib.parse.parse_qs(data, keep_blank_values=1)
except:
postvars = {}
if (self.path.startswith("/key.cgi") or
Expand Down Expand Up @@ -306,9 +292,9 @@ def do_POST(self):
elif self.path.startswith("/spascreen.cgi"):
ret = self.spa.html()
elif self.path.startswith("/status.cgi"):
ret = self.screen.status
ret = str(self.screen.status)
elif self.path.startswith("/spastatus.cgi"):
ret = self.spa.status
ret = str(self.spa.status)
self.send_response(200)
self.send_header('Content-Type', mimetype)
self.end_headers()
Expand Down Expand Up @@ -354,31 +340,29 @@ def startServer(screen, spa):
class Spa(object):
"""Emulate spa-side controller with LCD display."""
lock = None
nextAck = "00"
nextAck = 0x00
status = {}
ID = "20"
ACK = "00"
ID = 0x20
ACK = 0x00

def __init__(self):
self.screen = "---"
self.status = {'spa': "UNK", 'jets': "UNK", 'heat': "UNK"}
self.nextAck = "00"
self.nextAck = 0x00
self.lock = threading.Lock()

def sendAck(self, i):
"""Tell controller we got messag, including keypresses in response."""
ackstr = self.ACK + self.nextAck
# print "SPACK: "+ackstr
i.sendMsg(0x00, 0x01, [int(self.ACK, 16), int(self.nextAck, 16)]) #(chr(0), chr(1), ackstr.decode("hex")))
self.nextAck = "00"
i.sendMsg(0x00, 0x01, [self.ACK, self.nextAck])
self.nextAck = 0x00

def setNextAck(self, nextAck):
"""Set value to send on next controller ping."""
self.nextAck = nextAck

def sendKey(self, key):
"""Send a key on the next ack"""
keyToAck = {'1': "09", '2': "06", '3': "03", '4': "08", '5': "02", '6': "07", '7': "04", '8': "01", '*': "05"}
keyToAck = {'1': 0x09, '2': 0x06, '3': 0x03, '4': 0x08, '5': 0x02, '6': 0x07, '7': 0x04, '8': 0x01, '*': 0x05}
if key in list(keyToAck.keys()):
self.setNextAck(keyToAck[key])

Expand All @@ -387,16 +371,16 @@ def update(self, args):
# print "SPAUPDATE"
self.lock.acquire()
try:
text = args[1:4]
if args[1:7] == " . . .":
text = chr(args[1]) + chr(args[2]) + chr(args[3])
if args[1:7] == [32, 46, 32, 46, 32, 46]: # " . . ."
self.screen = "... ..."
else:
self.screen = text
if ord(args[5:6]) == 1:
if args[5] == 1:
self.screen += " SET"
elif ord(args[9:10]) == 33:
elif args[9] == 33:
self.screen += " AIR"
elif ord(args[7:8]) == 33:
elif args[7] == 33:
self.screen += " H2O"
else:
print(args.encode("UTF-8").hex())
Expand All @@ -409,15 +393,15 @@ def update(self, args):
def setStatus(self, stat):
"""Process the status into a string for HTML return"""
try:
if ord(stat[0:1]) & 16:
if stat[0] & 16:
self.status['spa'] = 'ON'
else:
self.status['spa'] = 'OFF'
if ord(stat[0:1]) & 1:
if stat[0] & 1:
self.status['jets'] = 'ON'
else:
self.status['jets'] = 'OFF'
if ord(stat[0:1]) & 8:
if stat[0] & 8:
self.status['heat'] = 'ON'
else:
self.status['heat'] = 'OFF'
Expand All @@ -442,23 +426,23 @@ def text(self):

def processMessage(self, ret, i):
"""Handle controller messages to us"""
if ret['cmd'] == "03": # Text status
if ret['cmd'] == 0x03: # Text status
# print "SPA-TEXT"
self.sendAck(i)
self.update(ret['args'])
elif ret['cmd'] == "09": # Change send ??
elif ret['cmd'] == 0x09: # Change send ??
# print "SPA-CHANGE"
self.sendAck(i)
try:
equip = ord(ret['args'][0:1])
state = ord(ret['args'][1:2])
equip = ret['args'][0]
state = ret['args'][1]
except:
pass
elif ret['cmd'] == "02": # Status binary
elif ret['cmd'] == 0x02: # Status binary
# print "SPA-BSTATUS"
self.sendAck(i)
self.setStatus(ret['args'])
elif ret['cmd'] == "00": # Probe
elif ret['cmd'] == 0x00: # Probe
# print "SPA-PROBE"
self.sendAck(i)
else:
Expand All @@ -473,9 +457,9 @@ class Screen(object):
UNDERLINE = '\033[4m'
END = '\033[0m'
lock = None
nextAck = "00"
ID = "40"
ACK = "8b"
nextAck = 0x00
ID = 0x40
ACK = 0x8b

def __init__(self):
"""Set up the instance"""
Expand Down Expand Up @@ -593,71 +577,70 @@ def html(self):

def sendAck(self, i):
"""Controller talked to us, send back our last keypress."""
ackstr = self.ACK + self.nextAck
i.sendMsg( 0x00, 0x01, [int(self.ACK, 16), int(self.nextAck, 16)] ) #(chr(0), chr(1), ackstr.decode("hex")) )
self.nextAck = "00"
i.sendMsg( 0x00, 0x01, [self.ACK, self.nextAck] )
self.nextAck = 0x00

def setNextAck(self, nextAck):
"""Set the value we will send on the next ack, but don't send yet."""
self.nextAck = nextAck

def sendKey(self, key):
"""Send a key (text) on the next ack."""
keyToAck = { 'up':"06", 'down':"05", 'back':"02", 'select':"04", 'pgup':"01", 'pgdn':"03" }
keyToAck = { 'up': 0x06, 'down': 0x05, 'back': 0x02, 'select': 0x04, 'pgup': 0x01, 'pgdn': 0x03 }
if key in list(keyToAck.keys()):
self.setNextAck(keyToAck[key])

def processMessage(self, ret, i):
"""Process message from a controller, updating internal state."""
if ret['cmd'] == "09": # Clear Screen
if ret['cmd'] == 0x09: # Clear Screen
# What do the args mean? Ignore for now
if (ord(ret['args'][0:1])==0):
if (ret['args'][0]==0):
self.cls()
else: # May be a partial clear?
self.cls()
# print "cls: "+ret['args'].encode("UTF-8").hex()
self.sendAck(i)
elif ret['cmd'] == "0f": # Scroll Screen
start = ord(ret['args'][:1])
end = ord(ret['args'][1:2])
direction = ord(ret['args'][2:3])
elif ret['cmd'] == 0x0f: # Scroll Screen
start = ret['args'][0]
end = ret['args'][1]
direction = ret['args'][2]
self.scroll(start, end, direction)
self.sendAck(i)
elif ret['cmd'] == "04": # Write a line
line = ord(ret['args'][:1])
elif ret['cmd'] == 0x04: # Write a line
line = ret['args'][0]
offset = 1
text = ""
while (ret['args'][offset:offset+1].encode("UTF-8").hex() != "00") and (offset < len(ret['args'])):
text += ret['args'][offset:offset+1]
while ((offset < len(ret['args'])) and (ret['args'][offset] != 0)):
text += chr(ret['args'][offset])
offset = offset + 1
# The PDA has a special (double-wide?) mode identified by the MSBs. Just move them to the top for now
if line == 64: line = 1 # Time (hex=40)
if line == 130: line = 2 # Temp (hex=82)
self.writeLine(line, text)
self.sendAck(i)
elif ret['cmd'] == "05": # Initial handshake?
elif ret['cmd'] == 0x05: # Initial handshake?
# ??? After initial turn on get this, rela box responds custom ack
# i.sendMsg( (chr(0), chr(1), "0b00".decode("hex")) )
self.sendAck(i)
elif ret['cmd'] == "00": # PROBE
elif ret['cmd'] == 0x00: # PROBE
self.sendAck(i)
elif ret['cmd'] == "02": # Status?
self.setStatus(ret['args'].encode("UTF-8").hex())
elif ret['cmd'] == 0x02: # Status?
self.setStatus(toHex(ret['args']))
self.sendAck(i)
elif ret['cmd'] == "08": # Invert an entire line
self.invertLine( ord(ret['args'][:1]) )
elif ret['cmd'] == 0x08: # Invert an entire line
self.invertLine( ret['args'][0] )
self.sendAck(i)
elif ret['cmd'] == "10": # Invert just some chars on a line
self.invertChars( ord(ret['args'][:1]), ord(ret['args'][1:2]), ord(ret['args'][2:3]) )
elif ret['cmd'] == 0x10: # Invert just some chars on a line
self.invertChars( ret['args'][0], ret['args'][1], ret['args'][2] )
self.sendAck(i)
else:
print("unk: cmd=" + ret['cmd'] + " args=" + ret['args'].encode("UTF-8").hex())
print("unk: cmd=" + toHex(ret['cmd']) + " args=" + toHex(ret['args']))
self.sendAck(i)

class PDA(Screen):
"""Emulates the new PDA-style remote control unit."""
ID = "60"
ACK = "40"
ID = 0x60
ACK = 0x40

def __init__(self):
"""Set up the instance"""
Expand Down Expand Up @@ -724,7 +707,7 @@ def readMsg(self):
if (self.port == None):
self._open() # Try and re-open port
if (self.port == None): # We failed, return garbage
return {'dest':"ff", 'cmd':"ff", 'args':""}
return {'dest': 0xff, 'cmd': 0xff, 'args': []}

while True:
dleFound = False
Expand All @@ -746,7 +729,7 @@ def readMsg(self):
# read until DLE ETX
try:
if (self.port == None):
return {'dest':"ff", 'cmd':"ff", 'args':""}
return {'dest': 0xff, 'cmd': 0xff, 'args': []}
self.msg += self.port.read(1)
except serial.SerialException:
self.msg += [0x00]
Expand Down Expand Up @@ -781,18 +764,10 @@ def readMsg(self):
toHex(checksum)+" "+toHex(dleetx)
self.msg = []
# stop reading if a message with a valid checksum is read
m = []
m += dlestx
m += dest
m += cmd
m += args
if self.checksum(dlestx + dest + cmd + args) == checksum[0]:
if debugData:
log(self.name, "-->", debugMsg)
argstr = ""
for a in args:
argstr += chr(a)
return {'dest':toHex(dest), 'cmd':toHex(cmd), 'args':argstr}
return {'dest': dest[0], 'cmd': cmd[0], 'args': args}
else:
if debugData:
log(self.name, "-->", debugMsg, "*** bad checksum ***")
Expand Down

0 comments on commit 0639230

Please sign in to comment.