Reindent *.py with reindent.py

This commit is contained in:
Douglas Clowes
2014-07-04 11:28:11 +10:00
parent 7129c0608b
commit 522a5544a8
12 changed files with 635 additions and 638 deletions

View File

@@ -82,236 +82,236 @@ _POSDIR = _CW
# Some descriptive names for default register values per chopper.
# The values are indexed by UID.
RVAL = {
'mode': {1: _RPM, 2: _PHASE, 3: _PHASE},
'dir' : {1: _POSDIR, 2: _POSDIR, 3: _POSDIR}
'mode': {1: _RPM, 2: _PHASE, 3: _PHASE},
'dir' : {1: _POSDIR, 2: _POSDIR, 3: _POSDIR}
}
class Fermi_Prot(LineReceiver):
def __init__(self):
self.flags = INFO
self.mbhlen = 7
self.fcbyte = 7
self.datstart=8
self.MBAP = namedtuple('MBAP','TID PID len UID')
self.MBFN={1:self.rcoils,3:self.rhregs,5:self.wcoil,16:self.wmregs}
self.setRawMode()
self.RegVal = {}
self.FermiCoil = {}
for uid in [1,2,3]:
self.FermiCoil[uid] = [0,0,0,0]
mode = RVAL['mode'][uid]
dir = RVAL['dir'][uid]
sys_stat = _AVC_ON|_OK
self.RegInfo = {
10: ['U16', 'System Status Information (R)'],
12: ['U16', 'Interlock Status Information (R)'],
14: ['U16', 'Rotational Speed (R)'],
16: ['F32', 'Encoder Angle (MB350PC/R ONLY) (R)'],
18: ['U32', 'Phase Veto Count (R)'],
20: ['U32', 'Read and Clear Phase Veto Count (R)'],
22: ['U32', 'Read and Clear Phase Veto Count (R)' ],
24: ['F32', 'Read PHASE ACCURACY (R)'],
26: ['F32', 'Read PHASE REPEATABILITY (R)'],
28: ['F32', 'Read PHASE OK (R)'],
30: ['U32', 'Set VETO WINDOW 100ns (RW)'],
32: ['U32', 'Set VETO WINDOW 50ns (RW)'],
34: ['U32', 'Set MOTOR CONTROL MODE (RW)'],
1000: ['U32', 'Set ROTATIONAL SPEED SETPOINT (RW)'],
1002: ['F32', 'Set HOMING ANGLE SETPOINT (MB350PC/R ONLY) (RW)'],
1004: ['F32', 'Set MOTOR KP (RW)'],
1006: ['F32', 'Set MOTOR KI (RW)'],
1008: ['F32', 'Set MOTOR KPhase (RW)'],
1010: ['F32', 'Set REFERENCE DELAY (RW)'],
1012: ['F32', 'Set REFERENCE PERIOD (RW)'],
1014: ['U32', 'Set SYNC SOURCE (RW)'],
1016: ['U32', 'Set MOTOR DIRECTION (RW)']
}
self.RegVal[uid] = {
10: sys_stat,
12: 0x0,
14: 0,
16: 0,
18: 0,
20: 0,
22: 0,
24: 0,
26: 0,
28: 0,
30: 0,
32: 0,
34: mode,
1000: 0,
1002: 0,
1004: 0,
1006: 0,
1008: 0,
1010: 0,
1012: 400000,
1014: 0,
1016: dir
}
self.flags = INFO
self.mbhlen = 7
self.fcbyte = 7
self.datstart=8
self.MBAP = namedtuple('MBAP','TID PID len UID')
self.MBFN={1:self.rcoils,3:self.rhregs,5:self.wcoil,16:self.wmregs}
self.setRawMode()
self.RegVal = {}
self.FermiCoil = {}
for uid in [1,2,3]:
self.FermiCoil[uid] = [0,0,0,0]
mode = RVAL['mode'][uid]
dir = RVAL['dir'][uid]
sys_stat = _AVC_ON|_OK
self.RegInfo = {
10: ['U16', 'System Status Information (R)'],
12: ['U16', 'Interlock Status Information (R)'],
14: ['U16', 'Rotational Speed (R)'],
16: ['F32', 'Encoder Angle (MB350PC/R ONLY) (R)'],
18: ['U32', 'Phase Veto Count (R)'],
20: ['U32', 'Read and Clear Phase Veto Count (R)'],
22: ['U32', 'Read and Clear Phase Veto Count (R)' ],
24: ['F32', 'Read PHASE ACCURACY (R)'],
26: ['F32', 'Read PHASE REPEATABILITY (R)'],
28: ['F32', 'Read PHASE OK (R)'],
30: ['U32', 'Set VETO WINDOW 100ns (RW)'],
32: ['U32', 'Set VETO WINDOW 50ns (RW)'],
34: ['U32', 'Set MOTOR CONTROL MODE (RW)'],
1000: ['U32', 'Set ROTATIONAL SPEED SETPOINT (RW)'],
1002: ['F32', 'Set HOMING ANGLE SETPOINT (MB350PC/R ONLY) (RW)'],
1004: ['F32', 'Set MOTOR KP (RW)'],
1006: ['F32', 'Set MOTOR KI (RW)'],
1008: ['F32', 'Set MOTOR KPhase (RW)'],
1010: ['F32', 'Set REFERENCE DELAY (RW)'],
1012: ['F32', 'Set REFERENCE PERIOD (RW)'],
1014: ['U32', 'Set SYNC SOURCE (RW)'],
1016: ['U32', 'Set MOTOR DIRECTION (RW)']
}
self.RegVal[uid] = {
10: sys_stat,
12: 0x0,
14: 0,
16: 0,
18: 0,
20: 0,
22: 0,
24: 0,
26: 0,
28: 0,
30: 0,
32: 0,
34: mode,
1000: 0,
1002: 0,
1004: 0,
1006: 0,
1008: 0,
1010: 0,
1012: 400000,
1014: 0,
1016: dir
}
def debug(self, flags, *args):
if (self.flags & flags):
print args
if (self.flags & flags):
print args
def getFR(self, SA,QR):
uid = self.mbap.UID
type = self.RegInfo[SA][0]
if (type == 'U32' or type == 'F32'):
NE = QR/2
else:
NE = QR
EA = 2*NE + SA
self.debug(RREG, 'NE = %d EA = %d ' % (NE,EA))
data = []
for a in range(SA, EA, 2):
self.debug(RREG, 'reg %d = %s' % (a, self.RegInfo[a][1]))
data += [self.RegVal[uid][a]]
return data
uid = self.mbap.UID
type = self.RegInfo[SA][0]
if (type == 'U32' or type == 'F32'):
NE = QR/2
else:
NE = QR
EA = 2*NE + SA
self.debug(RREG, 'NE = %d EA = %d ' % (NE,EA))
data = []
for a in range(SA, EA, 2):
self.debug(RREG, 'reg %d = %s' % (a, self.RegInfo[a][1]))
data += [self.RegVal[uid][a]]
return data
def setFR(self, SA, QR, data):
uid = self.mbap.UID
type = self.RegInfo[SA][0]
if (type == 'U32' or type == 'F32'):
NE = QR/2
fs = '>%dI'
else:
NE = QR
fs = '>%dH'
EA = 2*NE + SA
self.debug(WREG, 'NE = %d EA = %d ' % (NE,EA))
t = unpack(fs % NE,data)
self.debug(WREG, 'setFR(): t = ', map(hex, t))
i = 0
for a in range(SA, EA, 2):
n = t[i]
self.debug(WREG, 'setFR() a = ', a, ' i = ', i, 'setFR() n = ', n)
self.debug(INFO, 'set reg %d = %s' % (a, self.RegInfo[a][1]), ' to ', hex(n))
self.RegVal[uid][a] = n
i += 1
return
uid = self.mbap.UID
type = self.RegInfo[SA][0]
if (type == 'U32' or type == 'F32'):
NE = QR/2
fs = '>%dI'
else:
NE = QR
fs = '>%dH'
EA = 2*NE + SA
self.debug(WREG, 'NE = %d EA = %d ' % (NE,EA))
t = unpack(fs % NE,data)
self.debug(WREG, 'setFR(): t = ', map(hex, t))
i = 0
for a in range(SA, EA, 2):
n = t[i]
self.debug(WREG, 'setFR() a = ', a, ' i = ', i, 'setFR() n = ', n)
self.debug(INFO, 'set reg %d = %s' % (a, self.RegInfo[a][1]), ' to ', hex(n))
self.RegVal[uid][a] = n
i += 1
return
def rawDataReceived(self, ADU):
self.debug(COMS, "Received ADU ", ADU.encode('hex'))
self.ADU = ADU
dl = len(ADU)
self.mbap = self.MBAP._make(unpack('>3HB',ADU[:self.mbhlen]))
self.fcode = unpack('>B', ADU[self.fcbyte])[0]
self.debug(COMS, self.mbap, 'fcode = ', self.fcode)
self.MBFN[self.fcode]()
self.debug(COMS, "Received ADU ", ADU.encode('hex'))
self.ADU = ADU
dl = len(ADU)
self.mbap = self.MBAP._make(unpack('>3HB',ADU[:self.mbhlen]))
self.fcode = unpack('>B', ADU[self.fcbyte])[0]
self.debug(COMS, self.mbap, 'fcode = ', self.fcode)
self.MBFN[self.fcode]()
def connectionMade(self):
self.debug(INFO, "Connection made")
self.debug(INFO, "Connection made")
def getPDU(self):
return self.ADU[self.datstart:]
return self.ADU[self.datstart:]
def rcoils(self):
# FC = Function Code
# SA = Start Address, QC = Quantity of Coils
# BC = Byte Count, CS = Coil Status (each bit = status of one coil)
# Request: FC<1B>, SA<2B>, QC<2B>
# Response: FC<1B>, BC<1B>, CS<n*B>
# n = number of eights in QC plus 1 if there is a remainder.
# ie n = QC // 8 + (1 if QC % 8 else 0)
uid = self.mbap.UID
PDU = self.getPDU()
(SA, QC) = unpack('>2H',PDU)
self.debug(RCOIL, 'rcoils:SA=%d, QC=%d' % (SA,QC))
hdr = self.mbap._replace(len = 4)
BC = 1 # ByteCount
#TODO Coil values should be an array of bytes with each bit representing a coil
if (self.FermiCoil[uid][SA] == 0xFF00):
data = 1
else:
data = 0
resp = pack('>3HB', *hdr) + pack('>2B%dB' % BC, self.fcode, BC, data)
self.debug(RCOIL, 'resp = ', resp.encode('hex'))
self.sendLine(resp)
# FC = Function Code
# SA = Start Address, QC = Quantity of Coils
# BC = Byte Count, CS = Coil Status (each bit = status of one coil)
# Request: FC<1B>, SA<2B>, QC<2B>
# Response: FC<1B>, BC<1B>, CS<n*B>
# n = number of eights in QC plus 1 if there is a remainder.
# ie n = QC // 8 + (1 if QC % 8 else 0)
uid = self.mbap.UID
PDU = self.getPDU()
(SA, QC) = unpack('>2H',PDU)
self.debug(RCOIL, 'rcoils:SA=%d, QC=%d' % (SA,QC))
hdr = self.mbap._replace(len = 4)
BC = 1 # ByteCount
#TODO Coil values should be an array of bytes with each bit representing a coil
if (self.FermiCoil[uid][SA] == 0xFF00):
data = 1
else:
data = 0
resp = pack('>3HB', *hdr) + pack('>2B%dB' % BC, self.fcode, BC, data)
self.debug(RCOIL, 'resp = ', resp.encode('hex'))
self.sendLine(resp)
def wcoil(self):
uid = self.mbap.UID
PDU = self.getPDU()
(OA, OV) = unpack('>2H', self.ADU[self.datstart:])
self.debug(WCOIL, 'wcoil:OA=%d, OV=%X' % (OA,OV))
# TODO This really just toggles IDLE speed so it's only correct for OA=2 (ie coil 3)
self.FermiCoil[uid][OA] ^= OV
if (OA == CSTART):
self.debug(INFO, "START")
self.RegVal[uid][10] |= (_RUN|_LEV)
self.debug(INFO, 'RUNNING, LEVITATING')
# Don't set speed if idling
if (self.FermiCoil[uid][2] == 0x0000):
# Set RotSpeed value
self.RegVal[uid][14] = self.RegVal[uid][1000]
if (self.RegVal[uid][34] == _PHASE):
self.debug(INFO, 'PHASELOCKED')
self.RegVal[uid][10] |= _PHLOCK
else:
self.debug(INFO, 'UP TO SPEED')
self.RegVal[uid][10] |= _UP_TO_SPEED
elif (OA == CSTOP):
self.debug(INFO, "STOP")
self.RegVal[uid][14] = 0
if (self.RegVal[uid][34] == _PHASE):
self.debug(INFO, 'NOT UP TO SPEED, NOT RUNNING, NOT LEVITATING, NOT PHASELOCKED')
self.RegVal[uid][10] &= ~(_UP_TO_SPEED|_RUN|_LEV|_PHLOCK)
else:
self.debug(INFO, 'NOT UP TO SPEED, NOT RUNNING, NOT LEVITATING')
self.RegVal[uid][10] &= ~(_UP_TO_SPEED|_RUN|_LEV)
elif (OA == CIDLE):
self.debug(INFO, "TOGGLE IDLE")
if (self.RegVal[uid][34] == _PHASE):
lockflag = _PHLOCK
flagname = '_PHLOCK'
else:
lockflag = _UP_TO_SPEED
flagname = '_UP_TO_SPEED'
if ( (self.RegVal[uid][10] & lockflag) > 0):
self.debug(INFO, "SET IDLE SPEED")
self.RegVal[uid][14] = 0
self.debug(INFO, "UNSET %s" % flagname)
self.RegVal[uid][10] &= ~(lockflag)
else:
self.debug(INFO, "SET RUN SPEED")
self.RegVal[uid][14] = self.RegVal[uid][1000]
self.debug(INFO, "SET %s" % flagname)
self.RegVal[uid][10] |= lockflag
elif (OA == CRESET):
self.debug(INFO, "RESET")
self.debug(WCOIL, 'resp = ', self.ADU.encode('hex'))
self.sendLine(self.ADU)
uid = self.mbap.UID
PDU = self.getPDU()
(OA, OV) = unpack('>2H', self.ADU[self.datstart:])
self.debug(WCOIL, 'wcoil:OA=%d, OV=%X' % (OA,OV))
# TODO This really just toggles IDLE speed so it's only correct for OA=2 (ie coil 3)
self.FermiCoil[uid][OA] ^= OV
if (OA == CSTART):
self.debug(INFO, "START")
self.RegVal[uid][10] |= (_RUN|_LEV)
self.debug(INFO, 'RUNNING, LEVITATING')
# Don't set speed if idling
if (self.FermiCoil[uid][2] == 0x0000):
# Set RotSpeed value
self.RegVal[uid][14] = self.RegVal[uid][1000]
if (self.RegVal[uid][34] == _PHASE):
self.debug(INFO, 'PHASELOCKED')
self.RegVal[uid][10] |= _PHLOCK
else:
self.debug(INFO, 'UP TO SPEED')
self.RegVal[uid][10] |= _UP_TO_SPEED
elif (OA == CSTOP):
self.debug(INFO, "STOP")
self.RegVal[uid][14] = 0
if (self.RegVal[uid][34] == _PHASE):
self.debug(INFO, 'NOT UP TO SPEED, NOT RUNNING, NOT LEVITATING, NOT PHASELOCKED')
self.RegVal[uid][10] &= ~(_UP_TO_SPEED|_RUN|_LEV|_PHLOCK)
else:
self.debug(INFO, 'NOT UP TO SPEED, NOT RUNNING, NOT LEVITATING')
self.RegVal[uid][10] &= ~(_UP_TO_SPEED|_RUN|_LEV)
elif (OA == CIDLE):
self.debug(INFO, "TOGGLE IDLE")
if (self.RegVal[uid][34] == _PHASE):
lockflag = _PHLOCK
flagname = '_PHLOCK'
else:
lockflag = _UP_TO_SPEED
flagname = '_UP_TO_SPEED'
if ( (self.RegVal[uid][10] & lockflag) > 0):
self.debug(INFO, "SET IDLE SPEED")
self.RegVal[uid][14] = 0
self.debug(INFO, "UNSET %s" % flagname)
self.RegVal[uid][10] &= ~(lockflag)
else:
self.debug(INFO, "SET RUN SPEED")
self.RegVal[uid][14] = self.RegVal[uid][1000]
self.debug(INFO, "SET %s" % flagname)
self.RegVal[uid][10] |= lockflag
elif (OA == CRESET):
self.debug(INFO, "RESET")
self.debug(WCOIL, 'resp = ', self.ADU.encode('hex'))
self.sendLine(self.ADU)
def rhregs(self):
uid = self.mbap.UID
PDU = self.getPDU()
(SA, QR) = unpack('>2H', self.ADU[self.datstart:])
self.debug(RHREGS, 'rhregs:SA=%d, QR=%d' % (SA,QR))
regval = self.getFR(SA,QR)
self.debug(RHREGS, 'rhregs:data = ', regval)
hdr = self.mbap._replace(len = 3 + 2*QR)
self.debug(RHREGS, 'hdr = ', hdr)
type = self.RegInfo[SA][0]
if (type == 'U32' or type == 'F32'):
NE = QR/2
resp = pack('>3HB', *hdr) + pack('>2B%dI' % NE, self.fcode, 2*QR, *regval)
else:
resp = pack('>3HB', *hdr) + pack('>2B%dH' % QR, self.fcode, 2*QR, *regval)
self.debug(RHREGS, 'resp = ', resp.encode('hex'))
self.sendLine(resp)
uid = self.mbap.UID
PDU = self.getPDU()
(SA, QR) = unpack('>2H', self.ADU[self.datstart:])
self.debug(RHREGS, 'rhregs:SA=%d, QR=%d' % (SA,QR))
regval = self.getFR(SA,QR)
self.debug(RHREGS, 'rhregs:data = ', regval)
hdr = self.mbap._replace(len = 3 + 2*QR)
self.debug(RHREGS, 'hdr = ', hdr)
type = self.RegInfo[SA][0]
if (type == 'U32' or type == 'F32'):
NE = QR/2
resp = pack('>3HB', *hdr) + pack('>2B%dI' % NE, self.fcode, 2*QR, *regval)
else:
resp = pack('>3HB', *hdr) + pack('>2B%dH' % QR, self.fcode, 2*QR, *regval)
self.debug(RHREGS, 'resp = ', resp.encode('hex'))
self.sendLine(resp)
def wmregs(self):
PDU = self.getPDU()
(SA, QR, BC) = unpack('>2HB',PDU[:5])
data = PDU[5:]
self.debug(WMREGS, 'wmregs:SA=%d, QR=%d, BC=%d' % (SA,QR,BC), 'data = ', map(hex, unpack('>%dH' % QR, data)) )
self.setFR(SA, QR, data)
hdr = self.mbap._replace(len = 7)
resp = pack('>3HB', *hdr) + pack('>B2H', self.fcode, SA, QR)
self.debug(WMREGS, 'resp = ', resp.encode('hex'))
self.sendLine(resp)
PDU = self.getPDU()
(SA, QR, BC) = unpack('>2HB',PDU[:5])
data = PDU[5:]
self.debug(WMREGS, 'wmregs:SA=%d, QR=%d, BC=%d' % (SA,QR,BC), 'data = ', map(hex, unpack('>%dH' % QR, data)) )
self.setFR(SA, QR, data)
hdr = self.mbap._replace(len = 7)
resp = pack('>3HB', *hdr) + pack('>B2H', self.fcode, SA, QR)
self.debug(WMREGS, 'resp = ', resp.encode('hex'))
self.sendLine(resp)