# HG changeset patch # User darius # Date 1193101521 0 # Node ID 8ada8d5cca151463460463270c070c0ad755e9cc # Parent 3dad7161af87ababcf5eb8877ed7dd0ac4245abc Move OWReadError to MonitorDev since that's where it's raised. diff -r 3dad7161af87 -r 8ada8d5cca15 Control.py --- a/Control.py Tue Oct 23 01:03:58 2007 +0000 +++ b/Control.py Tue Oct 23 01:05:21 2007 +0000 @@ -3,7 +3,7 @@ ############################################################################ # Control class for beermon # -# $Id: Control.py,v 1.2 2007/09/29 14:51:20 darius Exp $ +# $Id: Control.py,v 1.3 2007/10/23 01:05:21 darius Exp $ # # Depends on: Python 2.3 (I think) # @@ -36,11 +36,6 @@ import threading, ConfigParser, time -class OWReadError(Exception): - """Raised when we failed to read from a 1-wire device, could be a timeout -or the device is non-existent, etc""" - pass - class ThreadDied(Exception): """Raised when the monitor thread has died for some reason""" pass diff -r 3dad7161af87 -r 8ada8d5cca15 MonitorDev.py --- a/MonitorDev.py Tue Oct 23 01:03:58 2007 +0000 +++ b/MonitorDev.py Tue Oct 23 01:05:21 2007 +0000 @@ -3,7 +3,7 @@ ############################################################################ # Monitoring/control interface to hardware for beermon # -# $Id: MonitorDev.py,v 1.2 2007/09/29 14:51:20 darius Exp $ +# $Id: MonitorDev.py,v 1.3 2007/10/23 01:05:22 darius Exp $ # # Depends on: Python 2.3 (I think) # @@ -36,6 +36,11 @@ import threading, re, time, pexpect +class OWReadError(Exception): + """Raised when we failed to read from a 1-wire device, could be a timeout +or the device is non-existent, etc""" + pass + class MonitorDev(threading.Thread): """This class continually polls the hardware for temperature readings and accepts state changes to heat & cool"""