move usb reset to statemachine where the usb stuff actually is

This commit is contained in:
petrucci4prez 2017-05-31 00:24:50 -04:00
parent f64e01f896
commit 4c15239996
2 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,6 @@ import RPi.GPIO as GPIO
from sharedLogging import unmountGluster # this should be first program module from sharedLogging import unmountGluster # this should be first program module
from stateMachine import StateMachine from stateMachine import StateMachine
from auxilary import resetUSBDevice
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -33,7 +32,6 @@ if __name__ == '__main__':
GPIO.setwarnings(False) GPIO.setwarnings(False)
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
resetUSBDevice('1-1')
stateMachine = StateMachine() stateMachine = StateMachine()

View File

@ -5,7 +5,7 @@ from threading import Lock
from functools import partial from functools import partial
from collections import namedtuple from collections import namedtuple
from auxilary import CountdownTimer, ConfigFile from auxilary import CountdownTimer, ConfigFile, resetUSBDevice
from sensors import setupDoorSensor, setupMotionSensor from sensors import setupDoorSensor, setupMotionSensor
from notifier import intruderAlert from notifier import intruderAlert
from listeners import KeypadListener, PipeListener from listeners import KeypadListener, PipeListener
@ -16,6 +16,8 @@ from stream import initCamera
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
resetUSBDevice('1-1')
class SIGNALS: class SIGNALS:
ARM = 1 ARM = 1
INSTANT_ARM = 2 INSTANT_ARM = 2