diff --git a/config/pyledriver.yaml.default b/config/pyledriver.yaml.default index da0e381..4cb2d35 100644 --- a/config/pyledriver.yaml.default +++ b/config/pyledriver.yaml.default @@ -14,3 +14,4 @@ secretTable: INSTANT_ARM: rudess LOCK: myung INSTANT_LOCK: portnoy +keyPasswd: 123456 diff --git a/listeners.py b/listeners.py index dcff962..6e7839f 100644 --- a/listeners.py +++ b/listeners.py @@ -43,10 +43,14 @@ class KeypadListener: wrongPassSound = soundLib.soundEffects['wrongPass'] backspaceSound = soundLib.soundEffects['backspace'] + if not isinstance(passwd, int): + logger.error('KeyPasswd must be int. Check configuration') + raise SystemExit + def checkPasswd(action): if self._buf == '': ctrlKeySound.play() - elif self._buf == passwd: + elif self._buf == str(passwd): self.resetBuffer() action() else: diff --git a/stateMachine.py b/stateMachine.py index 31f6d06..ad11d25 100644 --- a/stateMachine.py +++ b/stateMachine.py @@ -179,7 +179,7 @@ class StateMachine: self._addManaged(PipeListener(callback=secretCallback, name='secret')) - self._addManaged(KeypadListener(stateMachine=self, passwd='5918462')) + self._addManaged(KeypadListener(stateMachine=self, passwd=configFile['keyPasswd'])) def startTimer(t, sound): self._timer = _CountdownTimer(t, self.TIMOUT, sound)