ndwarshuis
/
pyledriver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make iterators make some sense

This commit is contained in:
petrucci4prez 2017-06-10 01:56:42 -04:00
parent e74ada030c
commit d6ec717856
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
stateMachine.py
View File

@ -74,8 +74,8 @@ class StateMachine:
self.fileDump = FileDump() self.fileDump = FileDump()
# add signals to self to avoid calling partial every time # add signals to self to avoid calling partial every time
for s in SIGNALS: for sig in SIGNALS:
setattr(self, s.name, partial(self.selectState, s)) setattr(self, sig.name, partial(self.selectState, sig))
secretTable = { secretTable = {
'dynamoHum': self.DISARM, 'dynamoHum': self.DISARM,
@ -141,29 +141,29 @@ class StateMachine:
) )
] ]
for s in stateObjs: for obj in stateObjs:
s.entryCallbacks.append(self.keypadListener.resetBuffer) obj.entryCallbacks.append(self.keypadListener.resetBuffer)
self.states = s = namedtuple('States', [s.name for s in stateObjs])(*stateObjs) self.states = st = namedtuple('States', [obj.name for obj in stateObjs])(*stateObjs)
s.disarmed.addTransition( SIGNALS.ARM, s.disarmedCountdown) st.disarmed.addTransition( SIGNALS.ARM, st.disarmedCountdown)
s.disarmed.addTransition( SIGNALS.INSTANT_ARM, s.armed) st.disarmed.addTransition( SIGNALS.INSTANT_ARM, st.armed)
s.disarmedCountdown.addTransition( SIGNALS.DISARM, s.disarmed) st.disarmedCountdown.addTransition( SIGNALS.DISARM, st.disarmed)
s.disarmedCountdown.addTransition( SIGNALS.TIMOUT, s.armed) st.disarmedCountdown.addTransition( SIGNALS.TIMOUT, st.armed)
s.disarmedCountdown.addTransition( SIGNALS.INSTANT_ARM, s.armed) st.disarmedCountdown.addTransition( SIGNALS.INSTANT_ARM, st.armed)
s.armed.addTransition( SIGNALS.DISARM, s.disarmed) st.armed.addTransition( SIGNALS.DISARM, st.disarmed)
s.armed.addTransition( SIGNALS.TRIGGER, s.armedCountdown) st.armed.addTransition( SIGNALS.TRIGGER, st.armedCountdown)
s.armedCountdown.addTransition( SIGNALS.DISARM, s.disarmed) st.armedCountdown.addTransition( SIGNALS.DISARM, st.disarmed)
s.armedCountdown.addTransition( SIGNALS.TIMOUT, s.triggered) st.armedCountdown.addTransition( SIGNALS.TIMOUT, st.triggered)
s.armedCountdown.addTransition( SIGNALS.ARM, s.armed) st.armedCountdown.addTransition( SIGNALS.ARM, st.armed)
s.armedCountdown.addTransition( SIGNALS.INSTANT_ARM, s.armed) st.armedCountdown.addTransition( SIGNALS.INSTANT_ARM, st.armed)
s.triggered.addTransition( SIGNALS.DISARM, s.disarmed) st.triggered.addTransition( SIGNALS.DISARM, st.disarmed)
s.triggered.addTransition( SIGNALS.ARM, s.armed) st.triggered.addTransition( SIGNALS.ARM, st.armed)
s.triggered.addTransition( SIGNALS.INSTANT_ARM, s.armed) st.triggered.addTransition( SIGNALS.INSTANT_ARM, st.armed)
self.currentState = getattr(self.states, stateFile['state']) self.currentState = getattr(self.states, stateFile['state'])