From 35bce9325999557bde6365e4a84bc0b01a212e9b Mon Sep 17 00:00:00 2001
From: petrucci4prez <natedwarshuis@gmail.com>
Date: Thu, 8 Jun 2017 02:33:05 -0400
Subject: [PATCH] put signal partials in statemach attributes

---
 stateMachine.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/stateMachine.py b/stateMachine.py
index 39665d5..b850698 100644
--- a/stateMachine.py
+++ b/stateMachine.py
@@ -75,10 +75,14 @@ class StateMachine:
 		self.camera = Camera()
 		self.fileDump = FileDump()
 		
+		# add signals to self to avoid calling partial every time
+		for s in SIGNALS:
+			setattr(self, s.name, partial(self.selectState, s))
+		
 		secretTable = {
-			"dynamoHum": 	partial(self.selectState, SIGNALS.DISARM),
-			"zombyWoof": 	partial(self.selectState, SIGNALS.ARM),
-			"imTheSlime": 	partial(self.selectState, SIGNALS.INSTANT_ARM)
+			'dynamoHum': self.DISARM,
+			'zombyWoof': self.ARM,
+			'imTheSlime': self.INSTANT_ARM
 		}
 		
 		def secretCallback(secret, logger):
@@ -88,21 +92,18 @@ class StateMachine:
 			elif logger:
 				logger.debug('Secret pipe listener received invalid secret')
 	
-		self.secretListener = PipeListener(
-			callback = secretCallback,
-			name = 'secret'
-		)
+		self.secretListener = PipeListener(callback=secretCallback, name= 'secret')
 
 		self.keypadListener = KeypadListener(
 			stateMachine = self,
-			callbackDisarm = partial(self.selectState, SIGNALS.DISARM),
-			callbackArm = partial(self.selectState, SIGNALS.ARM),
+			callbackDisarm = self.DISARM,
+			callbackArm = self.ARM,
 			soundLib = self.soundLib,
 			passwd = '5918462'
 		)
 		
 		def startTimer(t, sound):
-			self._timer = CountdownTimer(t, partial(self.selectState, SIGNALS.TIMOUT), sound)
+			self._timer = CountdownTimer(t, self.TIMOUT, sound)
 			
 		def stopTimer():
 			if self._timer.is_alive():