From 363f14707f864c03a047427c43542031c7e4fc90 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Tue, 4 Jun 2013 21:14:29 -0700 Subject: [PATCH 01/30] Getting rid of these until they're needed. --- pyad2usb/util.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pyad2usb/util.py b/pyad2usb/util.py index 893bcae..e153b87 100644 --- a/pyad2usb/util.py +++ b/pyad2usb/util.py @@ -44,18 +44,6 @@ class Firmware(object): STAGE_UPLOADING = 4 STAGE_DONE = 5 - def __init__(self): - """ - Constructor - """ - pass - - def __del__(self): - """ - Destructor - """ - pass - @staticmethod def upload(dev, filename, progress_callback=None): """ From ec13e78af1a2c57b4b55fe6dda637d0a6df852be Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Tue, 4 Jun 2013 21:21:53 -0700 Subject: [PATCH 02/30] Removed temp tracebacks and made exceptions consistent in device open calls. --- pyad2usb/devices.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index 26e8cbc..3c06d80 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -9,7 +9,6 @@ import threading import serial import serial.tools.list_ports import socket -import traceback from pyftdi.pyftdi.ftdi import * from pyftdi.pyftdi.usbtools import * from . import util @@ -60,8 +59,6 @@ class Device(object): while self._running: try: self._device.read_line(timeout=10) - except util.CommError, err: - traceback.print_exc(err) # TEMP except util.TimeoutError, err: pass @@ -143,7 +140,7 @@ class USBDevice(Device): except (usb.core.USBError, FtdiError), err: self.on_close() - raise util.CommError('Error opening AD2USB device: {0}'.format(str(err))) + raise util.NoDeviceError('Error opening AD2USB device: {0}'.format(str(err))) else: self._running = True if not no_reader_thread: @@ -486,7 +483,7 @@ class SocketDevice(Device): except socket.error, err: self.on_close() - traceback.print_exc(err) # TEMP + raise util.NoDeviceError('Error opening AD2SOCKET device at {0}:{1}'.format(self._host, self._port)) else: self._running = True From f805f50732befbf33ad9d944919cd66371190a18 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Tue, 4 Jun 2013 22:17:26 -0700 Subject: [PATCH 03/30] Moved some stuff to the base class. Cleanup and consistency changes. --- pyad2usb/devices.py | 133 ++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 90 deletions(-) diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index 3c06d80..b9d2b10 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -26,16 +26,43 @@ class Device(object): on_write = event.Event('Called when data has been written to the device') def __init__(self): - pass + self._id = '' + self._buffer = '' + self._interface = None + self._device = None + self._running = False + self._read_thread = ReadThread(self) # NOTE: not sure this is going to work.. def __del__(self): pass + @property + def id(self): + return self._id + + @id.setter + def id(self, value): + self._id = value + + def is_reader_alive(self): + """ + Indicates whether or not the reader thread is alive. + """ + return self._read_thread.is_alive() + + def stop_reader(self): + """ + Stops the reader thread. + """ + self._read_thread.stop() + class ReadThread(threading.Thread): """ Reader thread which processes messages from the device. """ + READ_TIMEOUT = 10 + def __init__(self, device): """ Constructor @@ -58,7 +85,7 @@ class Device(object): while self._running: try: - self._device.read_line(timeout=10) + self._device.read_line(timeout=self.READ_TIMEOUT) except util.TimeoutError, err: pass @@ -79,7 +106,6 @@ class USBDevice(Device): """ Returns all FTDI devices matching our vendor and product IDs. """ - devices = [] try: @@ -93,20 +119,14 @@ class USBDevice(Device): """ Constructor """ - Device.__init__(self) + self._device = Ftdi() + self._interface = interface self._vendor_id = vid self._product_id = pid self._serial_number = serial self._description = description - self._buffer = '' - self._device = Ftdi() - self._running = False - self._interface = interface - self._id = '' - - self._read_thread = Device.ReadThread(self) def open(self, baudrate=BAUDRATE, interface=None, index=0, no_reader_thread=False): """ @@ -165,22 +185,6 @@ class USBDevice(Device): self.on_close() - @property - def id(self): - return self._id - - def is_reader_alive(self): - """ - Indicates whether or not the reader thread is alive. - """ - return self._read_thread.is_alive() - - def stop_reader(self): - """ - Stops the reader thread. - """ - self._read_thread.stop() - def write(self, data): """ Writes data to the device. @@ -237,6 +241,8 @@ class USBDevice(Device): time.sleep(0.001) except (usb.core.USBError, FtdiError), err: + timer.cancel() + raise util.CommError('Error reading from AD2USB device: {0}'.format(str(err))) else: if got_line: @@ -285,18 +291,9 @@ class SerialDevice(Device): """ Device.__init__(self) - self._device = serial.Serial(timeout=0, writeTimeout=0) # Timeout = non-blocking to match pyftdi. - self._read_thread = Device.ReadThread(self) - self._buffer = '' - self._running = False self._interface = interface self._id = interface - - def __del__(self): - """ - Destructor - """ - pass + self._device = serial.Serial(timeout=0, writeTimeout=0) # Timeout = non-blocking to match pyftdi. def open(self, baudrate=BAUDRATE, interface=None, index=None, no_reader_thread=False): """ @@ -323,7 +320,6 @@ class SerialDevice(Device): # # Moving it to this point seems to resolve # all issues with it. - self._id = '{0}'.format(self._interface) except (serial.SerialException, ValueError), err: self.on_close() @@ -331,7 +327,7 @@ class SerialDevice(Device): raise util.NoDeviceError('Error opening AD2SERIAL device on port {0}.'.format(interface)) else: self._running = True - self.on_open((None, "AD2SERIAL")) # TODO: Fixme. + self.on_open(('N/A', "AD2SERIAL")) if not no_reader_thread: self._read_thread.start() @@ -350,22 +346,6 @@ class SerialDevice(Device): self.on_close() - @property - def id(self): - return self._id - - def is_reader_alive(self): - """ - Indicates whether or not the reader thread is alive. - """ - return self._read_thread.is_alive() - - def stop_reader(self): - """ - Stops the reader thread. - """ - self._read_thread.stop() - def write(self, data): """ Writes data to the device. @@ -389,7 +369,6 @@ class SerialDevice(Device): """ Reads a line from the device. """ - def timeout_event(): timeout_event.reading = False @@ -449,35 +428,25 @@ class SocketDevice(Device): Serial to IP interface. """ - def __init__(self, interface=None): + def __init__(self, interface=("localhost", 10000)): """ Constructor """ - self._host = "localhost" - self._port = 10000 - self._device = None - self._buffer = '' - self._running = False - self._id = '' - - self._read_thread = Device.ReadThread(self) - - def __del__(self): - """ - Destructor - """ - pass + self._interface = interface + self._host, self._port = interface def open(self, baudrate=None, interface=None, index=0, no_reader_thread=False): """ Opens the device. """ if interface is not None: + self._interface = interface self._host, self._port = interface try: self._device = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._device.connect((self._host, self._port)) + self._id = '{0}:{1}'.format(self._host, self._port) except socket.error, err: @@ -487,7 +456,7 @@ class SocketDevice(Device): else: self._running = True - self.on_open((None, "AD2SOCKET")) # TEMP: Change me. + self.on_open(('N/A', "AD2SOCKET")) if not no_reader_thread: self._read_thread.start() @@ -507,22 +476,6 @@ class SocketDevice(Device): self.on_close() - @property - def id(self): - return self._id - - def is_reader_alive(self): - """ - Indicates whether or not the reader thread is alive. - """ - return self._read_thread.is_alive() - - def stop_reader(self): - """ - Stops the reader thread. - """ - self._read_thread.stop() - def write(self, data): """ Writes data to the device. @@ -545,8 +498,6 @@ class SocketDevice(Device): except socket.error, err: raise util.CommError('Error while reading from device: {0}'.format(str(err))) - # ??? - Should we trigger an on_read here as well? - return data def read_line(self, timeout=0.0): @@ -588,6 +539,8 @@ class SocketDevice(Device): time.sleep(0.001) except socket.error, err: + timer.cancel() + raise util.CommError('Error reading from Socket device: {0}'.format(str(err))) else: if got_line: From 4d5eeb5d4fdc2c44fcacb9cf671a826c5e453395 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Tue, 4 Jun 2013 22:42:25 -0700 Subject: [PATCH 04/30] Simplified ridiculous message classes. Cleanup. --- pyad2usb/ad2usb.py | 477 +++++---------------------------------------- 1 file changed, 53 insertions(+), 424 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 64d3787..2ef526c 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -70,12 +70,6 @@ class Overseer(object): self.start() - def __del__(self): - """ - Destructor - """ - pass - def close(self): """ Clean up and shut down. @@ -143,6 +137,7 @@ class Overseer(object): for d in removed_devices: self._overseer.on_detached(d) + except util.CommError, err: pass @@ -155,9 +150,6 @@ class AD2USB(object): """ # High-level Events - on_open = event.Event('Called when the device has been opened.') - on_close = event.Event('Called when the device has been closed.') - on_status_changed = event.Event('Called when the panel status changes.') on_power_changed = event.Event('Called when panel power switches between AC and DC.') on_alarm = event.Event('Called when the alarm is triggered.') @@ -167,6 +159,8 @@ class AD2USB(object): on_message = event.Event('Called when a message has been received from the device.') # Low-level Events + on_open = event.Event('Called when the device has been opened.') + on_close = event.Event('Called when the device has been closed.') on_read = event.Event('Called when a line has been read from the device.') on_write = event.Event('Called when data has been written to the device.') @@ -174,20 +168,13 @@ class AD2USB(object): """ Constructor """ + self._device = device self._power_status = None self._alarm_status = None self._bypass_status = None - self._device = device - self._address_mask = 0xFF80 # TEMP - def __del__(self): - """ - Destructor - """ - pass - def open(self, baudrate=None, interface=None, index=None, no_reader_thread=False): """ Opens the device. @@ -219,6 +206,9 @@ class AD2USB(object): """ Parses messages from the panel. """ + if data is None: + return None + msg = None if data[0] != '!': @@ -293,24 +283,24 @@ class Message(object): """ Constructor """ - self._ready = False - self._armed_away = False - self._armed_home = False - self._backlight_on = False - self._programming_mode = False - self._beeps = -1 - self._zone_bypassed = False - self._ac_power = False - self._chime_on = False - self._alarm_event_occurred = False - self._alarm_sounding = False - self._numeric_code = "" - self._text = "" - self._cursor_location = -1 - self._data = "" - self._mask = "" - self._bitfield = "" - self._panel_data = "" + self.ready = False + self.armed_away = False + self.armed_home = False + self.backlight_on = False + self.programming_mode = False + self.beeps = -1 + self.zone_bypassed = False + self.ac_power = False + self.chime_on = False + self.alarm_event_occurred = False + self.alarm_sounding = False + self.numeric_code = "" + self.text = "" + self.cursor_location = -1 + self.data = "" + self.mask = "" + self.bitfield = "" + self.panel_data = "" self._regex = re.compile('("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*)') @@ -326,25 +316,25 @@ class Message(object): if m is None: raise util.InvalidMessageError('Received invalid message: {0}'.format(data)) - self._bitfield, self._numeric_code, self._panel_data, alpha = m.group(1, 2, 3, 4) - self._mask = int(self._panel_data[3:3+8], 16) - - self._data = data - self._ready = not self._bitfield[1:2] == "0" - self._armed_away = not self._bitfield[2:3] == "0" - self._armed_home = not self._bitfield[3:4] == "0" - self._backlight_on = not self._bitfield[4:5] == "0" - self._programming_mode = not self._bitfield[5:6] == "0" - self._beeps = int(self._bitfield[6:7], 16) - self._zone_bypassed = not self._bitfield[7:8] == "0" - self._ac_power = not self._bitfield[8:9] == "0" - self._chime_on = not self._bitfield[9:10] == "0" - self._alarm_event_occurred = not self._bitfield[10:11] == "0" - self._alarm_sounding = not self._bitfield[11:12] == "0" - self._text = alpha.strip('"') - - if int(self._panel_data[19:21], 16) & 0x01 > 0: - self._cursor_location = int(self._bitfield[21:23], 16) # Alpha character index that the cursor is on. + self.bitfield, self.numeric_code, self.panel_data, alpha = m.group(1, 2, 3, 4) + self.mask = int(self.panel_data[3:3+8], 16) + + self.data = data + self.ready = not self.bitfield[1:2] == "0" + self.armed_away = not self.bitfield[2:3] == "0" + self.armed_home = not self.bitfield[3:4] == "0" + self.backlight_on = not self.bitfield[4:5] == "0" + self.programming_mode = not self.bitfield[5:6] == "0" + self.beeps = int(self.bitfield[6:7], 16) + self.zone_bypassed = not self.bitfield[7:8] == "0" + self.ac_power = not self.bitfield[8:9] == "0" + self.chime_on = not self.bitfield[9:10] == "0" + self.alarm_event_occurred = not self.bitfield[10:11] == "0" + self.alarm_sounding = not self.bitfield[11:12] == "0" + self.text = alpha.strip('"') + + if int(self.panel_data[19:21], 16) & 0x01 > 0: + self.cursor_location = int(self.bitfield[21:23], 16) # Alpha character index that the cursor is on. def __str__(self): """ @@ -352,258 +342,6 @@ class Message(object): """ return 'msg > {0:0<9} [{1}{2}{3}] -- ({4}) {5}'.format(hex(self.mask), 1 if self.ready else 0, 1 if self.armed_away else 0, 1 if self.armed_home else 0, self.numeric_code, self.text) - @property - def ready(self): - """ - Indicates whether or not the panel is ready. - """ - return self._ready - - @ready.setter - def ready(self, value): - """ - Sets the value indicating whether or not the panel is ready. - """ - self._ready = value - - @property - def armed_away(self): - """ - Indicates whether or not the panel is armed in away mode. - """ - return self._armed_away - - @armed_away.setter - def armed_away(self, value): - """ - Sets the value indicating whether or not the panel is armed in away mode. - """ - self._armed_away = value - - @property - def armed_home(self): - """ - Indicates whether or not the panel is armed in home/stay mode. - """ - return self._armed_home - - @armed_home.setter - def armed_home(self, value): - """ - Sets the value indicating whether or not the panel is armed in home/stay mode. - """ - self._armed_home = value - - @property - def backlight_on(self): - """ - Indicates whether or not the panel backlight is on. - """ - return self._backlight_on - - @backlight_on.setter - def backlight_on(self, value): - """ - Sets the value indicating whether or not the panel backlight is on. - """ - self._backlight_on = value - - @property - def programming_mode(self): - """ - Indicates whether or not the panel is in programming mode. - """ - return self._programming_mode - - @programming_mode.setter - def programming_mode(self, value): - """ - Sets the value indicating whether or not the panel is in programming mode. - """ - self._programming_mode = value - - @property - def beeps(self): - """ - Returns the number of beeps associated with this message. - """ - return self._beeps - - @beeps.setter - def beeps(self, value): - """ - Sets the number of beeps associated with this message. - """ - self._beeps = value - - @property - def zone_bypassed(self): - """ - Indicates whether or not zones have been bypassed. - """ - return self._zone_bypassed - - @zone_bypassed.setter - def zone_bypassed(self, value): - """ - Sets the value indicating whether or not zones have been bypassed. - """ - self._zone_bypassed = value - - @property - def ac_power(self): - """ - Indicates whether or not the system is on AC power. - """ - return self._ac_power - - @ac_power.setter - def ac_power(self, value): - """ - Sets the value indicating whether or not the system is on AC power. - """ - self._ac_power = value - - @property - def chime_on(self): - """ - Indicates whether or not panel chimes are enabled. - """ - return self._chime_on - - @chime_on.setter - def chime_on(self, value): - """ - Sets the value indicating whether or not the panel chimes are enabled. - """ - self._chime_on = value - - @property - def alarm_event_occurred(self): - """ - Indicates whether or not an alarm event has occurred. - """ - return self._alarm_event_occurred - - @alarm_event_occurred.setter - def alarm_event_occurred(self, value): - """ - Sets the value indicating whether or not an alarm event has occurred. - """ - self._alarm_event_occurred = value - - @property - def alarm_sounding(self): - """ - Indicates whether or not an alarm is currently sounding. - """ - return self._alarm_sounding - - @alarm_sounding.setter - def alarm_sounding(self, value): - """ - Sets the value indicating whether or not an alarm is currently sounding. - """ - self._alarm_sounding = value - - @property - def numeric_code(self): - """ - Numeric indicator of associated with message. For example: If zone #3 is faulted, this value is 003. - """ - return self._numeric_code - - @numeric_code.setter - def numeric_code(self, value): - """ - Sets the numeric indicator associated with this message. - """ - self._numeric_code = value - - @property - def text(self): - """ - Alphanumeric text associated with this message. - """ - return self._text - - @text.setter - def text(self, value): - """ - Sets the alphanumeric text associated with this message. - """ - self._text = value - - @property - def cursor_location(self): - """ - Indicates which text position has the cursor underneath it. - """ - return self._cursor_location - - @cursor_location.setter - def cursor_location(self, value): - """ - Sets the value indicating which text position has the cursor underneath it. - """ - self._cursor_location = value - - @property - def data(self): - """ - Raw representation of the message from the panel. - """ - return self._data - - @data.setter - def data(self, value): - """ - Sets the raw representation of the message from the panel. - """ - self._data = value - - @property - def mask(self): - """ - The panel mask for which this message is intended. - """ - return self._mask - - @mask.setter - def mask(self, value): - """ - Sets the panel mask for which this message is intended. - """ - self._mask = value - - @property - def bitfield(self): - """ - The bit field associated with this message. - """ - return self._bitfield - - @bitfield.setter - def bitfield(self, value): - """ - Sets the bit field associated with this message. - """ - self._bitfield = value - - @property - def panel_data(self): - """ - The binary field associated with this message. - """ - return self._panel_data - - @panel_data.setter - def panel_data(self, value): - """ - Sets the binary field associated with this message. - """ - self._panel_data = value - class ExpanderMessage(object): """ Represents a message from a zone or relay expansion module. @@ -615,11 +353,11 @@ class ExpanderMessage(object): """ Constructor """ - self._type = None - self._address = None - self._channel = None - self._value = None - self._raw = None + self.type = None + self.address = None + self.channel = None + self.value = None + self.raw = None if data is not None: self._parse_message(data) @@ -653,76 +391,6 @@ class ExpanderMessage(object): elif header == '!REL': self.type = ExpanderMessage.RELAY - @property - def address(self): - """ - The relay address from which the message originated. - """ - return self._address - - @address.setter - def address(self, value): - """ - Sets the relay address from which the message originated. - """ - self._address = value - - @property - def channel(self): - """ - The zone expander channel from which the message originated. - """ - return self._channel - - @channel.setter - def channel(self, value): - """ - Sets the zone expander channel from which the message originated. - """ - self._channel = value - - @property - def value(self): - """ - The value associated with the message. - """ - return self._value - - @value.setter - def value(self, value): - """ - Sets the value associated with the message. - """ - self._value = value - - @property - def raw(self): - """ - The raw message from the expander device. - """ - return self._raw - - @raw.setter - def raw(self, value): - """ - Sets the raw message from the expander device. - """ - self._value = value - - @property - def type(self): - """ - The type of expander associated with this message. - """ - return self._type - - @type.setter - def type(self, value): - """ - Sets the type of expander associated with this message. - """ - self._type = value - class RFMessage(object): """ Represents a message from an RF receiver. @@ -731,9 +399,9 @@ class RFMessage(object): """ Constructor """ - self._raw = None - self._serial_number = None - self._value = None + self.raw = None + self.serial_number = None + self.value = None if data is not None: self._parse_message(data) @@ -751,43 +419,4 @@ class RFMessage(object): self.raw = data _, values = data.split(':') - self.serial_number, self.value = values.split(',') - - @property - def serial_number(self): - """ - The serial number for the RF receiver. - """ - return self._serial_number - - @serial_number.setter - def serial_number(self, value): - self._serial_number = value - - @property - def value(self): - """ - The value of the RF message. - """ - return self._value - - @value.setter - def value(self, value): - """ - Sets the value of the RF message. - """ - self._value = value - - @property - def raw(self): - """ - The raw message from the RF receiver. - """ - return self._raw - - @raw.setter - def raw(self, value): - """ - Sets the raw message from the RF receiver. - """ - self._raw = value + self.serial_number, self.value = values.split(',') \ No newline at end of file From 716927aefb2153c7d96e3586c8c85b2f8f7b2606 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Wed, 5 Jun 2013 20:52:08 -0700 Subject: [PATCH 05/30] Fixed a couple issues so the previous rework will function. Test code. --- pyad2usb/devices.py | 4 +++- pyftdi | 2 +- test.py | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index b9d2b10..119ae1b 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -31,7 +31,7 @@ class Device(object): self._interface = None self._device = None self._running = False - self._read_thread = ReadThread(self) # NOTE: not sure this is going to work.. + self._read_thread = Device.ReadThread(self) # NOTE: not sure this is going to work.. def __del__(self): pass @@ -432,6 +432,8 @@ class SocketDevice(Device): """ Constructor """ + Device.__init__(self) + self._interface = interface self._host, self._port = interface diff --git a/pyftdi b/pyftdi index e58079b..0c3e671 120000 --- a/pyftdi +++ b/pyftdi @@ -1 +1 @@ -../../pyftdi/pyftdi/ \ No newline at end of file +../pyftdi/pyftdi \ No newline at end of file diff --git a/test.py b/test.py index 038cbeb..8ed297d 100755 --- a/test.py +++ b/test.py @@ -199,7 +199,7 @@ def test_factory_watcher(): overseer.close() def test_socket(): - dev = pyad2usb.ad2usb.devices.SocketDevice(interface=("localhost", 10000)) + dev = pyad2usb.ad2usb.devices.SocketDevice(interface=("singularity.corp.nutech.com", 10000)) a2u = pyad2usb.ad2usb.AD2USB(dev) a2u.on_open += handle_open @@ -281,7 +281,7 @@ try: signal.signal(signal.SIGINT, signal_handler) #test_serial() - upload_serial() + #upload_serial() #test_usb() #test_usb_serial() @@ -290,7 +290,7 @@ try: #upload_usb() #upload_usb_serial() - #test_socket() + test_socket() #upload_socket() #test_no_read_thread() From 7b63a8ddc80c20c4e21f8af99ef07874d5edefc1 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Wed, 5 Jun 2013 20:56:49 -0700 Subject: [PATCH 06/30] Moved pyftdi to a submodule. --- .gitmodules | 3 +++ libs/pyftdi | 1 + pyftdi | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 libs/pyftdi diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e4f16b5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/pyftdi"] + path = libs/pyftdi + url = git@git.corp.nutech.com:nutech/pyftdi diff --git a/libs/pyftdi b/libs/pyftdi new file mode 160000 index 0000000..b1a3412 --- /dev/null +++ b/libs/pyftdi @@ -0,0 +1 @@ +Subproject commit b1a341240b29750d6448ac452c611c09c238e5d6 diff --git a/pyftdi b/pyftdi index 0c3e671..356cfd1 120000 --- a/pyftdi +++ b/pyftdi @@ -1 +1 @@ -../pyftdi/pyftdi \ No newline at end of file +libs/pyftdi/pyftdi/ \ No newline at end of file From e5689917358d16a30c208e3a4729923f150ff951 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Wed, 5 Jun 2013 21:20:45 -0700 Subject: [PATCH 07/30] Added boot event and reboot method. --- pyad2usb/ad2usb.py | 9 +++++++++ test.py | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 2ef526c..3dbde7a 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -154,6 +154,7 @@ class AD2USB(object): on_power_changed = event.Event('Called when panel power switches between AC and DC.') on_alarm = event.Event('Called when the alarm is triggered.') on_bypass = event.Event('Called when a zone is bypassed.') + on_boot = event.Event('Called when the device finishes bootings.') # Mid-level Events on_message = event.Event('Called when a message has been received from the device.') @@ -189,6 +190,12 @@ class AD2USB(object): self._device.close() self._device = None + def reboot(self): + """ + Reboots the device. + """ + self._device.write('=') + @property def id(self): return self._device.id @@ -224,6 +231,8 @@ class AD2USB(object): msg = ExpanderMessage(data) elif header == '!RFX': msg = RFMessage(data) + elif data.startswith('!Ready'): + self.on_boot() return msg diff --git a/test.py b/test.py index 8ed297d..66fcbde 100755 --- a/test.py +++ b/test.py @@ -71,6 +71,9 @@ def handle_firmware(stage): elif stage == pyad2usb.ad2usb.util.Firmware.STAGE_DONE: print "\r\nDone!" +def handle_boot(sender, args): + print 'boot', args + def upload_usb(): dev = pyad2usb.ad2usb.devices.USBDevice() @@ -211,8 +214,10 @@ def test_socket(): a2u.on_power_changed += handle_power_changed a2u.on_alarm += handle_alarm_bell a2u.on_bypass += handle_bypass + a2u.on_boot += handle_boot a2u.open() + a2u.reboot() print dev._id From 56af5b083d058575772fc8712b40959913d6b251 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Wed, 5 Jun 2013 21:47:01 -0700 Subject: [PATCH 08/30] Added LRRMessage. --- pyad2usb/ad2usb.py | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 3dbde7a..494de9e 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -231,6 +231,8 @@ class AD2USB(object): msg = ExpanderMessage(data) elif header == '!RFX': msg = RFMessage(data) + elif header == '!LRR': + msg = LRRMessage(data) elif data.startswith('!Ready'): self.on_boot() @@ -428,4 +430,35 @@ class RFMessage(object): self.raw = data _, values = data.split(':') - self.serial_number, self.value = values.split(',') \ No newline at end of file + self.serial_number, self.value = values.split(',') + +class LRRMessage(object): + """ + Represent a message from a Long Range Radio. + """ + def __init__(self, data=None): + """ + Constructor + """ + self.raw = None + self._event_data = None + self._partition = None + self._event_type = None + + if data is not None: + self._parse_message(data) + + def __str__(self): + """ + String conversion operator. + """ + return 'lrr > {0} @ {1} -- {2}'.format() + + def _parse_message(self, data): + """ + Parses the raw message from the device. + """ + self.raw = data + + _, values = data.split(':') + self._event_data, self._partition, self._event_type = values.split(',') \ No newline at end of file From 6ee5232c80b6649f43a7ee5b98fe26866bf6fda0 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Thu, 6 Jun 2013 21:58:49 -0700 Subject: [PATCH 09/30] Added config retrieval and F-key constants. --- pyad2usb/ad2usb.py | 32 ++++++++++++++++++++++++++++++++ test.py | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 494de9e..6e2eb54 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -155,6 +155,7 @@ class AD2USB(object): on_alarm = event.Event('Called when the alarm is triggered.') on_bypass = event.Event('Called when a zone is bypassed.') on_boot = event.Event('Called when the device finishes bootings.') + on_config_received = event.Event('Called when the device receives its configuration.') # Mid-level Events on_message = event.Event('Called when a message has been received from the device.') @@ -165,6 +166,12 @@ class AD2USB(object): on_read = event.Event('Called when a line has been read from the device.') on_write = event.Event('Called when data has been written to the device.') + # Constants + F1 = str(1) + str(1) + str(1) + F2 = str(2) + str(2) + str(2) + F3 = str(3) + str(3) + str(3) + F4 = str(4) + str(4) + str(4) + def __init__(self, device): """ Constructor @@ -174,6 +181,8 @@ class AD2USB(object): self._alarm_status = None self._bypass_status = None + self._settings = {} + self._address_mask = 0xFF80 # TEMP def open(self, baudrate=None, interface=None, index=None, no_reader_thread=False): @@ -190,6 +199,18 @@ class AD2USB(object): self._device.close() self._device = None + def get_config(self): + """ + Retrieves the configuration from the device. + """ + self._device.write("C\r") + + def set_config(self, settings): + """ + + """ + pass + def reboot(self): """ Reboots the device. @@ -235,9 +256,20 @@ class AD2USB(object): msg = LRRMessage(data) elif data.startswith('!Ready'): self.on_boot() + elif data.startswith('!CONFIG'): + self._handle_config(data) return msg + def _handle_config(self, data): + _, config_string = data.split('>') + for setting in config_string.split('&'): + k, v = setting.split('=') + + self._settings[k] = v + + self.on_config_received(self._settings) + def _update_internal_states(self, message): if message.ac_power != self._power_status: self._power_status, old_status = message.ac_power, self._power_status diff --git a/test.py b/test.py index 66fcbde..29725d7 100755 --- a/test.py +++ b/test.py @@ -74,6 +74,9 @@ def handle_firmware(stage): def handle_boot(sender, args): print 'boot', args +def handle_config(sender, args): + print 'config', args + def upload_usb(): dev = pyad2usb.ad2usb.devices.USBDevice() @@ -215,9 +218,12 @@ def test_socket(): a2u.on_alarm += handle_alarm_bell a2u.on_bypass += handle_bypass a2u.on_boot += handle_boot + a2u.on_config_received += handle_config a2u.open() - a2u.reboot() + #a2u.reboot() + time.sleep(2) + a2u.get_config() print dev._id From 9ba4d6e9d76e41f898eefdde20d24ae184b152e6 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Thu, 6 Jun 2013 22:04:19 -0700 Subject: [PATCH 10/30] Corrected F-keys, though its still untested. --- pyad2usb/ad2usb.py | 8 ++++---- test.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 6e2eb54..c69c336 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -167,10 +167,10 @@ class AD2USB(object): on_write = event.Event('Called when data has been written to the device.') # Constants - F1 = str(1) + str(1) + str(1) - F2 = str(2) + str(2) + str(2) - F3 = str(3) + str(3) + str(3) - F4 = str(4) + str(4) + str(4) + F1 = unichr(1) + unichr(1) + unichr(1) + F2 = unichr(2) + unichr(2) + unichr(2) + F3 = unichr(3) + unichr(3) + unichr(3) + F4 = unichr(4) + unichr(4) + unichr(4) def __init__(self, device): """ diff --git a/test.py b/test.py index 29725d7..4a7ccd7 100755 --- a/test.py +++ b/test.py @@ -222,8 +222,8 @@ def test_socket(): a2u.open() #a2u.reboot() - time.sleep(2) a2u.get_config() + print pyad2usb.ad2usb.AD2USB.F1 print dev._id From effe9650ce5ba9be609981d534765572cc480d0a Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sat, 8 Jun 2013 14:55:09 -0700 Subject: [PATCH 11/30] Fixed __all__. --- pyad2usb/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyad2usb/__init__.py b/pyad2usb/__init__.py index 08682c4..6937a83 100644 --- a/pyad2usb/__init__.py +++ b/pyad2usb/__init__.py @@ -2,4 +2,4 @@ The PyAD2USB module. """ -__all__ = ['Overseer', 'AD2USB', 'USBDevice', 'SerialDevice', 'Firmware'] +__all__ = ['ad2usb', 'devices', 'util'] From b35092546c9b314fe19eb5ae412682cc59f36680 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sat, 8 Jun 2013 14:55:38 -0700 Subject: [PATCH 12/30] First go at adding sphinx docs. --- docs/Makefile | 177 ++++ docs/_build/doctrees/environment.pickle | Bin 0 -> 63006 bytes docs/_build/doctrees/index.doctree | Bin 0 -> 5484 bytes docs/_build/doctrees/modules.doctree | Bin 0 -> 2798 bytes docs/_build/doctrees/pyad2usb.doctree | Bin 0 -> 149781 bytes docs/_build/doctrees/pyad2usb.event.doctree | Bin 0 -> 15916 bytes docs/_build/html/.buildinfo | 4 + docs/_build/html/_modules/index.html | 93 ++ .../_build/html/_modules/pyad2usb/ad2usb.html | 588 +++++++++++++ .../html/_modules/pyad2usb/devices.html | 652 ++++++++++++++ .../html/_modules/pyad2usb/event/event.html | 163 ++++ docs/_build/html/_modules/pyad2usb/util.html | 230 +++++ docs/_build/html/_sources/index.txt | 23 + docs/_build/html/_sources/modules.txt | 7 + docs/_build/html/_sources/pyad2usb.event.txt | 19 + docs/_build/html/_sources/pyad2usb.txt | 42 + docs/_build/html/_static/ajax-loader.gif | Bin 0 -> 673 bytes docs/_build/html/_static/basic.css | 540 ++++++++++++ docs/_build/html/_static/comment-bright.png | Bin 0 -> 3500 bytes docs/_build/html/_static/comment-close.png | Bin 0 -> 3578 bytes docs/_build/html/_static/comment.png | Bin 0 -> 3445 bytes docs/_build/html/_static/default.css | 256 ++++++ docs/_build/html/_static/doctools.js | 235 +++++ docs/_build/html/_static/down-pressed.png | Bin 0 -> 368 bytes docs/_build/html/_static/down.png | Bin 0 -> 363 bytes docs/_build/html/_static/file.png | Bin 0 -> 392 bytes docs/_build/html/_static/jquery.js | 4 + docs/_build/html/_static/minus.png | Bin 0 -> 199 bytes docs/_build/html/_static/plus.png | Bin 0 -> 199 bytes docs/_build/html/_static/pygments.css | 62 ++ docs/_build/html/_static/searchtools.js | 622 ++++++++++++++ docs/_build/html/_static/sidebar.js | 159 ++++ docs/_build/html/_static/underscore.js | 31 + docs/_build/html/_static/up-pressed.png | Bin 0 -> 372 bytes docs/_build/html/_static/up.png | Bin 0 -> 363 bytes docs/_build/html/_static/websupport.js | 808 ++++++++++++++++++ docs/_build/html/genindex.html | 683 +++++++++++++++ docs/_build/html/index.html | 142 +++ docs/_build/html/modules.html | 115 +++ docs/_build/html/objects.inv | Bin 0 -> 1022 bytes docs/_build/html/py-modindex.html | 139 +++ docs/_build/html/pyad2usb.event.html | 159 ++++ docs/_build/html/pyad2usb.html | 691 +++++++++++++++ docs/_build/html/search.html | 105 +++ docs/_build/html/searchindex.js | 1 + docs/conf.py | 306 +++++++ docs/index.rst | 23 + docs/make.bat | 242 ++++++ docs/modules.rst | 7 + docs/pyad2usb.event.rst | 19 + docs/pyad2usb.rst | 42 + 51 files changed, 7389 insertions(+) create mode 100644 docs/Makefile create mode 100644 docs/_build/doctrees/environment.pickle create mode 100644 docs/_build/doctrees/index.doctree create mode 100644 docs/_build/doctrees/modules.doctree create mode 100644 docs/_build/doctrees/pyad2usb.doctree create mode 100644 docs/_build/doctrees/pyad2usb.event.doctree create mode 100644 docs/_build/html/.buildinfo create mode 100644 docs/_build/html/_modules/index.html create mode 100644 docs/_build/html/_modules/pyad2usb/ad2usb.html create mode 100644 docs/_build/html/_modules/pyad2usb/devices.html create mode 100644 docs/_build/html/_modules/pyad2usb/event/event.html create mode 100644 docs/_build/html/_modules/pyad2usb/util.html create mode 100644 docs/_build/html/_sources/index.txt create mode 100644 docs/_build/html/_sources/modules.txt create mode 100644 docs/_build/html/_sources/pyad2usb.event.txt create mode 100644 docs/_build/html/_sources/pyad2usb.txt create mode 100644 docs/_build/html/_static/ajax-loader.gif create mode 100644 docs/_build/html/_static/basic.css create mode 100644 docs/_build/html/_static/comment-bright.png create mode 100644 docs/_build/html/_static/comment-close.png create mode 100644 docs/_build/html/_static/comment.png create mode 100644 docs/_build/html/_static/default.css create mode 100644 docs/_build/html/_static/doctools.js create mode 100644 docs/_build/html/_static/down-pressed.png create mode 100644 docs/_build/html/_static/down.png create mode 100644 docs/_build/html/_static/file.png create mode 100644 docs/_build/html/_static/jquery.js create mode 100644 docs/_build/html/_static/minus.png create mode 100644 docs/_build/html/_static/plus.png create mode 100644 docs/_build/html/_static/pygments.css create mode 100644 docs/_build/html/_static/searchtools.js create mode 100644 docs/_build/html/_static/sidebar.js create mode 100644 docs/_build/html/_static/underscore.js create mode 100644 docs/_build/html/_static/up-pressed.png create mode 100644 docs/_build/html/_static/up.png create mode 100644 docs/_build/html/_static/websupport.js create mode 100644 docs/_build/html/genindex.html create mode 100644 docs/_build/html/index.html create mode 100644 docs/_build/html/modules.html create mode 100644 docs/_build/html/objects.inv create mode 100644 docs/_build/html/py-modindex.html create mode 100644 docs/_build/html/pyad2usb.event.html create mode 100644 docs/_build/html/pyad2usb.html create mode 100644 docs/_build/html/search.html create mode 100644 docs/_build/html/searchindex.js create mode 100644 docs/conf.py create mode 100644 docs/index.rst create mode 100644 docs/make.bat create mode 100644 docs/modules.rst create mode 100644 docs/pyad2usb.event.rst create mode 100644 docs/pyad2usb.rst diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..b2cad44 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,177 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = _build + +# User-friendly check for sphinx-build +ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) +$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) +endif + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . + +.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " xml to make Docutils-native XML files" + @echo " pseudoxml to make pseudoxml-XML files for display purposes" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + rm -rf $(BUILDDIR)/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pyad2usb.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pyad2usb.qhc" + +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/pyad2usb" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pyad2usb" + @echo "# devhelp" + +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +latexpdfja: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through platex and dvipdfmx..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." + +xml: + $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml + @echo + @echo "Build finished. The XML files are in $(BUILDDIR)/xml." + +pseudoxml: + $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml + @echo + @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle new file mode 100644 index 0000000000000000000000000000000000000000..b2d6160c75ca159e72ce1f34ce2dbc9913f7b0f1 GIT binary patch literal 63006 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 literal 0 HcmV?d00001 diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree new file mode 100644 index 0000000000000000000000000000000000000000..60cc750d838f082cbb37d816a2de4d030ef4c82c GIT binary patch literal 5484 zcmds5d6*nU6;C#MPO`h%B?*KiqyvOZLS{D?7+3KEQCJ-hC|H!S(=%N=)uyL=URCuT zY72;9RuL5yPdrdj#9LH6P{jMd`@Zk{z7ITpRnxt@vswJ|x8JurUw8GZSHJgu@4c#5 zmv_|sxR&T3R3lOBb5$^}4Ib$Nt=xG9b)>Ya$oe9$!S!sDE9y+Ct2lA$iWMuSd02}Z z+|jYqob~*DiK^~UPCnh!K^$$P?()PiWP`{LYFs&9&KDn z^GQX$DfO{|rY9A58(b-`4%tG5R^(5H|KQkxGo5{V_U<1kToNZv&5In* z_nO+#B2ZSP17yvRYaY%T+GgQMCkze;QGK^lO|%neM~OHIeFvID4lIRQ9BD6zpo2RS zu5}LSxTYoNha5kUyrzRGKEk>|7^tC*qJwp3cAmJ@Es{575(PDcS%Ef96yb$Yfe0E^ zwOH#>Gd`NTWfWYfQFx!vj7X(v^Ho>SmXuDavL5Z#4WG1?^<<7FhZQ`nWdIuxE!$E$ z86KZ$gk!4dAyQ6Zy-mp#ms6ZhWvfgiY_G81s#iNKP0XE!7e8qlt%`P3pf~iC!gI00 zx>}<Kl=c+G32cSfC^jTj zFR3oIUzx~=qXO+k3hYa1e=go3P83@NxXUEyfB;`-6vd8;C|1O26|ucSXNn^Yg)@at+lZL^$0W%Z#OTA1q^w)5XV9obC(w`!YOTRuP?L(A=*L4S=*^ zxW6bJ`w|a;w;q_%gMdqz<;Irv7P7~yORp&kbT$k*C#44)L;8>*XCwcRS!#^VU4*u8 zeg-|nAb#j_i2HJ{od?A2y3Plz@su8BU>UvVEDOt2i#Un=0zDk4$|*ep@|N`6YrVM$ zJ<`Bn$GRafUwnzq-e%aIa_4itwDOi#7Y3zwS*Mo!*#joPdus?nDyL1 z^G1Q5ghkVoo@|^l2u))s^kawWJhEHLA-W9Mr?PnJo1aIQ8yHtC=gcB0ZgUEA_8Ta8J4rWppc zK+i3tK{tl6+tIVcr7iEnlxHuk_Po&)o(fcfo&zhcOX;~SD}eQRnM3ILMb>F7rR&AD z6FoqU#Y^V>1$G>zh#BcerF4t6=pZvLN?iHs@>;q}5Wa!X2YXh8rYZ_F8a zQ&C(mZf@h^&Fx&=WUP2g#zl^Z-U=?>meSjy(Q^ZBQ^Cu`zR zVX6Dyxr__v-TyA@{@YS|w^7!=R2jVo+HPG;$a|O3Hon1_@;*z*?J2$Ac*9J*Z80Gq zxFz0VS_S2Ut^kvqE(qfx6MPI4VS4|;jYx1tn z9LU(*R&7- zept~@0pmFIL$UPH$eNnXqnbHB{H)B@$jKT+(a|O{q@S}*LhI((=%|ikwA}&MlOwUL zj|$xgN9h-=4<4v-qndts1idhC8WV87iO@pRugYvd;bhWuv+hUHufZeEM2pb;hIN_a z%Pjqt^@mQg2YlIKUWfQhfSU<~ccNNOlB+NdKXs#no($@;)2g)8)wDYms6fY3 zcG=POwJ`P$yBr&H=;9!ZW){=%tXXo}I`O(l%1~YP<5yM2>&A8KnuZ3KXk?~$O&>o3$gAwdv7oH19$D8M#>>f#; zVBU(ydJ`cx8u3A#tu$JElY_Wo(DFo#;^2kz3demEh~0z%WU39n1($EOqia+HS5qz} zxTaEa3&zkvm{`kegggmjY-?5~rl+SznzLHOku4KGpBja*8kJj(6v{JhXl7gy)J2GY zEgdu58OBjvZZnUY+g;tBl=5VVh`ZT9PAGUjX=DY*lK6P;i% zTSL1rWU9P%W?rl1=@>01RknWVhGXx?OB|N8c1iwWwj814s>`T~i+vTI( z@Z_i!+=E}S72DIcRPMEt&=uPDFu&Zw6$UOV%%xCYz85ID526*hAHU3;nsLn}58x%0 KXW%!fj{FzFhI;S- literal 0 HcmV?d00001 diff --git a/docs/_build/doctrees/modules.doctree b/docs/_build/doctrees/modules.doctree new file mode 100644 index 0000000000000000000000000000000000000000..00ae235d42b462b892c44c24222f619f48e5bad4 GIT binary patch literal 2798 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ÌyY z<%Z^#QsXRCKv0N%McWUG2Af#TZkcEL5sf{raaP08EzKC_>5rJneRG48jnoVvVz1nc zy&%#+KKBXzl0kgiBKs#L8ce(`ZLL8I8BB_mv2|@{eqJa0FDjzbtc=*xbN%MzVNDuY zw?hztB2znzOMMl^4lK=upVM$;7kr+Q8HzZJWU;wLx@J|xUDjpS1d6AwG?*H@ zAuisvNW4Nzvss%DgHaT2Gg$|bXXMtkY9e3EOO2r#ItvZKM(Jisqob(x5rr;2NJSahfDOpIYgTUcav#9@kToRI zcwNbCh-cpn#~uEo_w^7M%|6~D%!Zc_X~&EE+3hd-d#7VGtT0duI6WR^;1$tPV4gP; zla0m1{&uD0p5LB3SL;%dk32<6jt*J+_`ym?=}W&cxN(L z(|eY|T7|a?YkQB-kzU8U248dw>v}toc0KP4d{Zq9^Y-N#$?JRLSbiILm*E72LXCGn z3wuNFgjEm>_iiA{Ms_~h#@y!X>H-%%0#yGPNUQpqI5=ij}lPp@%wIJw6`e}8slAy;|dBV;cLWLyKDJYUOUCw z+HMlGjrSbcZ0p@bHrsixVC$^H_TK9x+QD0aEOzw1Mls1bw?|Iw8{=; zB;C!Ple4>5!xA3vZA==2CgIIxyV%3qn4I_Yj%9gG@E)cN6YXmIy}bKT3f@n_G_3tC zRQp@TwQq|+qlQrf809p8T0D!xV%xyp-Z`xGeZ0vOXp*-*3w2+6Ox$Gqfqy@{_1OO2 zp{$Q7-i^%CAiFv0RIib_o@N&{9N>M(j7;|~VwoT44Pd#=@V;hi$$8V!y$T0;eHk3= z?ZW!6^KRkWA>L`^d8qd-nH}cMVf`O&&myh23m=d0uA+bq-iaib>21uG(&%l=^k#WQ zCe-A83jw=wLt(t&&2-}TDYS_FaWPsYI0knN?48PfIW{gX4w{w?5_RSJh3;X=Yz5SM Xvo-G8+?>BZx4{d(0O8&>tM>l^97bT* literal 0 HcmV?d00001 diff --git a/docs/_build/doctrees/pyad2usb.event.doctree b/docs/_build/doctrees/pyad2usb.event.doctree new file mode 100644 index 0000000000000000000000000000000000000000..2233ef512d8ff166fd4e02d28d7dfa809dc9def5 GIT binary patch literal 15916 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 + + + + + + + Overview: module code — pyad2usb documentation + + + + + + + + + + + +

+

Navigation

+ +
+ +
+
+
+
+ +

All modules for which code is available

+ + +
+
+
+
+
+ + +
+
+
+
+
+

Navigation

+ +
+
+ © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
+ + \ No newline at end of file diff --git a/docs/_build/html/_modules/pyad2usb/ad2usb.html b/docs/_build/html/_modules/pyad2usb/ad2usb.html new file mode 100644 index 0000000..98428a2 --- /dev/null +++ b/docs/_build/html/_modules/pyad2usb/ad2usb.html @@ -0,0 +1,588 @@ + + + + + + + + pyad2usb.ad2usb — pyad2usb documentation + + + + + + + + + + + + +
+

Navigation

+ +
+ +
+
+
+
+ +

Source code for pyad2usb.ad2usb

+"""
+Provides the full AD2USB class and factory.
+"""
+
+import time
+import threading
+import re
+from .event import event
+from . import devices
+from . import util
+
+
[docs]class Overseer(object):
+    """
+    Factory for creation of AD2USB devices as well as provide4s attach/detach events."
+    """
+
+    # Factory events
+    on_attached = event.Event('Called when an AD2USB device has been detected.')
+    on_detached = event.Event('Called when an AD2USB device has been removed.')
+
+    __devices = []
+
+    @classmethod
+
[docs]    def find_all(cls):
+        """
+        Returns all AD2USB devices located on the system.
+        """
+        cls.__devices = devices.USBDevice.find_all()
+
+        return cls.__devices
+

+    @classmethod
+
[docs]    def devices(cls):
+        """
+        Returns a cached list of AD2USB devices located on the system.
+        """
+        return cls.__devices
+

+    @classmethod
+
[docs]    def create(cls, device=None):
+        """
+        Factory method that returns the requested AD2USB device, or the first device.
+        """
+        cls.find_all()
+
+        if len(cls.__devices) == 0:
+            raise util.NoDeviceError('No AD2USB devices present.')
+
+        if device is None:
+            device = cls.__devices[0]
+
+        vendor, product, sernum, ifcount, description = device
+        device = devices.USBDevice(serial=sernum, description=description)
+
+        return AD2USB(device)
+

+    def __init__(self, attached_event=None, detached_event=None):
+        """
+        Constructor
+        """
+        self._detect_thread = Overseer.DetectThread(self)
+
+        if attached_event:
+            self.on_attached += attached_event
+
+        if detached_event:
+            self.on_detached += detached_event
+
+        Overseer.find_all()
+
+        self.start()
+
+
[docs]    def close(self):
+        """
+        Clean up and shut down.
+        """
+        self.stop()
+

+
[docs]    def start(self):
+        """
+        Starts the detection thread, if not already running.
+        """
+        if not self._detect_thread.is_alive():
+            self._detect_thread.start()
+

+
[docs]    def stop(self):
+        """
+        Stops the detection thread.
+        """
+        self._detect_thread.stop()
+

+
[docs]    def get_device(self, device=None):
+        """
+        Factory method that returns the requested AD2USB device, or the first device.
+        """
+        return Overseer.create(device)
+
+

+
[docs]    class DetectThread(threading.Thread):
+        """
+        Thread that handles detection of added/removed devices.
+        """
+        def __init__(self, overseer):
+            """
+            Constructor
+            """
+            threading.Thread.__init__(self)
+
+            self._overseer = overseer
+            self._running = False
+
+
[docs]        def stop(self):
+            """
+            Stops the thread.
+            """
+            self._running = False
+

+
[docs]        def run(self):
+            """
+            The actual detection process.
+            """
+            self._running = True
+
+            last_devices = set()
+
+            while self._running:
+                try:
+                    Overseer.find_all()
+
+                    current_devices = set(Overseer.devices())
+                    new_devices = [d for d in current_devices if d not in last_devices]
+                    removed_devices = [d for d in last_devices if d not in current_devices]
+                    last_devices = current_devices
+
+                    for d in new_devices:
+                        self._overseer.on_attached(d)
+
+                    for d in removed_devices:
+                        self._overseer.on_detached(d)
+
+                except util.CommError, err:
+                    pass
+
+                time.sleep(0.25)
+
+

+
[docs]class AD2USB(object):
+    """
+    High-level wrapper around AD2USB/AD2SERIAL devices.
+    """
+
+    # High-level Events
+    on_status_changed = event.Event('Called when the panel status changes.')
+    on_power_changed = event.Event('Called when panel power switches between AC and DC.')
+    on_alarm = event.Event('Called when the alarm is triggered.')
+    on_bypass = event.Event('Called when a zone is bypassed.')
+    on_boot = event.Event('Called when the device finishes bootings.')
+    on_config_received = event.Event('Called when the device receives its configuration.')
+
+    # Mid-level Events
+    on_message = event.Event('Called when a message has been received from the device.')
+
+    # Low-level Events
+    on_open = event.Event('Called when the device has been opened.')
+    on_close = event.Event('Called when the device has been closed.')
+    on_read = event.Event('Called when a line has been read from the device.')
+    on_write = event.Event('Called when data has been written to the device.')
+
+    # Constants
+    F1 = unichr(1) + unichr(1) + unichr(1)
+    F2 = unichr(2) + unichr(2) + unichr(2)
+    F3 = unichr(3) + unichr(3) + unichr(3)
+    F4 = unichr(4) + unichr(4) + unichr(4)
+
+    def __init__(self, device):
+        """
+        Constructor
+        """
+        self._device = device
+        self._power_status = None
+        self._alarm_status = None
+        self._bypass_status = None
+
+        self._settings = {}
+
+        self._address_mask = 0xFF80     # TEMP
+
+
[docs]    def open(self, baudrate=None, interface=None, index=None, no_reader_thread=False):
+        """
+        Opens the device.
+        """
+        self._wire_events()
+        self._device.open(baudrate=baudrate, interface=interface, index=index, no_reader_thread=no_reader_thread)
+

+
[docs]    def close(self):
+        """
+        Closes the device.
+        """
+        self._device.close()
+        self._device = None
+

+
[docs]    def get_config(self):
+        """
+        Retrieves the configuration from the device.
+        """
+        self._device.write("C\r")
+

+
[docs]    def set_config(self, settings):
+        """
+        Sets configuration entries on the device.
+        """
+        pass
+

+
[docs]    def reboot(self):
+        """
+        Reboots the device.
+        """
+        self._device.write('=')
+

+    @property
+
[docs]    def id(self):
+        return self._device.id
+

+    def _wire_events(self):
+        """
+        Wires up the internal device events.
+        """
+        self._device.on_open += self._on_open
+        self._device.on_close += self._on_close
+        self._device.on_read += self._on_read
+        self._device.on_write += self._on_write
+
+    def _handle_message(self, data):
+        """
+        Parses messages from the panel.
+        """
+        if data is None:
+            return None
+
+        msg = None
+
+        if data[0] != '!':
+            msg = Message(data)
+
+            if self._address_mask & msg.mask > 0:
+                self._update_internal_states(msg)
+
+        else:   # specialty messages
+            header = data[0:4]
+
+            if header == '!EXP' or header == '!REL':
+                msg = ExpanderMessage(data)
+            elif header == '!RFX':
+                msg = RFMessage(data)
+            elif header == '!LRR':
+                msg = LRRMessage(data)
+            elif data.startswith('!Ready'):
+                self.on_boot()
+            elif data.startswith('!CONFIG'):
+                self._handle_config(data)
+
+        return msg
+
+    def _handle_config(self, data):
+        _, config_string = data.split('>')
+        for setting in config_string.split('&'):
+            k, v = setting.split('=')
+
+            self._settings[k] = v
+
+        self.on_config_received(self._settings)
+
+    def _update_internal_states(self, message):
+        if message.ac_power != self._power_status:
+            self._power_status, old_status = message.ac_power, self._power_status
+
+            if old_status is not None:
+                self.on_power_changed(self._power_status)
+
+        if message.alarm_sounding != self._alarm_status:
+            self._alarm_status, old_status = message.alarm_sounding, self._alarm_status
+
+            if old_status is not None:
+                self.on_alarm(self._alarm_status)
+
+        if message.zone_bypassed != self._bypass_status:
+            self._bypass_status, old_status = message.zone_bypassed, self._bypass_status
+
+            if old_status is not None:
+                self.on_bypass(self._bypass_status)
+
+    def _on_open(self, sender, args):
+        """
+        Internal handler for opening the device.
+        """
+        self.on_open(args)
+
+    def _on_close(self, sender, args):
+        """
+        Internal handler for closing the device.
+        """
+        self.on_close(args)
+
+    def _on_read(self, sender, args):
+        """
+        Internal handler for reading from the device.
+        """
+        self.on_read(args)
+
+        msg = self._handle_message(args)
+        if msg:
+            self.on_message(msg)
+
+    def _on_write(self, sender, args):
+        """
+        Internal handler for writing to the device.
+        """
+        self.on_write(args)
+

+
[docs]class Message(object):
+    """
+    Represents a message from the alarm panel.
+    """
+
+    def __init__(self, data=None):
+        """
+        Constructor
+        """
+        self.ready = False
+        self.armed_away = False
+        self.armed_home = False
+        self.backlight_on = False
+        self.programming_mode = False
+        self.beeps = -1
+        self.zone_bypassed = False
+        self.ac_power = False
+        self.chime_on = False
+        self.alarm_event_occurred = False
+        self.alarm_sounding = False
+        self.numeric_code = ""
+        self.text = ""
+        self.cursor_location = -1
+        self.data = ""
+        self.mask = ""
+        self.bitfield = ""
+        self.panel_data = ""
+
+        self._regex = re.compile('("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*)')
+
+        if data is not None:
+            self._parse_message(data)
+
+    def _parse_message(self, data):
+        """
+        Parse the message from the device.
+        """
+        m = self._regex.match(data)
+
+        if m is None:
+            raise util.InvalidMessageError('Received invalid message: {0}'.format(data))
+
+        self.bitfield, self.numeric_code, self.panel_data, alpha = m.group(1, 2, 3, 4)
+        self.mask = int(self.panel_data[3:3+8], 16)
+
+        self.data = data
+        self.ready = not self.bitfield[1:2] == "0"
+        self.armed_away = not self.bitfield[2:3] == "0"
+        self.armed_home = not self.bitfield[3:4] == "0"
+        self.backlight_on = not self.bitfield[4:5] == "0"
+        self.programming_mode = not self.bitfield[5:6] == "0"
+        self.beeps = int(self.bitfield[6:7], 16)
+        self.zone_bypassed = not self.bitfield[7:8] == "0"
+        self.ac_power = not self.bitfield[8:9] == "0"
+        self.chime_on = not self.bitfield[9:10] == "0"
+        self.alarm_event_occurred = not self.bitfield[10:11] == "0"
+        self.alarm_sounding = not self.bitfield[11:12] == "0"
+        self.text = alpha.strip('"')
+
+        if int(self.panel_data[19:21], 16) & 0x01 > 0:
+            self.cursor_location = int(self.bitfield[21:23], 16)    # Alpha character index that the cursor is on.
+
+    def __str__(self):
+        """
+        String conversion operator.
+        """
+        return 'msg > {0:0<9} [{1}{2}{3}] -- ({4}) {5}'.format(hex(self.mask), 1 if self.ready else 0, 1 if self.armed_away else 0, 1 if self.armed_home else 0, self.numeric_code, self.text)
+

+
[docs]class ExpanderMessage(object):
+    """
+    Represents a message from a zone or relay expansion module.
+    """
+    ZONE = 0
+    RELAY = 1
+
+    def __init__(self, data=None):
+        """
+        Constructor
+        """
+        self.type = None
+        self.address = None
+        self.channel = None
+        self.value = None
+        self.raw = None
+
+        if data is not None:
+            self._parse_message(data)
+
+    def __str__(self):
+        """
+        String conversion operator.
+        """
+        expander_type = 'UNKWN'
+        if self.type == ExpanderMessage.ZONE:
+            expander_type = 'ZONE'
+        elif self.type  == ExpanderMessage.RELAY:
+            expander_type = 'RELAY'
+
+        return 'exp > [{0: <5}] {1}/{2} -- {3}'.format(expander_type, self.address, self.channel, self.value)
+
+    def _parse_message(self, data):
+        """
+        Parse the raw message from the device.
+        """
+        header, values = data.split(':')
+        address, channel, value = values.split(',')
+
+        self.raw = data
+        self.address = address
+        self.channel = channel
+        self.value = value
+
+        if header == '!EXP':
+            self.type = ExpanderMessage.ZONE
+        elif header == '!REL':
+            self.type = ExpanderMessage.RELAY
+

+
[docs]class RFMessage(object):
+    """
+    Represents a message from an RF receiver.
+    """
+    def __init__(self, data=None):
+        """
+        Constructor
+        """
+        self.raw = None
+        self.serial_number = None
+        self.value = None
+
+        if data is not None:
+            self._parse_message(data)
+
+    def __str__(self):
+        """
+        String conversion operator.
+        """
+        return 'rf > {0}: {1}'.format(self.serial_number, self.value)
+
+    def _parse_message(self, data):
+        """
+        Parses the raw message from the device.
+        """
+        self.raw = data
+
+        _, values = data.split(':')
+        self.serial_number, self.value = values.split(',')
+

+
[docs]class LRRMessage(object):
+    """
+    Represent a message from a Long Range Radio.
+    """
+    def __init__(self, data=None):
+        """
+        Constructor
+        """
+        self.raw = None
+        self._event_data = None
+        self._partition = None
+        self._event_type = None
+
+        if data is not None:
+            self._parse_message(data)
+
+    def __str__(self):
+        """
+        String conversion operator.
+        """
+        return 'lrr > {0} @ {1} -- {2}'.format()
+
+    def _parse_message(self, data):
+        """
+        Parses the raw message from the device.
+        """
+        self.raw = data
+
+        _, values = data.split(':')
+        self._event_data, self._partition, self._event_type = values.split(',')

+
+ +
+
+
+
+
+ + +
+
+
+
+
+

Navigation

+ +
+
+ © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
+ + \ No newline at end of file diff --git a/docs/_build/html/_modules/pyad2usb/devices.html b/docs/_build/html/_modules/pyad2usb/devices.html new file mode 100644 index 0000000..e7d8b00 --- /dev/null +++ b/docs/_build/html/_modules/pyad2usb/devices.html @@ -0,0 +1,652 @@ + + + + + + + + pyad2usb.devices — pyad2usb documentation + + + + + + + + + + + + +
+

Navigation

+ +
+ +
+
+
+
+ +

Source code for pyad2usb.devices

+"""
+Contains different types of devices belonging to the AD2USB family.
+"""
+
+import usb.core
+import usb.util
+import time
+import threading
+import serial
+import serial.tools.list_ports
+import socket
+from pyftdi.pyftdi.ftdi import *
+from pyftdi.pyftdi.usbtools import *
+from . import util
+from .event import event
+
+
[docs]class Device(object):
+    """
+    Generic parent device to all AD2USB products.
+    """
+
+    # Generic device events
+    on_open = event.Event('Called when the device has been opened')
+    on_close = event.Event('Called when the device has been closed')
+    on_read = event.Event('Called when a line has been read from the device')
+    on_write = event.Event('Called when data has been written to the device')
+
+    def __init__(self):
+        self._id = ''
+        self._buffer = ''
+        self._interface = None
+        self._device = None
+        self._running = False
+        self._read_thread = Device.ReadThread(self)    # NOTE: not sure this is going to work..
+
+    def __del__(self):
+        pass
+
+    @property
+    def id(self):
+        return self._id
+
+    @id.setter
+
[docs]    def id(self, value):
+        self._id = value
+

+
[docs]    def is_reader_alive(self):
+        """
+        Indicates whether or not the reader thread is alive.
+        """
+        return self._read_thread.is_alive()
+

+
[docs]    def stop_reader(self):
+        """
+        Stops the reader thread.
+        """
+        self._read_thread.stop()
+

+
[docs]    class ReadThread(threading.Thread):
+        """
+        Reader thread which processes messages from the device.
+        """
+
+        READ_TIMEOUT = 10
+
+        def __init__(self, device):
+            """
+            Constructor
+            """
+            threading.Thread.__init__(self)
+            self._device = device
+            self._running = False
+
+
[docs]        def stop(self):
+            """
+            Stops the running thread.
+            """
+            self._running = False
+

+
[docs]        def run(self):
+            """
+            The actual read process.
+            """
+            self._running = True
+
+            while self._running:
+                try:
+                    self._device.read_line(timeout=self.READ_TIMEOUT)
+                except util.TimeoutError, err:
+                    pass
+
+                time.sleep(0.01)
+

+
[docs]class USBDevice(Device):
+    """
+    AD2USB device exposed with PyFTDI's interface.
+    """
+
+    # Constants
+    FTDI_VENDOR_ID = 0x0403
+    FTDI_PRODUCT_ID = 0x6001
+    BAUDRATE = 115200
+
+    @staticmethod
+
[docs]    def find_all():
+        """
+        Returns all FTDI devices matching our vendor and product IDs.
+        """
+        devices = []
+
+        try:
+            devices = Ftdi.find_all([(USBDevice.FTDI_VENDOR_ID, USBDevice.FTDI_PRODUCT_ID)], nocache=True)
+        except (usb.core.USBError, FtdiError), err:
+            raise util.CommError('Error enumerating AD2USB devices: {0}'.format(str(err)))
+
+        return devices
+

+    def __init__(self, vid=FTDI_VENDOR_ID, pid=FTDI_PRODUCT_ID, serial=None, description=None, interface=0):
+        """
+        Constructor
+        """
+        Device.__init__(self)
+
+        self._device = Ftdi()
+        self._interface = interface
+        self._vendor_id = vid
+        self._product_id = pid
+        self._serial_number = serial
+        self._description = description
+
+
[docs]    def open(self, baudrate=BAUDRATE, interface=None, index=0, no_reader_thread=False):
+        """
+        Opens the device.
+        """
+        # Set up defaults
+        if baudrate is None:
+            baudrate = USBDevice.BAUDRATE
+
+        if self._interface is None and interface is None:
+            self._interface = 0
+
+        if interface is not None:
+            self._interface = interface
+
+        if index is None:
+            index = 0
+
+        # Open the device and start up the thread.
+        try:
+            self._device.open(self._vendor_id,
+                             self._product_id,
+                             self._interface,
+                             index,
+                             self._serial_number,
+                             self._description)
+
+            self._device.set_baudrate(baudrate)
+
+            self._id = 'USB {0}:{1}'.format(self._device.usb_dev.bus, self._device.usb_dev.address)
+        except (usb.core.USBError, FtdiError), err:
+            self.on_close()
+
+            raise util.NoDeviceError('Error opening AD2USB device: {0}'.format(str(err)))
+        else:
+            self._running = True
+            if not no_reader_thread:
+                self._read_thread.start()
+
+            self.on_open((self._serial_number, self._description))
+

+
[docs]    def close(self):
+        """
+        Closes the device.
+        """
+        try:
+            self._running = False
+            self._read_thread.stop()
+
+            self._device.close()
+
+            # HACK: Probably should fork pyftdi and make this call in .close().
+            self._device.usb_dev.attach_kernel_driver(self._interface)
+        except (FtdiError, usb.core.USBError):
+            pass
+
+        self.on_close()
+

+
[docs]    def write(self, data):
+        """
+        Writes data to the device.
+        """
+        try:
+            self._device.write_data(data)
+
+            self.on_write(data)
+        except FtdiError, err:
+            raise util.CommError('Error writing to AD2USB device.')
+

+
[docs]    def read(self):
+        """
+        Reads a single character from the device.
+        """
+        return self._device.read_data(1)
+

+
[docs]    def read_line(self, timeout=0.0):
+        """
+        Reads a line from the device.
+        """
+        def timeout_event():
+            timeout_event.reading = False
+
+        timeout_event.reading = True
+
+        got_line = False
+        ret = None
+
+        timer = None
+        if timeout > 0:
+            timer = threading.Timer(timeout, timeout_event)
+            timer.start()
+
+        try:
+            while timeout_event.reading:
+                buf = self._device.read_data(1)
+
+                if buf != '':
+                    self._buffer += buf
+
+                    if buf == "\n":
+                        if len(self._buffer) > 1:
+                            if self._buffer[-2] == "\r":
+                                self._buffer = self._buffer[:-2]
+
+                                # ignore if we just got \r\n with nothing else in the buffer.
+                                if len(self._buffer) != 0:
+                                    got_line = True
+                                    break
+                        else:
+                            self._buffer = self._buffer[:-1]
+
+                time.sleep(0.001)
+
+        except (usb.core.USBError, FtdiError), err:
+            timer.cancel()
+
+            raise util.CommError('Error reading from AD2USB device: {0}'.format(str(err)))
+        else:
+            if got_line:
+                ret = self._buffer
+                self._buffer = ''
+
+                self.on_read(ret)
+
+        if timer:
+            if timer.is_alive():
+                timer.cancel()
+            else:
+                raise util.TimeoutError('Timeout while waiting for line terminator.')
+
+        return ret
+
+

+
[docs]class SerialDevice(Device):
+    """
+    AD2USB or AD2SERIAL device exposed with the pyserial interface.
+    """
+
+    # Constants
+    BAUDRATE = 19200
+
+    @staticmethod
+
[docs]    def find_all(pattern=None):
+        """
+        Returns all serial ports present.
+        """
+        devices = []
+
+        try:
+            if pattern:
+                devices = serial.tools.list_ports.grep(pattern)
+            else:
+                devices = serial.tools.list_ports.comports()
+        except Exception, err:
+            raise util.CommError('Error enumerating AD2SERIAL devices: {0}'.format(str(err)))
+
+        return devices
+

+    def __init__(self, interface=None):
+        """
+        Constructor
+        """
+        Device.__init__(self)
+
+        self._interface = interface
+        self._id = interface
+        self._device = serial.Serial(timeout=0, writeTimeout=0)     # Timeout = non-blocking to match pyftdi.
+
+
[docs]    def open(self, baudrate=BAUDRATE, interface=None, index=None, no_reader_thread=False):
+        """
+        Opens the device.
+        """
+        # Set up the defaults
+        if baudrate is None:
+            baudrate = SerialDevice.BAUDRATE
+
+        if self._interface is None and interface is None:
+            raise util.NoDeviceError('No AD2SERIAL device interface specified.')
+
+        if interface is not None:
+            self._interface = interface
+
+        self._device.port = self._interface
+
+        # Open the device and start up the reader thread.
+        try:
+            self._device.open()
+            self._device.baudrate = baudrate            # NOTE: Setting the baudrate before opening the
+                                                        #       port caused issues with Moschip 7840/7820
+                                                        #       USB Serial Driver converter. (mos7840)
+                                                        #
+                                                        #       Moving it to this point seems to resolve
+                                                        #       all issues with it.
+
+        except (serial.SerialException, ValueError), err:
+            self.on_close()
+
+            raise util.NoDeviceError('Error opening AD2SERIAL device on port {0}.'.format(interface))
+        else:
+            self._running = True
+            self.on_open(('N/A', "AD2SERIAL"))
+
+            if not no_reader_thread:
+                self._read_thread.start()
+

+
[docs]    def close(self):
+        """
+        Closes the device.
+        """
+        try:
+            self._running = False
+            self._read_thread.stop()
+
+            self._device.close()
+        except Exception, err:
+            pass
+
+        self.on_close()
+

+
[docs]    def write(self, data):
+        """
+        Writes data to the device.
+        """
+        try:
+            self._device.write(data)
+        except serial.SerialTimeoutException, err:
+            pass
+        except serial.SerialException, err:
+            raise util.CommError('Error writing to serial device.')
+        else:
+            self.on_write(data)
+

+
[docs]    def read(self):
+        """
+        Reads a single character from the device.
+        """
+        return self._device.read(1)
+

+
[docs]    def read_line(self, timeout=0.0):
+        """
+        Reads a line from the device.
+        """
+        def timeout_event():
+            timeout_event.reading = False
+
+        timeout_event.reading = True
+
+        got_line = False
+        ret = None
+
+        timer = None
+        if timeout > 0:
+            timer = threading.Timer(timeout, timeout_event)
+            timer.start()
+
+        try:
+            while timeout_event.reading:
+                buf = self._device.read(1)
+
+                if buf != '' and buf != "\xff":     # AD2SERIAL specifically apparently sends down \xFF on boot.
+                    self._buffer += buf
+
+                    if buf == "\n":
+                        if len(self._buffer) > 1:
+                            if self._buffer[-2] == "\r":
+                                self._buffer = self._buffer[:-2]
+
+                                # ignore if we just got \r\n with nothing else in the buffer.
+                                if len(self._buffer) != 0:
+                                    got_line = True
+                                    break
+                        else:
+                            self._buffer = self._buffer[:-1]
+
+                time.sleep(0.001)
+
+        except (OSError, serial.SerialException), err:
+            timer.cancel()
+
+            raise util.CommError('Error reading from AD2SERIAL device: {0}'.format(str(err)))
+        else:
+            if got_line:
+                ret = self._buffer
+                self._buffer = ''
+
+                self.on_read(ret)
+
+        if timer:
+            if timer.is_alive():
+                timer.cancel()
+            else:
+                raise util.TimeoutError('Timeout while waiting for line terminator.')
+
+        return ret
+

+
[docs]class SocketDevice(Device):
+    """
+    Device that supports communication with an AD2USB that is exposed via ser2sock or another
+    Serial to IP interface.
+    """
+
+    def __init__(self, interface=("localhost", 10000)):
+        """
+        Constructor
+        """
+        Device.__init__(self)
+
+        self._interface = interface
+        self._host, self._port = interface
+
+
[docs]    def open(self, baudrate=None, interface=None, index=0, no_reader_thread=False):
+        """
+        Opens the device.
+        """
+        if interface is not None:
+            self._interface = interface
+            self._host, self._port = interface
+
+        try:
+            self._device = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            self._device.connect((self._host, self._port))
+
+            self._id = '{0}:{1}'.format(self._host, self._port)
+
+        except socket.error, err:
+            self.on_close()
+
+            raise util.NoDeviceError('Error opening AD2SOCKET device at {0}:{1}'.format(self._host, self._port))
+        else:
+            self._running = True
+
+            self.on_open(('N/A', "AD2SOCKET"))
+
+            if not no_reader_thread:
+                self._read_thread.start()
+

+
[docs]    def close(self):
+        """
+        Closes the device.
+        """
+        self._running = False
+
+        try:
+            self._read_thread.stop()
+            self._device.shutdown(socket.SHUT_RDWR)     # Make sure that it closes immediately.
+            self._device.close()
+        except:
+            pass
+
+        self.on_close()
+

+
[docs]    def write(self, data):
+        """
+        Writes data to the device.
+        """
+        data_sent = self._device.send(data)
+
+        if data_sent == 0:
+            raise util.CommError('Error while sending data.')
+        else:
+            self.on_write(data)
+
+        return data_sent
+

+
[docs]    def read(self):
+        """
+        Reads a single character from the device.
+        """
+        try:
+            data = self._device.recv(1)
+        except socket.error, err:
+            raise util.CommError('Error while reading from device: {0}'.format(str(err)))
+
+        return data
+

+
[docs]    def read_line(self, timeout=0.0):
+        """
+        Reads a line from the device.
+        """
+        def timeout_event():
+            timeout_event.reading = False
+
+        timeout_event.reading = True
+
+        got_line = False
+        ret = None
+
+        timer = None
+        if timeout > 0:
+            timer = threading.Timer(timeout, timeout_event)
+            timer.start()
+
+        try:
+            while timeout_event.reading:
+                buf = self._device.recv(1)
+
+                if buf != '':
+                    self._buffer += buf
+
+                    if buf == "\n":
+                        if len(self._buffer) > 1:
+                            if self._buffer[-2] == "\r":
+                                self._buffer = self._buffer[:-2]
+
+                                # ignore if we just got \r\n with nothing else in the buffer.
+                                if len(self._buffer) != 0:
+                                    got_line = True
+                                    break
+                        else:
+                            self._buffer = self._buffer[:-1]
+
+                time.sleep(0.001)
+
+        except socket.error, err:
+            timer.cancel()
+
+            raise util.CommError('Error reading from Socket device: {0}'.format(str(err)))
+        else:
+            if got_line:
+                ret = self._buffer
+                self._buffer = ''
+
+                self.on_read(ret)
+
+        if timer:
+            if timer.is_alive():
+                timer.cancel()
+            else:
+                raise util.TimeoutError('Timeout while waiting for line terminator.')
+
+        return ret

+
+ +
+
+
+
+
+ + +
+
+
+
+
+

Navigation

+ +
+
+ © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
+ + \ No newline at end of file diff --git a/docs/_build/html/_modules/pyad2usb/event/event.html b/docs/_build/html/_modules/pyad2usb/event/event.html new file mode 100644 index 0000000..a106fe7 --- /dev/null +++ b/docs/_build/html/_modules/pyad2usb/event/event.html @@ -0,0 +1,163 @@ + + + + + + + + pyad2usb.event.event — pyad2usb documentation + + + + + + + + + + + + +
+

Navigation

+ +
+ +
+
+
+
+ +

Source code for pyad2usb.event.event

+# event.py (improved)
+
+
[docs]class Event(object):
+
+    def __init__(self, doc=None):
+        self.__doc__ = doc
+
+    def __get__(self, obj, objtype=None):
+        if obj is None:
+            return self
+        return EventHandler(self, obj)
+
+    def __set__(self, obj, value):
+        pass
+
+

+
[docs]class EventHandler(object):
+
+    def __init__(self, event, obj):
+
+        self.event = event
+        self.obj = obj
+
+    def _getfunctionlist(self):
+
+        """(internal use) """
+
+        try:
+            eventhandler = self.obj.__eventhandler__
+        except AttributeError:
+            eventhandler = self.obj.__eventhandler__ = {}
+        return eventhandler.setdefault(self.event, [])
+
+
[docs]    def add(self, func):
+
+        """Add new event handler function.
+
+        Event handler function must be defined like func(sender, earg).
+        You can add handler also by using '+=' operator.
+        """
+
+        self._getfunctionlist().append(func)
+        return self
+

+
[docs]    def remove(self, func):
+
+        """Remove existing event handler function.
+
+        You can remove handler also by using '-=' operator.
+        """
+
+        self._getfunctionlist().remove(func)
+        return self
+

+
[docs]    def fire(self, earg=None):
+
+        """Fire event and call all handler functions
+
+        You can call EventHandler object itself like e(earg) instead of
+        e.fire(earg).
+        """
+
+        for func in self._getfunctionlist():
+            if type(func) == EventHandler:
+                func.fire(earg)
+            else:
+                func(self.obj, earg)
+

+    __iadd__ = add
+    __isub__ = remove
+    __call__ = fire

+
+ +
+
+
+
+
+ + +
+
+
+
+
+

Navigation

+ +
+
+ © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
+ + \ No newline at end of file diff --git a/docs/_build/html/_modules/pyad2usb/util.html b/docs/_build/html/_modules/pyad2usb/util.html new file mode 100644 index 0000000..9afc543 --- /dev/null +++ b/docs/_build/html/_modules/pyad2usb/util.html @@ -0,0 +1,230 @@ + + + + + + + + pyad2usb.util — pyad2usb documentation + + + + + + + + + + + + +
+

Navigation

+ +
+ +
+
+
+
+ +

Source code for pyad2usb.util

+"""
+Provides utility classes for the AD2USB devices.
+"""
+
+import ad2usb
+import time
+import traceback
+import threading
+
+
[docs]class NoDeviceError(Exception):
+    """
+    No devices found.
+    """
+    pass
+

+
[docs]class CommError(Exception):
+    """
+    There was an error communicating with the device.
+    """
+    pass
+

+
[docs]class TimeoutError(Exception):
+    """
+    There was a timeout while trying to communicate with the device.
+    """
+    pass
+

+
[docs]class InvalidMessageError(Exception):
+    """
+    The format of the panel message was invalid.
+    """
+    pass
+

+
[docs]class Firmware(object):
+    """
+    Represents firmware for the AD2USB/AD2SERIAL devices.
+    """
+
+    # Constants
+    STAGE_START = 0
+    STAGE_WAITING = 1
+    STAGE_BOOT = 2
+    STAGE_LOAD = 3
+    STAGE_UPLOADING = 4
+    STAGE_DONE = 5
+
+    @staticmethod
+
[docs]    def upload(dev, filename, progress_callback=None):
+        """
+        Uploads firmware to an AD2USB/AD2SERIAL device.
+        """
+
+        def do_upload():
+            """
+            Perform the actual firmware upload to the device.
+            """
+            with open(filename) as f:
+                for line in f:
+                    line = line.rstrip()
+
+                    if line[0] == ':':
+                        dev.write(line + "\r")
+                        res = dev.read_line(timeout=10.0)
+
+                        if progress_callback is not None:
+                            progress_callback(Firmware.STAGE_UPLOADING)
+
+                        time.sleep(0.05)
+
+        def read_until(pattern, timeout=0.0):
+            """
+            Read characters until a specific pattern is found or the timeout is hit.
+            """
+            def timeout_event():
+                timeout_event.reading = False
+
+            timeout_event.reading = True
+
+            timer = None
+            if timeout > 0:
+                timer = threading.Timer(timeout, timeout_event)
+                timer.start()
+
+            buf = ''
+            position = 0
+
+            while timeout_event.reading:
+                try:
+                    char = dev.read()
+
+                    if char is not None and char != '':
+                        if char == pattern[position]:
+                            position = position + 1
+                            if position == len(pattern):
+                                break
+                        else:
+                            position = 0
+
+                except Exception, err:
+                    pass
+
+            if timer:
+                if timer.is_alive():
+                    timer.cancel()
+                else:
+                    raise TimeoutError('Timeout while waiting for line terminator.')
+
+        def stage_callback(stage):
+            if progress_callback is not None:
+                progress_callback(stage)
+
+        if dev is None:
+            raise NoDeviceError('No device specified for firmware upload.')
+
+        stage_callback(Firmware.STAGE_START)
+
+        if dev.is_reader_alive():
+            # Close the reader thread and wait for it to die, otherwise
+            # it interferes with our reading.
+            dev.stop_reader()
+            while dev._read_thread.is_alive():
+                stage_callback(Firmware.STAGE_WAITING)
+                time.sleep(1)
+
+        # Reboot the device and wait for the boot loader.
+        stage_callback(Firmware.STAGE_BOOT)
+        dev.write("=")
+        read_until('!boot', timeout=15.0)
+
+        # Get ourselves into the boot loader and wait for indication
+        # that it's ready for the firmware upload.
+        stage_callback(Firmware.STAGE_LOAD)
+        dev.write("=")
+        read_until('!load', timeout=15.0)
+
+        # And finally do the upload.
+        do_upload()
+        stage_callback(Firmware.STAGE_DONE)

+
+ +
+
+
+
+
+ + +
+
+
+
+
+

Navigation

+ +
+
+ © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
+ + \ No newline at end of file diff --git a/docs/_build/html/_sources/index.txt b/docs/_build/html/_sources/index.txt new file mode 100644 index 0000000..6085464 --- /dev/null +++ b/docs/_build/html/_sources/index.txt @@ -0,0 +1,23 @@ +.. pyad2usb documentation master file, created by + sphinx-quickstart on Sat Jun 8 14:38:46 2013. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to pyad2usb's documentation! +==================================== + +Contents: + +.. toctree:: + :maxdepth: 4 + + pyad2usb + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/docs/_build/html/_sources/modules.txt b/docs/_build/html/_sources/modules.txt new file mode 100644 index 0000000..34e82c9 --- /dev/null +++ b/docs/_build/html/_sources/modules.txt @@ -0,0 +1,7 @@ +pyad2usb +======== + +.. toctree:: + :maxdepth: 4 + + pyad2usb diff --git a/docs/_build/html/_sources/pyad2usb.event.txt b/docs/_build/html/_sources/pyad2usb.event.txt new file mode 100644 index 0000000..565d5a3 --- /dev/null +++ b/docs/_build/html/_sources/pyad2usb.event.txt @@ -0,0 +1,19 @@ +event Package +============= + +:mod:`event` Package +-------------------- + +.. automodule:: pyad2usb.event + :members: + :undoc-members: + :show-inheritance: + +:mod:`event` Module +------------------- + +.. automodule:: pyad2usb.event.event + :members: + :undoc-members: + :show-inheritance: + diff --git a/docs/_build/html/_sources/pyad2usb.txt b/docs/_build/html/_sources/pyad2usb.txt new file mode 100644 index 0000000..08dfd6b --- /dev/null +++ b/docs/_build/html/_sources/pyad2usb.txt @@ -0,0 +1,42 @@ +pyad2usb Package +================ + +:mod:`pyad2usb` Package +----------------------- + +.. automodule:: pyad2usb.__init__ + :members: + :undoc-members: + :show-inheritance: + +:mod:`ad2usb` Module +-------------------- + +.. automodule:: pyad2usb.ad2usb + :members: + :undoc-members: + :show-inheritance: + +:mod:`devices` Module +--------------------- + +.. automodule:: pyad2usb.devices + :members: + :undoc-members: + :show-inheritance: + +:mod:`util` Module +------------------ + +.. automodule:: pyad2usb.util + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + + pyad2usb.event + diff --git a/docs/_build/html/_static/ajax-loader.gif b/docs/_build/html/_static/ajax-loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..61faf8cab23993bd3e1560bff0668bd628642330 GIT binary patch literal 673 zcmZ?wbhEHb6krfw_{6~Q|Nno%(3)e{?)x>&1u}A`t?OF7Z|1gRivOgXi&7IyQd1Pl zGfOfQ60;I3a`F>X^fL3(@);C=vM_KlFfb_o=k{|A33hf2a5d61U}gjg=>Rd%XaNQW zW@Cw{|b%Y*pl8F?4B9 zlo4Fz*0kZGJabY|>}Okf0}CCg{u4`zEPY^pV?j2@h+|igy0+Kz6p;@SpM4s6)XEMg z#3Y4GX>Hjlml5ftdH$4x0JGdn8~MX(U~_^d!Hi)=HU{V%g+mi8#UGbE-*ao8f#h+S z2a0-5+vc7MU$e-NhmBjLIC1v|)9+Im8x1yacJ7{^tLX(ZhYi^rpmXm0`@ku9b53aN zEXH@Y3JaztblgpxbJt{AtE1ad1Ca>{v$rwwvK(>{m~Gf_=-Ro7Fk{#;i~+{{>QtvI yb2P8Zac~?~=sRA>$6{!(^3;ZP0TPFR(G_-UDU(8Jl0?(IXu$~#4A!880|o%~Al1tN literal 0 HcmV?d00001 diff --git a/docs/_build/html/_static/basic.css b/docs/_build/html/_static/basic.css new file mode 100644 index 0000000..a04c8e1 --- /dev/null +++ b/docs/_build/html/_static/basic.css @@ -0,0 +1,540 @@ +/* + * basic.css + * ~~~~~~~~~ + * + * Sphinx stylesheet -- basic theme. + * + * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + +/* -- main layout ----------------------------------------------------------- */ + +div.clearer { + clear: both; +} + +/* -- relbar ---------------------------------------------------------------- */ + +div.related { + width: 100%; + font-size: 90%; +} + +div.related h3 { + display: none; +} + +div.related ul { + margin: 0; + padding: 0 0 0 10px; + list-style: none; +} + +div.related li { + display: inline; +} + +div.related li.right { + float: right; + margin-right: 5px; +} + +/* -- sidebar --------------------------------------------------------------- */ + +div.sphinxsidebarwrapper { + padding: 10px 5px 0 10px; +} + +div.sphinxsidebar { + float: left; + width: 230px; + margin-left: -100%; + font-size: 90%; +} + +div.sphinxsidebar ul { + list-style: none; +} + +div.sphinxsidebar ul ul, +div.sphinxsidebar ul.want-points { + margin-left: 20px; + list-style: square; +} + +div.sphinxsidebar ul ul { + margin-top: 0; + margin-bottom: 0; +} + +div.sphinxsidebar form { + margin-top: 10px; +} + +div.sphinxsidebar input { + border: 1px solid #98dbcc; + font-family: sans-serif; + font-size: 1em; +} + +div.sphinxsidebar #searchbox input[type="text"] { + width: 170px; +} + +div.sphinxsidebar #searchbox input[type="submit"] { + width: 30px; +} + +img { + border: 0; +} + +/* -- search page ----------------------------------------------------------- */ + +ul.search { + margin: 10px 0 0 20px; + padding: 0; +} + +ul.search li { + padding: 5px 0 5px 20px; + background-image: url(file.png); + background-repeat: no-repeat; + background-position: 0 7px; +} + +ul.search li a { + font-weight: bold; +} + +ul.search li div.context { + color: #888; + margin: 2px 0 0 30px; + text-align: left; +} + +ul.keywordmatches li.goodmatch a { + font-weight: bold; +} + +/* -- index page ------------------------------------------------------------ */ + +table.contentstable { + width: 90%; +} + +table.contentstable p.biglink { + line-height: 150%; +} + +a.biglink { + font-size: 1.3em; +} + +span.linkdescr { + font-style: italic; + padding-top: 5px; + font-size: 90%; +} + +/* -- general index --------------------------------------------------------- */ + +table.indextable { + width: 100%; +} + +table.indextable td { + text-align: left; + vertical-align: top; +} + +table.indextable dl, table.indextable dd { + margin-top: 0; + margin-bottom: 0; +} + +table.indextable tr.pcap { + height: 10px; +} + +table.indextable tr.cap { + margin-top: 10px; + background-color: #f2f2f2; +} + +img.toggler { + margin-right: 3px; + margin-top: 3px; + cursor: pointer; +} + +div.modindex-jumpbox { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin: 1em 0 1em 0; + padding: 0.4em; +} + +div.genindex-jumpbox { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin: 1em 0 1em 0; + padding: 0.4em; +} + +/* -- general body styles --------------------------------------------------- */ + +a.headerlink { + visibility: hidden; +} + +h1:hover > a.headerlink, +h2:hover > a.headerlink, +h3:hover > a.headerlink, +h4:hover > a.headerlink, +h5:hover > a.headerlink, +h6:hover > a.headerlink, +dt:hover > a.headerlink { + visibility: visible; +} + +div.body p.caption { + text-align: inherit; +} + +div.body td { + text-align: left; +} + +.field-list ul { + padding-left: 1em; +} + +.first { + margin-top: 0 !important; +} + +p.rubric { + margin-top: 30px; + font-weight: bold; +} + +img.align-left, .figure.align-left, object.align-left { + clear: left; + float: left; + margin-right: 1em; +} + +img.align-right, .figure.align-right, object.align-right { + clear: right; + float: right; + margin-left: 1em; +} + +img.align-center, .figure.align-center, object.align-center { + display: block; + margin-left: auto; + margin-right: auto; +} + +.align-left { + text-align: left; +} + +.align-center { + text-align: center; +} + +.align-right { + text-align: right; +} + +/* -- sidebars -------------------------------------------------------------- */ + +div.sidebar { + margin: 0 0 0.5em 1em; + border: 1px solid #ddb; + padding: 7px 7px 0 7px; + background-color: #ffe; + width: 40%; + float: right; +} + +p.sidebar-title { + font-weight: bold; +} + +/* -- topics ---------------------------------------------------------------- */ + +div.topic { + border: 1px solid #ccc; + padding: 7px 7px 0 7px; + margin: 10px 0 10px 0; +} + +p.topic-title { + font-size: 1.1em; + font-weight: bold; + margin-top: 10px; +} + +/* -- admonitions ----------------------------------------------------------- */ + +div.admonition { + margin-top: 10px; + margin-bottom: 10px; + padding: 7px; +} + +div.admonition dt { + font-weight: bold; +} + +div.admonition dl { + margin-bottom: 0; +} + +p.admonition-title { + margin: 0px 10px 5px 0px; + font-weight: bold; +} + +div.body p.centered { + text-align: center; + margin-top: 25px; +} + +/* -- tables ---------------------------------------------------------------- */ + +table.docutils { + border: 0; + border-collapse: collapse; +} + +table.docutils td, table.docutils th { + padding: 1px 8px 1px 5px; + border-top: 0; + border-left: 0; + border-right: 0; + border-bottom: 1px solid #aaa; +} + +table.field-list td, table.field-list th { + border: 0 !important; +} + +table.footnote td, table.footnote th { + border: 0 !important; +} + +th { + text-align: left; + padding-right: 5px; +} + +table.citation { + border-left: solid 1px gray; + margin-left: 1px; +} + +table.citation td { + border-bottom: none; +} + +/* -- other body styles ----------------------------------------------------- */ + +ol.arabic { + list-style: decimal; +} + +ol.loweralpha { + list-style: lower-alpha; +} + +ol.upperalpha { + list-style: upper-alpha; +} + +ol.lowerroman { + list-style: lower-roman; +} + +ol.upperroman { + list-style: upper-roman; +} + +dl { + margin-bottom: 15px; +} + +dd p { + margin-top: 0px; +} + +dd ul, dd table { + margin-bottom: 10px; +} + +dd { + margin-top: 3px; + margin-bottom: 10px; + margin-left: 30px; +} + +dt:target, .highlighted { + background-color: #fbe54e; +} + +dl.glossary dt { + font-weight: bold; + font-size: 1.1em; +} + +.field-list ul { + margin: 0; + padding-left: 1em; +} + +.field-list p { + margin: 0; +} + +.refcount { + color: #060; +} + +.optional { + font-size: 1.3em; +} + +.versionmodified { + font-style: italic; +} + +.system-message { + background-color: #fda; + padding: 5px; + border: 3px solid red; +} + +.footnote:target { + background-color: #ffa; +} + +.line-block { + display: block; + margin-top: 1em; + margin-bottom: 1em; +} + +.line-block .line-block { + margin-top: 0; + margin-bottom: 0; + margin-left: 1.5em; +} + +.guilabel, .menuselection { + font-family: sans-serif; +} + +.accelerator { + text-decoration: underline; +} + +.classifier { + font-style: oblique; +} + +abbr, acronym { + border-bottom: dotted 1px; + cursor: help; +} + +/* -- code displays --------------------------------------------------------- */ + +pre { + overflow: auto; + overflow-y: hidden; /* fixes display issues on Chrome browsers */ +} + +td.linenos pre { + padding: 5px 0px; + border: 0; + background-color: transparent; + color: #aaa; +} + +table.highlighttable { + margin-left: 0.5em; +} + +table.highlighttable td { + padding: 0 0.5em 0 0.5em; +} + +tt.descname { + background-color: transparent; + font-weight: bold; + font-size: 1.2em; +} + +tt.descclassname { + background-color: transparent; +} + +tt.xref, a tt { + background-color: transparent; + font-weight: bold; +} + +h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { + background-color: transparent; +} + +.viewcode-link { + float: right; +} + +.viewcode-back { + float: right; + font-family: sans-serif; +} + +div.viewcode-block:target { + margin: -1px -10px; + padding: 0 10px; +} + +/* -- math display ---------------------------------------------------------- */ + +img.math { + vertical-align: middle; +} + +div.body div.math p { + text-align: center; +} + +span.eqno { + float: right; +} + +/* -- printout stylesheet --------------------------------------------------- */ + +@media print { + div.document, + div.documentwrapper, + div.bodywrapper { + margin: 0 !important; + width: 100%; + } + + div.sphinxsidebar, + div.related, + div.footer, + #top-link { + display: none; + } +} \ No newline at end of file diff --git a/docs/_build/html/_static/comment-bright.png b/docs/_build/html/_static/comment-bright.png new file mode 100644 index 0000000000000000000000000000000000000000..551517b8c83b76f734ff791f847829a760ad1903 GIT binary patch literal 3500 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 A2LJ#7 literal 0 HcmV?d00001 diff --git a/docs/_build/html/_static/comment.png b/docs/_build/html/_static/comment.png new file mode 100644 index 0000000000000000000000000000000000000000..92feb52b8824c6b0f59b658b1196c61de9162a95 GIT binary patch literal 3445 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 Xn!ZpXD%P(H00000NkvXXu0mjf= 0 && !jQuery(node.parentNode).hasClass(className)) { + var span = document.createElement("span"); + span.className = className; + span.appendChild(document.createTextNode(val.substr(pos, text.length))); + node.parentNode.insertBefore(span, node.parentNode.insertBefore( + document.createTextNode(val.substr(pos + text.length)), + node.nextSibling)); + node.nodeValue = val.substr(0, pos); + } + } + else if (!jQuery(node).is("button, select, textarea")) { + jQuery.each(node.childNodes, function() { + highlight(this); + }); + } + } + return this.each(function() { + highlight(this); + }); +}; + +/** + * Small JavaScript module for the documentation. + */ +var Documentation = { + + init : function() { + this.fixFirefoxAnchorBug(); + this.highlightSearchWords(); + this.initIndexTable(); + }, + + /** + * i18n support + */ + TRANSLATIONS : {}, + PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; }, + LOCALE : 'unknown', + + // gettext and ngettext don't access this so that the functions + // can safely bound to a different name (_ = Documentation.gettext) + gettext : function(string) { + var translated = Documentation.TRANSLATIONS[string]; + if (typeof translated == 'undefined') + return string; + return (typeof translated == 'string') ? translated : translated[0]; + }, + + ngettext : function(singular, plural, n) { + var translated = Documentation.TRANSLATIONS[singular]; + if (typeof translated == 'undefined') + return (n == 1) ? singular : plural; + return translated[Documentation.PLURALEXPR(n)]; + }, + + addTranslations : function(catalog) { + for (var key in catalog.messages) + this.TRANSLATIONS[key] = catalog.messages[key]; + this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')'); + this.LOCALE = catalog.locale; + }, + + /** + * add context elements like header anchor links + */ + addContextElements : function() { + $('div[id] > :header:first').each(function() { + $('\u00B6'). + attr('href', '#' + this.id). + attr('title', _('Permalink to this headline')). + appendTo(this); + }); + $('dt[id]').each(function() { + $('\u00B6'). + attr('href', '#' + this.id). + attr('title', _('Permalink to this definition')). + appendTo(this); + }); + }, + + /** + * workaround a firefox stupidity + */ + fixFirefoxAnchorBug : function() { + if (document.location.hash && $.browser.mozilla) + window.setTimeout(function() { + document.location.href += ''; + }, 10); + }, + + /** + * highlight the search words provided in the url in the text + */ + highlightSearchWords : function() { + var params = $.getQueryParameters(); + var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : []; + if (terms.length) { + var body = $('div.body'); + window.setTimeout(function() { + $.each(terms, function() { + body.highlightText(this.toLowerCase(), 'highlighted'); + }); + }, 10); + $('

' + _('Hide Search Matches') + '

') + .appendTo($('#searchbox')); + } + }, + + /** + * init the domain index toggle buttons + */ + initIndexTable : function() { + var togglers = $('img.toggler').click(function() { + var src = $(this).attr('src'); + var idnum = $(this).attr('id').substr(7); + $('tr.cg-' + idnum).toggle(); + if (src.substr(-9) == 'minus.png') + $(this).attr('src', src.substr(0, src.length-9) + 'plus.png'); + else + $(this).attr('src', src.substr(0, src.length-8) + 'minus.png'); + }).css('display', ''); + if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) { + togglers.click(); + } + }, + + /** + * helper function to hide the search marks again + */ + hideSearchWords : function() { + $('#searchbox .highlight-link').fadeOut(300); + $('span.highlighted').removeClass('highlighted'); + }, + + /** + * make the url absolute + */ + makeURL : function(relativeURL) { + return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL; + }, + + /** + * get the current relative url + */ + getCurrentURL : function() { + var path = document.location.pathname; + var parts = path.split(/\//); + $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() { + if (this == '..') + parts.pop(); + }); + var url = parts.join('/'); + return path.substring(url.lastIndexOf('/') + 1, path.length - 1); + } +}; + +// quick alias for translations +_ = Documentation.gettext; + +$(document).ready(function() { + Documentation.init(); +}); diff --git a/docs/_build/html/_static/down-pressed.png b/docs/_build/html/_static/down-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..6f7ad782782e4f8e39b0c6e15c7344700cdd2527 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}Z23@f-Ava~9&<9T!#}JFtXD=!G zGdl{fK6ro2OGiOl+hKvH6i=D3%%Y^j`yIkRn!8O>@bG)IQR0{Kf+mxNd=_WScA8u_ z3;8(7x2){m9`nt+U(Nab&1G)!{`SPVpDX$w8McLTzAJ39wprG3p4XLq$06M`%}2Yk zRPPsbES*dnYm1wkGL;iioAUB*Or2kz6(-M_r_#Me-`{mj$Z%( literal 0 HcmV?d00001 diff --git a/docs/_build/html/_static/down.png b/docs/_build/html/_static/down.png new file mode 100644 index 0000000000000000000000000000000000000000..3003a88770de3977d47a2ba69893436a2860f9e7 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}xaV3tUZ$qnrLa#kt978NlpS`ru z&)HFc^}^>{UOEce+71h5nn>6&w6A!ieNbu1wh)UGh{8~et^#oZ1# z>T7oM=FZ~xXWnTo{qnXm$ZLOlqGswI_m2{XwVK)IJmBjW{J3-B3x@C=M{ShWt#fYS9M?R;8K$~YwlIqwf>VA7q=YKcwf2DS4Zj5inDKXXB1zl=(YO3ST6~rDq)&z z*o>z)=hxrfG-cDBW0G$!?6{M<$@{_4{m1o%Ub!naEtn|@^frU1tDnm{r-UW|!^@B8 literal 0 HcmV?d00001 diff --git a/docs/_build/html/_static/file.png b/docs/_build/html/_static/file.png new file mode 100644 index 0000000000000000000000000000000000000000..d18082e397e7e54f20721af768c4c2983258f1b4 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP$HyOL$D9)yc9|lc|nKf<9@eUiWd>3GuTC!a5vdfWYEazjncPj5ZQX%+1 zt8B*4=d)!cdDz4wr^#OMYfqGz$1LDFF>|#>*O?AGil(WEs?wLLy{Gj2J_@opDm%`dlax3yA*@*N$G&*ukFv>P8+2CBWO(qz zD0k1@kN>hhb1_6`&wrCswzINE(evt-5C1B^STi2@PmdKI;Vst0PQB6!2kdN literal 0 HcmV?d00001 diff --git a/docs/_build/html/_static/jquery.js b/docs/_build/html/_static/jquery.js new file mode 100644 index 0000000..198b3ff --- /dev/null +++ b/docs/_build/html/_static/jquery.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/docs/_build/html/_static/minus.png b/docs/_build/html/_static/minus.png new file mode 100644 index 0000000000000000000000000000000000000000..da1c5620d10c047525a467a425abe9ff5269cfc2 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1SHkYJtzcHoCO|{#XvD(5N2eUHAey{$X?>< z>&kweokM_|(Po{+Q=kw>iEBiObAE1aYF-J$w=>iB1I2R$WLpMkF=>bh=@O1TaS?83{1OVknK< z>&kweokM`jkU7Va11Q8%;u=xnoS&PUnpeW`?aZ|OK(QcC7sn8Z%gHvy&v=;Q4jejg zV8NnAO`-4Z@2~&zopr02WF_WB>pF literal 0 HcmV?d00001 diff --git a/docs/_build/html/_static/pygments.css b/docs/_build/html/_static/pygments.css new file mode 100644 index 0000000..d79caa1 --- /dev/null +++ b/docs/_build/html/_static/pygments.css @@ -0,0 +1,62 @@ +.highlight .hll { background-color: #ffffcc } +.highlight { background: #eeffcc; } +.highlight .c { color: #408090; font-style: italic } /* Comment */ +.highlight .err { border: 1px solid #FF0000 } /* Error */ +.highlight .k { color: #007020; font-weight: bold } /* Keyword */ +.highlight .o { color: #666666 } /* Operator */ +.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #007020 } /* Comment.Preproc */ +.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */ +.highlight .gd { color: #A00000 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #FF0000 } /* Generic.Error */ +.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.highlight .gi { color: #00A000 } /* Generic.Inserted */ +.highlight .go { color: #333333 } /* Generic.Output */ +.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.highlight .gt { color: #0044DD } /* Generic.Traceback */ +.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */ +.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */ +.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */ +.highlight .kp { color: #007020 } /* Keyword.Pseudo */ +.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #902000 } /* Keyword.Type */ +.highlight .m { color: #208050 } /* Literal.Number */ +.highlight .s { color: #4070a0 } /* Literal.String */ +.highlight .na { color: #4070a0 } /* Name.Attribute */ +.highlight .nb { color: #007020 } /* Name.Builtin */ +.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */ +.highlight .no { color: #60add5 } /* Name.Constant */ +.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */ +.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */ +.highlight .ne { color: #007020 } /* Name.Exception */ +.highlight .nf { color: #06287e } /* Name.Function */ +.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */ +.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */ +.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */ +.highlight .nv { color: #bb60d5 } /* Name.Variable */ +.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mf { color: #208050 } /* Literal.Number.Float */ +.highlight .mh { color: #208050 } /* Literal.Number.Hex */ +.highlight .mi { color: #208050 } /* Literal.Number.Integer */ +.highlight .mo { color: #208050 } /* Literal.Number.Oct */ +.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */ +.highlight .sc { color: #4070a0 } /* Literal.String.Char */ +.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */ +.highlight .s2 { color: #4070a0 } /* Literal.String.Double */ +.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */ +.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */ +.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */ +.highlight .sx { color: #c65d09 } /* Literal.String.Other */ +.highlight .sr { color: #235388 } /* Literal.String.Regex */ +.highlight .s1 { color: #4070a0 } /* Literal.String.Single */ +.highlight .ss { color: #517918 } /* Literal.String.Symbol */ +.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */ +.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */ +.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */ +.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */ \ No newline at end of file diff --git a/docs/_build/html/_static/searchtools.js b/docs/_build/html/_static/searchtools.js new file mode 100644 index 0000000..56676b2 --- /dev/null +++ b/docs/_build/html/_static/searchtools.js @@ -0,0 +1,622 @@ +/* + * searchtools.js_t + * ~~~~~~~~~~~~~~~~ + * + * Sphinx JavaScript utilties for the full-text search. + * + * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + + +/** + * Porter Stemmer + */ +var Stemmer = function() { + + var step2list = { + ational: 'ate', + tional: 'tion', + enci: 'ence', + anci: 'ance', + izer: 'ize', + bli: 'ble', + alli: 'al', + entli: 'ent', + eli: 'e', + ousli: 'ous', + ization: 'ize', + ation: 'ate', + ator: 'ate', + alism: 'al', + iveness: 'ive', + fulness: 'ful', + ousness: 'ous', + aliti: 'al', + iviti: 'ive', + biliti: 'ble', + logi: 'log' + }; + + var step3list = { + icate: 'ic', + ative: '', + alize: 'al', + iciti: 'ic', + ical: 'ic', + ful: '', + ness: '' + }; + + var c = "[^aeiou]"; // consonant + var v = "[aeiouy]"; // vowel + var C = c + "[^aeiouy]*"; // consonant sequence + var V = v + "[aeiou]*"; // vowel sequence + + var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0 + var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1 + var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1 + var s_v = "^(" + C + ")?" + v; // vowel in stem + + this.stemWord = function (w) { + var stem; + var suffix; + var firstch; + var origword = w; + + if (w.length < 3) + return w; + + var re; + var re2; + var re3; + var re4; + + firstch = w.substr(0,1); + if (firstch == "y") + w = firstch.toUpperCase() + w.substr(1); + + // Step 1a + re = /^(.+?)(ss|i)es$/; + re2 = /^(.+?)([^s])s$/; + + if (re.test(w)) + w = w.replace(re,"$1$2"); + else if (re2.test(w)) + w = w.replace(re2,"$1$2"); + + // Step 1b + re = /^(.+?)eed$/; + re2 = /^(.+?)(ed|ing)$/; + if (re.test(w)) { + var fp = re.exec(w); + re = new RegExp(mgr0); + if (re.test(fp[1])) { + re = /.$/; + w = w.replace(re,""); + } + } + else if (re2.test(w)) { + var fp = re2.exec(w); + stem = fp[1]; + re2 = new RegExp(s_v); + if (re2.test(stem)) { + w = stem; + re2 = /(at|bl|iz)$/; + re3 = new RegExp("([^aeiouylsz])\\1$"); + re4 = new RegExp("^" + C + v + "[^aeiouwxy]$"); + if (re2.test(w)) + w = w + "e"; + else if (re3.test(w)) { + re = /.$/; + w = w.replace(re,""); + } + else if (re4.test(w)) + w = w + "e"; + } + } + + // Step 1c + re = /^(.+?)y$/; + if (re.test(w)) { + var fp = re.exec(w); + stem = fp[1]; + re = new RegExp(s_v); + if (re.test(stem)) + w = stem + "i"; + } + + // Step 2 + re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/; + if (re.test(w)) { + var fp = re.exec(w); + stem = fp[1]; + suffix = fp[2]; + re = new RegExp(mgr0); + if (re.test(stem)) + w = stem + step2list[suffix]; + } + + // Step 3 + re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/; + if (re.test(w)) { + var fp = re.exec(w); + stem = fp[1]; + suffix = fp[2]; + re = new RegExp(mgr0); + if (re.test(stem)) + w = stem + step3list[suffix]; + } + + // Step 4 + re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/; + re2 = /^(.+?)(s|t)(ion)$/; + if (re.test(w)) { + var fp = re.exec(w); + stem = fp[1]; + re = new RegExp(mgr1); + if (re.test(stem)) + w = stem; + } + else if (re2.test(w)) { + var fp = re2.exec(w); + stem = fp[1] + fp[2]; + re2 = new RegExp(mgr1); + if (re2.test(stem)) + w = stem; + } + + // Step 5 + re = /^(.+?)e$/; + if (re.test(w)) { + var fp = re.exec(w); + stem = fp[1]; + re = new RegExp(mgr1); + re2 = new RegExp(meq1); + re3 = new RegExp("^" + C + v + "[^aeiouwxy]$"); + if (re.test(stem) || (re2.test(stem) && !(re3.test(stem)))) + w = stem; + } + re = /ll$/; + re2 = new RegExp(mgr1); + if (re.test(w) && re2.test(w)) { + re = /.$/; + w = w.replace(re,""); + } + + // and turn initial Y back to y + if (firstch == "y") + w = firstch.toLowerCase() + w.substr(1); + return w; + } +} + + + +/** + * Simple result scoring code. + */ +var Scorer = { + // Implement the following function to further tweak the score for each result + // The function takes a result array [filename, title, anchor, descr, score] + // and returns the new score. + /* + score: function(result) { + return result[4]; + }, + */ + + // query matches the full name of an object + objNameMatch: 11, + // or matches in the last dotted part of the object name + objPartialMatch: 6, + // Additive scores depending on the priority of the object + objPrio: {0: 15, // used to be importantResults + 1: 5, // used to be objectResults + 2: -5}, // used to be unimportantResults + // Used when the priority is not in the mapping. + objPrioDefault: 0, + + // query found in title + title: 15, + // query found in terms + term: 5 +}; + + +/** + * Search Module + */ +var Search = { + + _index : null, + _queued_query : null, + _pulse_status : -1, + + init : function() { + var params = $.getQueryParameters(); + if (params.q) { + var query = params.q[0]; + $('input[name="q"]')[0].value = query; + this.performSearch(query); + } + }, + + loadIndex : function(url) { + $.ajax({type: "GET", url: url, data: null, + dataType: "script", cache: true, + complete: function(jqxhr, textstatus) { + if (textstatus != "success") { + document.getElementById("searchindexloader").src = url; + } + }}); + }, + + setIndex : function(index) { + var q; + this._index = index; + if ((q = this._queued_query) !== null) { + this._queued_query = null; + Search.query(q); + } + }, + + hasIndex : function() { + return this._index !== null; + }, + + deferQuery : function(query) { + this._queued_query = query; + }, + + stopPulse : function() { + this._pulse_status = 0; + }, + + startPulse : function() { + if (this._pulse_status >= 0) + return; + function pulse() { + var i; + Search._pulse_status = (Search._pulse_status + 1) % 4; + var dotString = ''; + for (i = 0; i < Search._pulse_status; i++) + dotString += '.'; + Search.dots.text(dotString); + if (Search._pulse_status > -1) + window.setTimeout(pulse, 500); + } + pulse(); + }, + + /** + * perform a search for something (or wait until index is loaded) + */ + performSearch : function(query) { + // create the required interface elements + this.out = $('#search-results'); + this.title = $('

' + _('Searching') + '

').appendTo(this.out); + this.dots = $('').appendTo(this.title); + this.status = $('

').appendTo(this.out); + this.output = $('
'); + } + // Prettify the comment rating. + comment.pretty_rating = comment.rating + ' point' + + (comment.rating == 1 ? '' : 's'); + // Make a class (for displaying not yet moderated comments differently) + comment.css_class = comment.displayed ? '' : ' moderate'; + // Create a div for this comment. + var context = $.extend({}, opts, comment); + var div = $(renderTemplate(commentTemplate, context)); + + // If the user has voted on this comment, highlight the correct arrow. + if (comment.vote) { + var direction = (comment.vote == 1) ? 'u' : 'd'; + div.find('#' + direction + 'v' + comment.id).hide(); + div.find('#' + direction + 'u' + comment.id).show(); + } + + if (opts.moderator || comment.text != '[deleted]') { + div.find('a.reply').show(); + if (comment.proposal_diff) + div.find('#sp' + comment.id).show(); + if (opts.moderator && !comment.displayed) + div.find('#cm' + comment.id).show(); + if (opts.moderator || (opts.username == comment.username)) + div.find('#dc' + comment.id).show(); + } + return div; + } + + /** + * A simple template renderer. Placeholders such as <%id%> are replaced + * by context['id'] with items being escaped. Placeholders such as <#id#> + * are not escaped. + */ + function renderTemplate(template, context) { + var esc = $(document.createElement('div')); + + function handle(ph, escape) { + var cur = context; + $.each(ph.split('.'), function() { + cur = cur[this]; + }); + return escape ? esc.text(cur || "").html() : cur; + } + + return template.replace(/<([%#])([\w\.]*)\1>/g, function() { + return handle(arguments[2], arguments[1] == '%' ? true : false); + }); + } + + /** Flash an error message briefly. */ + function showError(message) { + $(document.createElement('div')).attr({'class': 'popup-error'}) + .append($(document.createElement('div')) + .attr({'class': 'error-message'}).text(message)) + .appendTo('body') + .fadeIn("slow") + .delay(2000) + .fadeOut("slow"); + } + + /** Add a link the user uses to open the comments popup. */ + $.fn.comment = function() { + return this.each(function() { + var id = $(this).attr('id').substring(1); + var count = COMMENT_METADATA[id]; + var title = count + ' comment' + (count == 1 ? '' : 's'); + var image = count > 0 ? opts.commentBrightImage : opts.commentImage; + var addcls = count == 0 ? ' nocomment' : ''; + $(this) + .append( + $(document.createElement('a')).attr({ + href: '#', + 'class': 'sphinx-comment-open' + addcls, + id: 'ao' + id + }) + .append($(document.createElement('img')).attr({ + src: image, + alt: 'comment', + title: title + })) + .click(function(event) { + event.preventDefault(); + show($(this).attr('id').substring(2)); + }) + ) + .append( + $(document.createElement('a')).attr({ + href: '#', + 'class': 'sphinx-comment-close hidden', + id: 'ah' + id + }) + .append($(document.createElement('img')).attr({ + src: opts.closeCommentImage, + alt: 'close', + title: 'close' + })) + .click(function(event) { + event.preventDefault(); + hide($(this).attr('id').substring(2)); + }) + ); + }); + }; + + var opts = { + processVoteURL: '/_process_vote', + addCommentURL: '/_add_comment', + getCommentsURL: '/_get_comments', + acceptCommentURL: '/_accept_comment', + deleteCommentURL: '/_delete_comment', + commentImage: '/static/_static/comment.png', + closeCommentImage: '/static/_static/comment-close.png', + loadingImage: '/static/_static/ajax-loader.gif', + commentBrightImage: '/static/_static/comment-bright.png', + upArrow: '/static/_static/up.png', + downArrow: '/static/_static/down.png', + upArrowPressed: '/static/_static/up-pressed.png', + downArrowPressed: '/static/_static/down-pressed.png', + voting: false, + moderator: false + }; + + if (typeof COMMENT_OPTIONS != "undefined") { + opts = jQuery.extend(opts, COMMENT_OPTIONS); + } + + var popupTemplate = '\ +
\ +

\ + Sort by:\ + best rated\ + newest\ + oldest\ +

\ +
Comments
\ +
\ + loading comments...
\ +
    \ +
    \ +

    Add a comment\ + (markup):

    \ +
    \ + reStructured text markup: *emph*, **strong**, \ + ``code``, \ + code blocks: :: and an indented block after blank line
    \ +
    \ + \ +

    \ + \ + Propose a change ▹\ + \ + \ + Propose a change ▿\ + \ +

    \ + \ + \ + \ + \ + \ +
    \ +
    '; + + var commentTemplate = '\ +
    \ +
    \ +
    \ + \ + \ + \ + \ + \ + \ +
    \ +
    \ + \ + \ + \ + \ + \ + \ +
    \ +
    \ +
    \ +

    \ + <%username%>\ + <%pretty_rating%>\ + <%time.delta%>\ +

    \ +
    <#text#>
    \ +

    \ + \ + reply ▿\ + proposal ▹\ + proposal ▿\ + \ + \ +

    \ + 
    \
+<#proposal_diff#>\
+
    \ +
      \ +
      \ +
      \ +
      \ + '; + + var replyTemplate = '\ +
    • \ +
      \ +
      \ + \ + \ + \ + \ + \ + \ +
      \ +
      • '; + + $(document).ready(function() { + init(); + }); +})(jQuery); + +$(document).ready(function() { + // add comment anchors for all paragraphs that are commentable + $('.sphinx-has-comment').comment(); + + // highlight search words in search results + $("div.context").each(function() { + var params = $.getQueryParameters(); + var terms = (params.q) ? params.q[0].split(/\s+/) : []; + var result = $(this); + $.each(terms, function() { + result.highlightText(this.toLowerCase(), 'highlighted'); + }); + }); + + // directly open comment window if requested + var anchor = document.location.hash; + if (anchor.substring(0, 9) == '#comment-') { + $('#ao' + anchor.substring(9)).click(); + document.location.hash = '#s' + anchor.substring(9); + } +}); diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html new file mode 100644 index 0000000..e28beaf --- /dev/null +++ b/docs/_build/html/genindex.html @@ -0,0 +1,683 @@ + + + + + + + + + Index — pyad2usb documentation + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + + +

      Index

      + +
      + A + | B + | C + | D + | E + | F + | G + | I + | L + | M + | N + | O + | P + | R + | S + | T + | U + | W + | Z + +
      +

      A

      +
      + + +
      + +
      AD2USB (class in pyad2usb.ad2usb) +
      + +
      + +
      add() (pyad2usb.event.event.EventHandler method) +
      + +
      + +

      B

      + + +
      + +
      BAUDRATE (pyad2usb.devices.SerialDevice attribute) +
      + +
      + +
      (pyad2usb.devices.USBDevice attribute) +
      + +
      +
      + +

      C

      + + + +
      + +
      close() (pyad2usb.ad2usb.AD2USB method) +
      + +
      + +
      (pyad2usb.ad2usb.Overseer method) +
      + + +
      (pyad2usb.devices.SerialDevice method) +
      + + +
      (pyad2usb.devices.SocketDevice method) +
      + + +
      (pyad2usb.devices.USBDevice method) +
      + +
      + +
      CommError +
      + +
      + +
      create() (pyad2usb.ad2usb.Overseer class method) +
      + +
      + +

      D

      + + + +
      + +
      Device (class in pyad2usb.devices) +
      + + +
      Device.ReadThread (class in pyad2usb.devices) +
      + +
      + +
      devices() (pyad2usb.ad2usb.Overseer class method) +
      + +
      + +

      E

      + + + +
      + +
      Event (class in pyad2usb.event.event) +
      + + +
      EventHandler (class in pyad2usb.event.event) +
      + +
      + +
      ExpanderMessage (class in pyad2usb.ad2usb) +
      + +
      + +

      F

      + + + +
      + +
      F1 (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      F2 (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      F3 (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      F4 (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      find_all() (pyad2usb.ad2usb.Overseer class method) +
      + +
      + +
      (pyad2usb.devices.SerialDevice static method) +
      + + +
      (pyad2usb.devices.USBDevice static method) +
      + +
      +
      + +
      fire() (pyad2usb.event.event.EventHandler method) +
      + + +
      Firmware (class in pyad2usb.util) +
      + + +
      FTDI_PRODUCT_ID (pyad2usb.devices.USBDevice attribute) +
      + + +
      FTDI_VENDOR_ID (pyad2usb.devices.USBDevice attribute) +
      + +
      + +

      G

      + + + +
      + +
      get_config() (pyad2usb.ad2usb.AD2USB method) +
      + +
      + +
      get_device() (pyad2usb.ad2usb.Overseer method) +
      + +
      + +

      I

      + + + +
      + +
      id (pyad2usb.ad2usb.AD2USB attribute) +
      + +
      + +
      (pyad2usb.devices.Device attribute) +
      + +
      + +
      InvalidMessageError +
      + +
      + +
      is_reader_alive() (pyad2usb.devices.Device method) +
      + +
      + +

      L

      + + +
      + +
      LRRMessage (class in pyad2usb.ad2usb) +
      + +
      + +

      M

      + + +
      + +
      Message (class in pyad2usb.ad2usb) +
      + +
      + +

      N

      + + +
      + +
      NoDeviceError +
      + +
      + +

      O

      + + + +
      + +
      on_alarm (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      on_attached (pyad2usb.ad2usb.Overseer attribute) +
      + + +
      on_boot (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      on_bypass (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      on_close (pyad2usb.ad2usb.AD2USB attribute) +
      + +
      + +
      (pyad2usb.devices.Device attribute) +
      + +
      + +
      on_config_received (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      on_detached (pyad2usb.ad2usb.Overseer attribute) +
      + + +
      on_message (pyad2usb.ad2usb.AD2USB attribute) +
      + +
      + +
      on_open (pyad2usb.ad2usb.AD2USB attribute) +
      + +
      + +
      (pyad2usb.devices.Device attribute) +
      + +
      + +
      on_power_changed (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      on_read (pyad2usb.ad2usb.AD2USB attribute) +
      + +
      + +
      (pyad2usb.devices.Device attribute) +
      + +
      + +
      on_status_changed (pyad2usb.ad2usb.AD2USB attribute) +
      + + +
      on_write (pyad2usb.ad2usb.AD2USB attribute) +
      + +
      + +
      (pyad2usb.devices.Device attribute) +
      + +
      + +
      open() (pyad2usb.ad2usb.AD2USB method) +
      + +
      + +
      (pyad2usb.devices.SerialDevice method) +
      + + +
      (pyad2usb.devices.SocketDevice method) +
      + + +
      (pyad2usb.devices.USBDevice method) +
      + +
      + +
      Overseer (class in pyad2usb.ad2usb) +
      + + +
      Overseer.DetectThread (class in pyad2usb.ad2usb) +
      + +
      + +

      P

      + + + +
      + +
      pyad2usb.__init__ (module) +
      + + +
      pyad2usb.ad2usb (module) +
      + + +
      pyad2usb.devices (module) +
      + +
      + +
      pyad2usb.event (module) +
      + + +
      pyad2usb.event.event (module) +
      + + +
      pyad2usb.util (module) +
      + +
      + +

      R

      + + + +
      + +
      read() (pyad2usb.devices.SerialDevice method) +
      + +
      + +
      (pyad2usb.devices.SocketDevice method) +
      + + +
      (pyad2usb.devices.USBDevice method) +
      + +
      + +
      read_line() (pyad2usb.devices.SerialDevice method) +
      + +
      + +
      (pyad2usb.devices.SocketDevice method) +
      + + +
      (pyad2usb.devices.USBDevice method) +
      + +
      + +
      READ_TIMEOUT (pyad2usb.devices.Device.ReadThread attribute) +
      + + +
      reboot() (pyad2usb.ad2usb.AD2USB method) +
      + +
      + +
      RELAY (pyad2usb.ad2usb.ExpanderMessage attribute) +
      + + +
      remove() (pyad2usb.event.event.EventHandler method) +
      + + +
      RFMessage (class in pyad2usb.ad2usb) +
      + + +
      run() (pyad2usb.ad2usb.Overseer.DetectThread method) +
      + +
      + +
      (pyad2usb.devices.Device.ReadThread method) +
      + +
      +
      + +

      S

      + + + +
      + +
      SerialDevice (class in pyad2usb.devices) +
      + + +
      set_config() (pyad2usb.ad2usb.AD2USB method) +
      + + +
      SocketDevice (class in pyad2usb.devices) +
      + + +
      STAGE_BOOT (pyad2usb.util.Firmware attribute) +
      + + +
      STAGE_DONE (pyad2usb.util.Firmware attribute) +
      + + +
      STAGE_LOAD (pyad2usb.util.Firmware attribute) +
      + +
      + +
      STAGE_START (pyad2usb.util.Firmware attribute) +
      + + +
      STAGE_UPLOADING (pyad2usb.util.Firmware attribute) +
      + + +
      STAGE_WAITING (pyad2usb.util.Firmware attribute) +
      + + +
      start() (pyad2usb.ad2usb.Overseer method) +
      + + +
      stop() (pyad2usb.ad2usb.Overseer method) +
      + +
      + +
      (pyad2usb.ad2usb.Overseer.DetectThread method) +
      + + +
      (pyad2usb.devices.Device.ReadThread method) +
      + +
      + +
      stop_reader() (pyad2usb.devices.Device method) +
      + +
      + +

      T

      + + +
      + +
      TimeoutError +
      + +
      + +

      U

      + + + +
      + +
      upload() (pyad2usb.util.Firmware static method) +
      + +
      + +
      USBDevice (class in pyad2usb.devices) +
      + +
      + +

      W

      + + +
      + +
      write() (pyad2usb.devices.SerialDevice method) +
      + +
      + +
      (pyad2usb.devices.SocketDevice method) +
      + + +
      (pyad2usb.devices.USBDevice method) +
      + +
      +
      + +

      Z

      + + +
      + +
      ZONE (pyad2usb.ad2usb.ExpanderMessage attribute) +
      + +
      + + + + + + +
      +
      + + + + + +
      +
      +
      + +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html new file mode 100644 index 0000000..ffdf6a7 --- /dev/null +++ b/docs/_build/html/index.html @@ -0,0 +1,142 @@ + + + + + + + + Welcome to pyad2usb’s documentation! — pyad2usb documentation + + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + +
      +

      Welcome to pyad2usb’s documentation!¶

      +

      Contents:

      +
      + +
      +
      +
      +

      Indices and tables¶

      + +
      + + +
      +
      +
      +
      +
      +

      Table Of Contents

      + + +

      Next topic

      +

      pyad2usb Package

      +

      This Page

      + + + +
      +
      +
      +
      +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/modules.html b/docs/_build/html/modules.html new file mode 100644 index 0000000..7855c9a --- /dev/null +++ b/docs/_build/html/modules.html @@ -0,0 +1,115 @@ + + + + + + + + pyad2usb — pyad2usb documentation + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + + + + +
      +
      +
      +
      +
      +

      This Page

      + + + +
      +
      +
      +
      +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv new file mode 100644 index 0000000000000000000000000000000000000000..324d2e48bd849909cec5c1994f0bb08806c50ed9 GIT binary patch literal 1022 zcmVNERX>N99Zgg*Qc_4OWa&u{KZXhxWBOp+6Z)#;@bUGk#d0}KS zb#r10BOq2~a&u{KZaN?eBOp|0Wgv28ZDDC{WMy(7Z)PBLXlZjGW@&6?AZc?TV{dJ6 za%FRKWn>_Ab7^j8AbM ztw)hmDOj`m)~7Y(14g^Mokja<2~5VD(-+%&-D`{Xg(tR#PsJNcuB&ooC$Qx)lzJUE zSsVDPwSU;ywYMiPj6Mdxtxnvkr8-w2?3~81)iJcCov_HCUq>@*u~? zAF3MU#=GEwjvH?3=%}JO1>N+DjMwQmy6H9D^g9yTW9#`O4CzFWMhlRfr345MIzSWe z8JaZv)GiRo?bqQnbZ5~|Z|?d*G&3T?Sme)qtydHS-$G*Iilt0ugl+ZO8aA=}ypVbA zSx-KC{SAam#T1Xn#BaEHE?OU+l%nA#c#WY@T;#ZRd^9sPTcA>$9jBrMBZQMY9FmDL zKT89Rpt%ul3-JOniZ?7@1EnncT_W%tHwtHup1%y~4)J5kd0NV@Wol^it-*;lbn_JW z?(!}q@y#CPE+~i`jC`WPMcdwP+gOt z3JpU#xpkIq;DjEfvmCP;!B0<-j@frG#ZB4$mb}Z?$W>kxXU|+BrP;Z(#SiKS$dQ}z zi{uL1KfKpMZyF>`;2a2dADddRSO + + + + + + + Python Module Index — pyad2usb documentation + + + + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + + +

      Python Module Index

      + +
      + p +
      + + + + + + + + + + + + + + + + + + + + + + + + + +
       
      + p
      + pyad2usb +
          + pyad2usb.__init__ +
          + pyad2usb.ad2usb +
          + pyad2usb.devices +
          + pyad2usb.event +
          + pyad2usb.event.event +
          + pyad2usb.util +
      + + +
      +
      +
      +
      +
      + + +
      +
      +
      +
      +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/pyad2usb.event.html b/docs/_build/html/pyad2usb.event.html new file mode 100644 index 0000000..a4ede97 --- /dev/null +++ b/docs/_build/html/pyad2usb.event.html @@ -0,0 +1,159 @@ + + + + + + + + event Package — pyad2usb documentation + + + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + +
      +

      event Package¶

      +
      +

      event Package¶

      +
      +
      +

      event Module¶

      +
      +
      +class pyad2usb.event.event.Event(doc=None)[source]¶
      +

      Bases: object

      +
      + +
      +
      +class pyad2usb.event.event.EventHandler(event, obj)[source]¶
      +

      Bases: object

      +
      +
      +add(func)[source]¶
      +

      Add new event handler function.

      +

      Event handler function must be defined like func(sender, earg). +You can add handler also by using ‘+=’ operator.

      +
      + +
      +
      +fire(earg=None)[source]¶
      +

      Fire event and call all handler functions

      +

      You can call EventHandler object itself like e(earg) instead of +e.fire(earg).

      +
      + +
      +
      +remove(func)[source]¶
      +

      Remove existing event handler function.

      +

      You can remove handler also by using ‘-=’ operator.

      +
      + +
      + +
      +
      + + +
      +
      +
      +
      +
      +

      Table Of Contents

      + + +

      Previous topic

      +

      pyad2usb Package

      +

      This Page

      + + + +
      +
      +
      +
      +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/pyad2usb.html b/docs/_build/html/pyad2usb.html new file mode 100644 index 0000000..2989540 --- /dev/null +++ b/docs/_build/html/pyad2usb.html @@ -0,0 +1,691 @@ + + + + + + + + pyad2usb Package — pyad2usb documentation + + + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + +
      +

      pyad2usb Package¶

      +
      +

      pyad2usb Package¶

      +

      The PyAD2USB module.

      +
      +
      +

      ad2usb Module¶

      +

      Provides the full AD2USB class and factory.

      +
      +
      +class pyad2usb.ad2usb.AD2USB(device)[source]¶
      +

      Bases: object

      +

      High-level wrapper around AD2USB/AD2SERIAL devices.

      +
      +
      +F1 = u'\x01\x01\x01'¶
      +
      + +
      +
      +F2 = u'\x02\x02\x02'¶
      +
      + +
      +
      +F3 = u'\x03\x03\x03'¶
      +
      + +
      +
      +F4 = u'\x04\x04\x04'¶
      +
      + +
      +
      +close()[source]¶
      +

      Closes the device.

      +
      + +
      +
      +get_config()[source]¶
      +

      Retrieves the configuration from the device.

      +
      + +
      +
      +id[source]¶
      +
      + +
      +
      +on_alarm¶
      +

      Called when the alarm is triggered.

      +
      + +
      +
      +on_boot¶
      +

      Called when the device finishes bootings.

      +
      + +
      +
      +on_bypass¶
      +

      Called when a zone is bypassed.

      +
      + +
      +
      +on_close¶
      +

      Called when the device has been closed.

      +
      + +
      +
      +on_config_received¶
      +

      Called when the device receives its configuration.

      +
      + +
      +
      +on_message¶
      +

      Called when a message has been received from the device.

      +
      + +
      +
      +on_open¶
      +

      Called when the device has been opened.

      +
      + +
      +
      +on_power_changed¶
      +

      Called when panel power switches between AC and DC.

      +
      + +
      +
      +on_read¶
      +

      Called when a line has been read from the device.

      +
      + +
      +
      +on_status_changed¶
      +

      Called when the panel status changes.

      +
      + +
      +
      +on_write¶
      +

      Called when data has been written to the device.

      +
      + +
      +
      +open(baudrate=None, interface=None, index=None, no_reader_thread=False)[source]¶
      +

      Opens the device.

      +
      + +
      +
      +reboot()[source]¶
      +

      Reboots the device.

      +
      + +
      +
      +set_config(settings)[source]¶
      +

      Sets configuration entries on the device.

      +
      + +
      + +
      +
      +class pyad2usb.ad2usb.ExpanderMessage(data=None)[source]¶
      +

      Bases: object

      +

      Represents a message from a zone or relay expansion module.

      +
      +
      +RELAY = 1¶
      +
      + +
      +
      +ZONE = 0¶
      +
      + +
      + +
      +
      +class pyad2usb.ad2usb.LRRMessage(data=None)[source]¶
      +

      Bases: object

      +

      Represent a message from a Long Range Radio.

      +
      + +
      +
      +class pyad2usb.ad2usb.Message(data=None)[source]¶
      +

      Bases: object

      +

      Represents a message from the alarm panel.

      +
      + +
      +
      +class pyad2usb.ad2usb.Overseer(attached_event=None, detached_event=None)[source]¶
      +

      Bases: object

      +

      Factory for creation of AD2USB devices as well as provide4s attach/detach events.”

      +
      +
      +class DetectThread(overseer)[source]¶
      +

      Bases: threading.Thread

      +

      Thread that handles detection of added/removed devices.

      +
      +
      +run()[source]¶
      +

      The actual detection process.

      +
      + +
      +
      +stop()[source]¶
      +

      Stops the thread.

      +
      + +
      + +
      +
      +Overseer.close()[source]¶
      +

      Clean up and shut down.

      +
      + +
      +
      +classmethod Overseer.create(device=None)[source]¶
      +

      Factory method that returns the requested AD2USB device, or the first device.

      +
      + +
      +
      +classmethod Overseer.devices()[source]¶
      +

      Returns a cached list of AD2USB devices located on the system.

      +
      + +
      +
      +classmethod Overseer.find_all()[source]¶
      +

      Returns all AD2USB devices located on the system.

      +
      + +
      +
      +Overseer.get_device(device=None)[source]¶
      +

      Factory method that returns the requested AD2USB device, or the first device.

      +
      + +
      +
      +Overseer.on_attached¶
      +

      Called when an AD2USB device has been detected.

      +
      + +
      +
      +Overseer.on_detached¶
      +

      Called when an AD2USB device has been removed.

      +
      + +
      +
      +Overseer.start()[source]¶
      +

      Starts the detection thread, if not already running.

      +
      + +
      +
      +Overseer.stop()[source]¶
      +

      Stops the detection thread.

      +
      + +
      + +
      +
      +class pyad2usb.ad2usb.RFMessage(data=None)[source]¶
      +

      Bases: object

      +

      Represents a message from an RF receiver.

      +
      + +
      +
      +

      devices Module¶

      +

      Contains different types of devices belonging to the AD2USB family.

      +
      +
      +class pyad2usb.devices.Device[source]¶
      +

      Bases: object

      +

      Generic parent device to all AD2USB products.

      +
      +
      +class ReadThread(device)[source]¶
      +

      Bases: threading.Thread

      +

      Reader thread which processes messages from the device.

      +
      +
      +READ_TIMEOUT = 10¶
      +
      + +
      +
      +run()[source]¶
      +

      The actual read process.

      +
      + +
      +
      +stop()[source]¶
      +

      Stops the running thread.

      +
      + +
      + +
      +
      +Device.id[source]¶
      +
      + +
      +
      +Device.is_reader_alive()[source]¶
      +

      Indicates whether or not the reader thread is alive.

      +
      + +
      +
      +Device.on_close¶
      +

      Called when the device has been closed

      +
      + +
      +
      +Device.on_open¶
      +

      Called when the device has been opened

      +
      + +
      +
      +Device.on_read¶
      +

      Called when a line has been read from the device

      +
      + +
      +
      +Device.on_write¶
      +

      Called when data has been written to the device

      +
      + +
      +
      +Device.stop_reader()[source]¶
      +

      Stops the reader thread.

      +
      + +
      + +
      +
      +class pyad2usb.devices.SerialDevice(interface=None)[source]¶
      +

      Bases: pyad2usb.devices.Device

      +

      AD2USB or AD2SERIAL device exposed with the pyserial interface.

      +
      +
      +BAUDRATE = 19200¶
      +
      + +
      +
      +close()[source]¶
      +

      Closes the device.

      +
      + +
      +
      +static find_all(pattern=None)[source]¶
      +

      Returns all serial ports present.

      +
      + +
      +
      +open(baudrate=19200, interface=None, index=None, no_reader_thread=False)[source]¶
      +

      Opens the device.

      +
      + +
      +
      +read()[source]¶
      +

      Reads a single character from the device.

      +
      + +
      +
      +read_line(timeout=0.0)[source]¶
      +

      Reads a line from the device.

      +
      + +
      +
      +write(data)[source]¶
      +

      Writes data to the device.

      +
      + +
      + +
      +
      +class pyad2usb.devices.SocketDevice(interface=('localhost', 10000))[source]¶
      +

      Bases: pyad2usb.devices.Device

      +

      Device that supports communication with an AD2USB that is exposed via ser2sock or another +Serial to IP interface.

      +
      +
      +close()[source]¶
      +

      Closes the device.

      +
      + +
      +
      +open(baudrate=None, interface=None, index=0, no_reader_thread=False)[source]¶
      +

      Opens the device.

      +
      + +
      +
      +read()[source]¶
      +

      Reads a single character from the device.

      +
      + +
      +
      +read_line(timeout=0.0)[source]¶
      +

      Reads a line from the device.

      +
      + +
      +
      +write(data)[source]¶
      +

      Writes data to the device.

      +
      + +
      + +
      +
      +class pyad2usb.devices.USBDevice(vid=1027, pid=24577, serial=None, description=None, interface=0)[source]¶
      +

      Bases: pyad2usb.devices.Device

      +

      AD2USB device exposed with PyFTDI’s interface.

      +
      +
      +BAUDRATE = 115200¶
      +
      + +
      +
      +FTDI_PRODUCT_ID = 24577¶
      +
      + +
      +
      +FTDI_VENDOR_ID = 1027¶
      +
      + +
      +
      +close()[source]¶
      +

      Closes the device.

      +
      + +
      +
      +static find_all()[source]¶
      +

      Returns all FTDI devices matching our vendor and product IDs.

      +
      + +
      +
      +open(baudrate=115200, interface=None, index=0, no_reader_thread=False)[source]¶
      +

      Opens the device.

      +
      + +
      +
      +read()[source]¶
      +

      Reads a single character from the device.

      +
      + +
      +
      +read_line(timeout=0.0)[source]¶
      +

      Reads a line from the device.

      +
      + +
      +
      +write(data)[source]¶
      +

      Writes data to the device.

      +
      + +
      + +
      +
      +

      util Module¶

      +

      Provides utility classes for the AD2USB devices.

      +
      +
      +exception pyad2usb.util.CommError[source]¶
      +

      Bases: exceptions.Exception

      +

      There was an error communicating with the device.

      +
      + +
      +
      +class pyad2usb.util.Firmware[source]¶
      +

      Bases: object

      +

      Represents firmware for the AD2USB/AD2SERIAL devices.

      +
      +
      +STAGE_BOOT = 2¶
      +
      + +
      +
      +STAGE_DONE = 5¶
      +
      + +
      +
      +STAGE_LOAD = 3¶
      +
      + +
      +
      +STAGE_START = 0¶
      +
      + +
      +
      +STAGE_UPLOADING = 4¶
      +
      + +
      +
      +STAGE_WAITING = 1¶
      +
      + +
      +
      +static upload(dev, filename, progress_callback=None)[source]¶
      +

      Uploads firmware to an AD2USB/AD2SERIAL device.

      +
      + +
      + +
      +
      +exception pyad2usb.util.InvalidMessageError[source]¶
      +

      Bases: exceptions.Exception

      +

      The format of the panel message was invalid.

      +
      + +
      +
      +exception pyad2usb.util.NoDeviceError[source]¶
      +

      Bases: exceptions.Exception

      +

      No devices found.

      +
      + +
      +
      +exception pyad2usb.util.TimeoutError[source]¶
      +

      Bases: exceptions.Exception

      +

      There was a timeout while trying to communicate with the device.

      +
      + +
      +
      +

      Subpackages¶

      +
      + +
      +
      +
      + + +
      +
      +
      +
      +
      +

      Table Of Contents

      + + +

      Previous topic

      +

      Welcome to pyad2usb’s documentation!

      +

      Next topic

      +

      event Package

      +

      This Page

      + + + +
      +
      +
      +
      +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html new file mode 100644 index 0000000..6723ea9 --- /dev/null +++ b/docs/_build/html/search.html @@ -0,0 +1,105 @@ + + + + + + + + Search — pyad2usb documentation + + + + + + + + + + + + + + + + + +
      +

      Navigation

      + +
      + +
      +
      +
      +
      + +

      Search

      +
      + +

      + Please activate JavaScript to enable the search + functionality. +

      +
      +

      + From here you can search these documents. Enter your search + words into the box below and click "search". Note that the search + function will automatically search for all of the words. Pages + containing fewer words won't appear in the result list. +

      +
      + + + +
      + +
      + +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +

      Navigation

      + +
      +
      + © Copyright 2013, Author. + Created using Sphinx 1.2b1. +
      + + \ No newline at end of file diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js new file mode 100644 index 0000000..07d020d --- /dev/null +++ b/docs/_build/html/searchindex.js @@ -0,0 +1 @@ +Search.setIndex({envversion:42,terms:{all:[1,3],socketdevic:1,func:3,boot:1,radio:1,on_boot:1,stage_don:1,baudrat:1,locat:1,zone:1,also:3,configur:1,except:1,on_attach:1,add:3,present:1,bypass:1,x03:1,on_read:1,x01:1,match:1,x04:1,sourc:[1,3],"return":1,around:1,format:1,fals:1,on_messag:1,stop:1,util:[],on_bypass:1,detach:1,like:3,level:1,earg:3,list:1,upload:1,method:1,"try":1,whether:1,stage_wait:1,timeout:1,contain:1,found:1,expandermessag:1,page:0,set:1,nodeviceerror:1,on_open:1,creation:1,"static":1,close:1,read_lin:1,event:[],stop_read:1,pyseri:1,index:[0,1],statu:1,detect:1,parent:1,pattern:1,ad2seri:1,reboot:1,content:0,written:1,between:1,"new":3,factori:1,localhost:1,can:3,ser2sock:1,shut:1,full:1,run:1,timeouterror:1,power:1,detached_ev:1,gener:1,usbdevic:1,on_clos:1,base:[1,3],on_config_receiv:1,on_status_chang:1,on_detach:1,panel:1,search:0,actual:1,expos:1,thread:1,readthread:1,set_config:1,stage_start:1,provide4:1,descript:1,chang:1,find_al:1,ad2usb:[],first:1,oper:3,rang:1,via:1,vid:1,attached_ev:1,modul:[],down:1,filenam:1,alreadi:1,messag:1,famili:1,on_writ:1,open:1,on_power_chang:1,differ:1,"long":1,from:1,commun:1,detectthread:1,support:1,devic:[],system:1,been:1,get_devic:1,trigger:1,call:[1,3],interfac:1,type:1,start:1,"function":3,wrapper:1,no_reader_thread:1,stage_load:1,fire:3,handler:3,commerror:1,stage_boot:1,rfmessag:1,relai:1,x02:1,obj:3,line:1,cach:1,serialdevic:1,must:3,none:[1,3],sender:3,retriev:1,provid:1,remov:[1,3],on_alarm:1,dev:1,charact:1,defin:3,"while":1,doc:3,stage_upload:1,error:1,aliv:1,creat:1,process:1,request:1,pid:1,reader:1,repres:1,high:1,packag:[],itself:3,exist:3,ftdi_vendor_id:1,our:1,read_timeout:1,vendor:1,ftdi_product_id:1,attach:1,progress_callback:1,receiv:1,anoth:1,belong:1,when:1,invalid:1,port:1,write:1,handl:1,read:1,which:1,instead:3,you:3,singl:1,product:1,finish:1,firmwar:1,pyftdi:1,expans:1,object:[1,3],ftdi:1,get_config:1,eventhandl:3,data:1,"class":[1,3],serial:1,subpackag:[],classmethod:1,entri:1,alarm:1,well:1,lrrmessag:1,"switch":1,is_reader_al:1,clean:1,invalidmessageerror:1,overs:1},objtypes:{"0":"py:module","1":"py:method","2":"py:attribute","3":"py:class","4":"py:staticmethod","5":"py:exception","6":"py:classmethod"},objnames:{"0":["py","module","Python module"],"1":["py","method","Python method"],"2":["py","attribute","Python attribute"],"3":["py","class","Python class"],"4":["py","staticmethod","Python static method"],"5":["py","exception","Python exception"],"6":["py","classmethod","Python class method"]},filenames:["index","pyad2usb","modules","pyad2usb.event"],titles:["Welcome to pyad2usb’s documentation!","pyad2usb Package","pyad2usb","event Package"],objects:{"pyad2usb.devices":{Device:[1,3,1,""],SocketDevice:[1,3,1,""],USBDevice:[1,3,1,""],SerialDevice:[1,3,1,""]},"pyad2usb.util.Firmware":{STAGE_LOAD:[1,2,1,""],upload:[1,4,1,""],STAGE_BOOT:[1,2,1,""],STAGE_START:[1,2,1,""],STAGE_UPLOADING:[1,2,1,""],STAGE_WAITING:[1,2,1,""],STAGE_DONE:[1,2,1,""]},"pyad2usb.devices.SerialDevice":{write:[1,1,1,""],BAUDRATE:[1,2,1,""],read:[1,1,1,""],read_line:[1,1,1,""],find_all:[1,4,1,""],close:[1,1,1,""],open:[1,1,1,""]},"pyad2usb.ad2usb.Overseer.DetectThread":{run:[1,1,1,""],stop:[1,1,1,""]},"pyad2usb.devices.Device":{on_open:[1,2,1,""],on_write:[1,2,1,""],ReadThread:[1,3,1,""],on_close:[1,2,1,""],on_read:[1,2,1,""],stop_reader:[1,1,1,""],is_reader_alive:[1,1,1,""],id:[1,2,1,""]},pyad2usb:{util:[1,0,1,""],"__init__":[1,0,1,""],ad2usb:[1,0,1,""],devices:[1,0,1,""],event:[3,0,1,""]},"pyad2usb.ad2usb":{RFMessage:[1,3,1,""],LRRMessage:[1,3,1,""],ExpanderMessage:[1,3,1,""],Overseer:[1,3,1,""],Message:[1,3,1,""],AD2USB:[1,3,1,""]},"pyad2usb.event":{event:[3,0,1,""]},"pyad2usb.devices.Device.ReadThread":{READ_TIMEOUT:[1,2,1,""],run:[1,1,1,""],stop:[1,1,1,""]},"pyad2usb.util":{CommError:[1,5,1,""],Firmware:[1,3,1,""],TimeoutError:[1,5,1,""],NoDeviceError:[1,5,1,""],InvalidMessageError:[1,5,1,""]},"pyad2usb.ad2usb.AD2USB":{on_power_changed:[1,2,1,""],F1:[1,2,1,""],F2:[1,2,1,""],F3:[1,2,1,""],F4:[1,2,1,""],on_message:[1,2,1,""],on_config_received:[1,2,1,""],on_open:[1,2,1,""],on_status_changed:[1,2,1,""],on_alarm:[1,2,1,""],get_config:[1,1,1,""],set_config:[1,1,1,""],on_close:[1,2,1,""],on_bypass:[1,2,1,""],reboot:[1,1,1,""],on_boot:[1,2,1,""],on_write:[1,2,1,""],close:[1,1,1,""],on_read:[1,2,1,""],open:[1,1,1,""],id:[1,2,1,""]},"pyad2usb.ad2usb.ExpanderMessage":{RELAY:[1,2,1,""],ZONE:[1,2,1,""]},"pyad2usb.event.event.EventHandler":{fire:[3,1,1,""],add:[3,1,1,""],remove:[3,1,1,""]},"pyad2usb.event.event":{EventHandler:[3,3,1,""],Event:[3,3,1,""]},"pyad2usb.ad2usb.Overseer":{on_attached:[1,2,1,""],get_device:[1,1,1,""],DetectThread:[1,3,1,""],create:[1,6,1,""],stop:[1,1,1,""],devices:[1,6,1,""],on_detached:[1,2,1,""],start:[1,1,1,""],find_all:[1,6,1,""],close:[1,1,1,""]},"pyad2usb.devices.SocketDevice":{read_line:[1,1,1,""],read:[1,1,1,""],write:[1,1,1,""],open:[1,1,1,""],close:[1,1,1,""]},"pyad2usb.devices.USBDevice":{read_line:[1,1,1,""],BAUDRATE:[1,2,1,""],read:[1,1,1,""],write:[1,1,1,""],find_all:[1,4,1,""],FTDI_VENDOR_ID:[1,2,1,""],close:[1,1,1,""],FTDI_PRODUCT_ID:[1,2,1,""],open:[1,1,1,""]}},titleterms:{subpackag:1,welcom:0,pyad2usb:[0,1,2],devic:1,indic:0,event:3,util:1,packag:[1,3],tabl:0,modul:[1,3],document:0,ad2usb:1}}) \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..5bfd805 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,306 @@ +# -*- coding: utf-8 -*- +# +# pyad2usb documentation build configuration file, created by +# sphinx-quickstart on Sat Jun 8 14:38:46 2013. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +sys.path.insert(0, os.path.abspath('..')) + +# -- General configuration ----------------------------------------------------- + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'pyad2usb' +copyright = u'2013, Author' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '' +# The full version, including alpha/beta/rc tags. +release = '' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + +# If true, keep warnings as "system message" paragraphs in the built documents. +#keep_warnings = False + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_domain_indices = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'pyad2usbdoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +latex_elements = { +# The paper size ('letterpaper' or 'a4paper'). +#'papersize': 'letterpaper', + +# The font size ('10pt', '11pt' or '12pt'). +#'pointsize': '10pt', + +# Additional stuff for the LaTeX preamble. +#'preamble': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'pyad2usb.tex', u'pyad2usb Documentation', + u'Author', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_domain_indices = True + + +# -- Options for manual page output -------------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'pyad2usb', u'pyad2usb Documentation', + [u'Author'], 1) +] + +# If true, show URL addresses after external links. +#man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------------ + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ('index', 'pyad2usb', u'pyad2usb Documentation', + u'Author', 'pyad2usb', 'One line description of project.', + 'Miscellaneous'), +] + +# Documents to append as an appendix to all manuals. +#texinfo_appendices = [] + +# If false, no module index is generated. +#texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +#texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +#texinfo_no_detailmenu = False + + +# -- Options for Epub output --------------------------------------------------- + +# Bibliographic Dublin Core info. +epub_title = u'pyad2usb' +epub_author = u'Author' +epub_publisher = u'Author' +epub_copyright = u'2013, Author' + +# The language of the text. It defaults to the language option +# or en if the language is not set. +#epub_language = '' + +# The scheme of the identifier. Typical schemes are ISBN or URL. +#epub_scheme = '' + +# The unique identifier of the text. This can be a ISBN number +# or the project homepage. +#epub_identifier = '' + +# A unique identification for the text. +#epub_uid = '' + +# A tuple containing the cover image and cover page html template filenames. +#epub_cover = () + +# A sequence of (type, uri, title) tuples for the guide element of content.opf. +#epub_guide = () + +# HTML files that should be inserted before the pages created by sphinx. +# The format is a list of tuples containing the path and title. +#epub_pre_files = [] + +# HTML files shat should be inserted after the pages created by sphinx. +# The format is a list of tuples containing the path and title. +#epub_post_files = [] + +# A list of files that should not be packed into the epub file. +#epub_exclude_files = [] + +# The depth of the table of contents in toc.ncx. +#epub_tocdepth = 3 + +# Allow duplicate toc entries. +#epub_tocdup = True + +# Fix unsupported image types using the PIL. +#epub_fix_images = False + +# Scale large images. +#epub_max_image_width = 0 + +# If 'no', URL addresses will not be shown. +#epub_show_urls = 'inline' + +# If false, no index is generated. +#epub_use_index = True diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..6085464 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,23 @@ +.. pyad2usb documentation master file, created by + sphinx-quickstart on Sat Jun 8 14:38:46 2013. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to pyad2usb's documentation! +==================================== + +Contents: + +.. toctree:: + :maxdepth: 4 + + pyad2usb + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 0000000..6ded9e3 --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,242 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set BUILDDIR=_build +set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . +set I18NSPHINXOPTS=%SPHINXOPTS% . +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% + set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. singlehtml to make a single large HTML file + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. devhelp to make HTML files and a Devhelp project + echo. epub to make an epub + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. text to make text files + echo. man to make manual pages + echo. texinfo to make Texinfo files + echo. gettext to make PO message catalogs + echo. changes to make an overview over all changed/added/deprecated items + echo. xml to make Docutils-native XML files + echo. pseudoxml to make pseudoxml-XML files for display purposes + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end +) + +if "%1" == "clean" ( + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i + del /q /s %BUILDDIR%\* + goto end +) + + +%SPHINXBUILD% 2> nul +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. + goto end +) + +if "%1" == "singlehtml" ( + %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in %BUILDDIR%/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in %BUILDDIR%/qthelp, like this: + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\pyad2usb.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\pyad2usb.ghc + goto end +) + +if "%1" == "devhelp" ( + %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. + goto end +) + +if "%1" == "epub" ( + %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The epub file is in %BUILDDIR%/epub. + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "latexpdf" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + cd %BUILDDIR%/latex + make all-pdf + cd %BUILDDIR%/.. + echo. + echo.Build finished; the PDF files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "latexpdfja" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + cd %BUILDDIR%/latex + make all-pdf-ja + cd %BUILDDIR%/.. + echo. + echo.Build finished; the PDF files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "text" ( + %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The text files are in %BUILDDIR%/text. + goto end +) + +if "%1" == "man" ( + %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The manual pages are in %BUILDDIR%/man. + goto end +) + +if "%1" == "texinfo" ( + %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. + goto end +) + +if "%1" == "gettext" ( + %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The message catalogs are in %BUILDDIR%/locale. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes + if errorlevel 1 exit /b 1 + echo. + echo.The overview file is in %BUILDDIR%/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck + if errorlevel 1 exit /b 1 + echo. + echo.Link check complete; look for any errors in the above output ^ +or in %BUILDDIR%/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest + if errorlevel 1 exit /b 1 + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in %BUILDDIR%/doctest/output.txt. + goto end +) + +if "%1" == "xml" ( + %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The XML files are in %BUILDDIR%/xml. + goto end +) + +if "%1" == "pseudoxml" ( + %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml. + goto end +) + +:end diff --git a/docs/modules.rst b/docs/modules.rst new file mode 100644 index 0000000..34e82c9 --- /dev/null +++ b/docs/modules.rst @@ -0,0 +1,7 @@ +pyad2usb +======== + +.. toctree:: + :maxdepth: 4 + + pyad2usb diff --git a/docs/pyad2usb.event.rst b/docs/pyad2usb.event.rst new file mode 100644 index 0000000..565d5a3 --- /dev/null +++ b/docs/pyad2usb.event.rst @@ -0,0 +1,19 @@ +event Package +============= + +:mod:`event` Package +-------------------- + +.. automodule:: pyad2usb.event + :members: + :undoc-members: + :show-inheritance: + +:mod:`event` Module +------------------- + +.. automodule:: pyad2usb.event.event + :members: + :undoc-members: + :show-inheritance: + diff --git a/docs/pyad2usb.rst b/docs/pyad2usb.rst new file mode 100644 index 0000000..08dfd6b --- /dev/null +++ b/docs/pyad2usb.rst @@ -0,0 +1,42 @@ +pyad2usb Package +================ + +:mod:`pyad2usb` Package +----------------------- + +.. automodule:: pyad2usb.__init__ + :members: + :undoc-members: + :show-inheritance: + +:mod:`ad2usb` Module +-------------------- + +.. automodule:: pyad2usb.ad2usb + :members: + :undoc-members: + :show-inheritance: + +:mod:`devices` Module +--------------------- + +.. automodule:: pyad2usb.devices + :members: + :undoc-members: + :show-inheritance: + +:mod:`util` Module +------------------ + +.. automodule:: pyad2usb.util + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + + pyad2usb.event + From 7a5966b46d45da2fc0f3acc79af9e60a43f4a279 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sun, 9 Jun 2013 16:56:00 -0700 Subject: [PATCH 13/30] Config support added. --- pyad2usb/ad2usb.py | 63 ++++++++++++++++++++++++++++++++++++++-------- test.py | 6 ++--- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index c69c336..4ae7225 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -5,6 +5,7 @@ Provides the full AD2USB class and factory. import time import threading import re +import logging from .event import event from . import devices from . import util @@ -181,9 +182,13 @@ class AD2USB(object): self._alarm_status = None self._bypass_status = None - self._settings = {} - - self._address_mask = 0xFF80 # TEMP + self.address = 18 + self.configbits = 0xFF00 + self.address_mask = 0x00000000 + self.emulate_zone = [False for x in range(5)] + self.emulate_relay = [False for x in range(4)] + self.emulate_lrr = False + self.deduplicate = False def open(self, baudrate=None, interface=None, index=None, no_reader_thread=False): """ @@ -205,11 +210,34 @@ class AD2USB(object): """ self._device.write("C\r") - def set_config(self, settings): + def save_config(self): """ - + Sets configuration entries on the device. """ - pass + config_string = '' + + # HACK: Both of these methods are ugly.. but I can't think of an elegant way of doing it. + + #config_string += 'ADDRESS={0}&'.format(self.address) + #config_string += 'CONFIGBITS={0:x}&'.format(self.configbits) + #config_string += 'MASK={0:x}&'.format(self.address_mask) + #config_string += 'EXP={0}&'.format(''.join(['Y' if z else 'N' for z in self.emulate_zone])) + #config_string += 'REL={0}&'.format(''.join(['Y' if r else 'N' for r in self.emulate_relay])) + #config_string += 'LRR={0}&'.format('Y' if self.emulate_lrr else 'N') + #config_string += 'DEDUPLICATE={0}'.format('Y' if self.deduplicate else 'N') + + config_entries = [] + config_entries.append(('ADDRESS', '{0}'.format(self.address))) + config_entries.append(('CONFIGBITS', '{0:x}'.format(self.configbits))) + config_entries.append(('MASK', '{0:x}'.format(self.address_mask))) + config_entries.append(('EXP', ''.join(['Y' if z else 'N' for z in self.emulate_zone]))) + config_entries.append(('REL', ''.join(['Y' if r else 'N' for r in self.emulate_relay]))) + config_entries.append(('LRR', 'Y' if self.emulate_lrr else 'N')) + config_entries.append(('DEDUPLICATE', 'Y' if self.deduplicate else 'N')) + + config_string = '&'.join(['='.join(t) for t in config_entries]) + + self._device.write("C{0}\r".format(config_string)) def reboot(self): """ @@ -242,7 +270,7 @@ class AD2USB(object): if data[0] != '!': msg = Message(data) - if self._address_mask & msg.mask > 0: + if self.address_mask & msg.mask > 0: self._update_internal_states(msg) else: # specialty messages @@ -266,9 +294,24 @@ class AD2USB(object): for setting in config_string.split('&'): k, v = setting.split('=') - self._settings[k] = v - - self.on_config_received(self._settings) + if k == 'ADDRESS': + self.address = int(v) + elif k == 'CONFIGBITS': + self.configbits = int(v, 16) + elif k == 'MASK': + self.address_mask = int(v, 16) + elif k == 'EXP': + for z in range(5): + self.emulate_zone[z] = True if v[z] == 'Y' else False + elif k == 'REL': + for r in range(4): + self.emulate_relay[r] = True if v[r] == 'Y' else False + elif k == 'LRR': + self.emulate_lrr = True if v == 'Y' else False + elif k == 'DEDUPLICATE': + self.deduplicate = True if v == 'Y' else False + + self.on_config_received() def _update_internal_states(self, message): if message.ac_power != self._power_status: diff --git a/test.py b/test.py index 4a7ccd7..02e70df 100755 --- a/test.py +++ b/test.py @@ -5,6 +5,7 @@ import time import signal import traceback import sys +import logging running = True @@ -221,11 +222,9 @@ def test_socket(): a2u.on_config_received += handle_config a2u.open() + #a2u.save_config() #a2u.reboot() a2u.get_config() - print pyad2usb.ad2usb.AD2USB.F1 - - print dev._id while running: time.sleep(0.1) @@ -289,6 +288,7 @@ def test_double_panel_write(): dev2.close() try: + logging.basicConfig(level=logging.DEBUG) signal.signal(signal.SIGINT, signal_handler) #test_serial() From ee9803e6e2d9b2fa4ba8a7fa93f89f38dc31c98e Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sun, 9 Jun 2013 17:31:52 -0700 Subject: [PATCH 14/30] Added support for clearing and faulting zones. --- pyad2usb/ad2usb.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 4ae7225..760c00d 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -190,6 +190,10 @@ class AD2USB(object): self.emulate_lrr = False self.deduplicate = False + @property + def id(self): + return self._device.id + def open(self, baudrate=None, interface=None, index=None, no_reader_thread=False): """ Opens the device. @@ -245,9 +249,19 @@ class AD2USB(object): """ self._device.write('=') - @property - def id(self): - return self._device.id + def fault_zone(self, zone, simulate_wire_problem=False): + """ + Faults a zone if we are emulating a zone expander. + """ + status = 2 if simulate_wire_problem else 1 + + self._device.write("L{0:02}{1}".format(zone, status)) + + def clear_zone(self, zone): + """ + Clears a zone if we are emulating a zone expander. + """ + self._device.write("L{0:02}0".format(zone)) def _wire_events(self): """ From 679080e5ef3181cd8fffde52263fb02db99c9274 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sun, 9 Jun 2013 18:14:49 -0700 Subject: [PATCH 15/30] Added arm/disarm events. --- pyad2usb/ad2usb.py | 11 +++++++++++ test.py | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 760c00d..b568d54 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -151,6 +151,8 @@ class AD2USB(object): """ # High-level Events + on_arm = event.Event('Called when the panel is armed.') + on_disarm = event.Event('Called when the panel is disarmed.') on_status_changed = event.Event('Called when the panel status changes.') on_power_changed = event.Event('Called when panel power switches between AC and DC.') on_alarm = event.Event('Called when the alarm is triggered.') @@ -346,6 +348,15 @@ class AD2USB(object): if old_status is not None: self.on_bypass(self._bypass_status) + if (message.armed_away | message.armed_home) != self._armed_status: + self._armed_status, old_status = message.armed_away | message.armed_home, self._armed_status + + if old_status is not None: + if self._armed_status: + self.on_arm() + else: + self.on_disarm() + def _on_open(self, sender, args): """ Internal handler for opening the device. diff --git a/test.py b/test.py index 02e70df..fff0bfb 100755 --- a/test.py +++ b/test.py @@ -44,6 +44,12 @@ def handle_bypass(sender, args): def handle_message(sender, args): print args +def handle_arm(sender, args): + print 'armed', args + +def handle_disarm(sender, args): + print 'disarmed', args + def handle_firmware(stage): if stage == pyad2usb.ad2usb.util.Firmware.STAGE_START: handle_firmware.wait_tick = 0 @@ -220,6 +226,8 @@ def test_socket(): a2u.on_bypass += handle_bypass a2u.on_boot += handle_boot a2u.on_config_received += handle_config + a2u.on_arm += handle_arm + a2u.on_disarm += handle_disarm a2u.open() #a2u.save_config() From efa712efe05838f9cf5d87067074e6d2008ae545 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sun, 9 Jun 2013 18:37:22 -0700 Subject: [PATCH 16/30] Added fire alarm event. --- pyad2usb/ad2usb.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index b568d54..bfa3193 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -153,9 +153,9 @@ class AD2USB(object): # High-level Events on_arm = event.Event('Called when the panel is armed.') on_disarm = event.Event('Called when the panel is disarmed.') - on_status_changed = event.Event('Called when the panel status changes.') on_power_changed = event.Event('Called when panel power switches between AC and DC.') on_alarm = event.Event('Called when the alarm is triggered.') + on_fire = event.Event('Called when a fire is detected.') on_bypass = event.Event('Called when a zone is bypassed.') on_boot = event.Event('Called when the device finishes bootings.') on_config_received = event.Event('Called when the device receives its configuration.') @@ -357,6 +357,12 @@ class AD2USB(object): else: self.on_disarm() + if message.fire_alarm != self._fire_status: + self._fire_status, old_status = message.fire_alarm, self._fire_status + + if old_status is not None: + self.on_fire(self._fire_status) + def _on_open(self, sender, args): """ Internal handler for opening the device. @@ -405,6 +411,7 @@ class Message(object): self.chime_on = False self.alarm_event_occurred = False self.alarm_sounding = False + self.fire_alarm = False self.numeric_code = "" self.text = "" self.cursor_location = -1 @@ -442,6 +449,7 @@ class Message(object): self.chime_on = not self.bitfield[9:10] == "0" self.alarm_event_occurred = not self.bitfield[10:11] == "0" self.alarm_sounding = not self.bitfield[11:12] == "0" + self.fire_alarm = not self.bitfield[13:14] == "0" self.text = alpha.strip('"') if int(self.panel_data[19:21], 16) & 0x01 > 0: From f5d6f22b8a9cbbd826d0c4731dbe29d309312c70 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Sun, 9 Jun 2013 18:39:11 -0700 Subject: [PATCH 17/30] Missing fields. --- pyad2usb/ad2usb.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index bfa3193..d9b46f7 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -183,6 +183,8 @@ class AD2USB(object): self._power_status = None self._alarm_status = None self._bypass_status = None + self._armed_status = None + self._fire_status = None self.address = 18 self.configbits = 0xFF00 From ed11af8e309380f147b4af6f121f397dcb78d5f5 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 10 Jun 2013 19:44:11 -0700 Subject: [PATCH 18/30] Cleanup --- pyad2usb/ad2usb.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index d9b46f7..2e2f8d4 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -96,7 +96,6 @@ class Overseer(object): """ return Overseer.create(device) - class DetectThread(threading.Thread): """ Thread that handles detection of added/removed devices. @@ -196,6 +195,9 @@ class AD2USB(object): @property def id(self): + """ + The ID of the AD2USB device. + """ return self._device.id def open(self, baudrate=None, interface=None, index=None, no_reader_thread=False): @@ -308,6 +310,9 @@ class AD2USB(object): return msg def _handle_config(self, data): + """ + Handles received configuration data. + """ _, config_string = data.split('>') for setting in config_string.split('&'): k, v = setting.split('=') @@ -332,6 +337,9 @@ class AD2USB(object): self.on_config_received() def _update_internal_states(self, message): + """ + Updates internal device states. + """ if message.ac_power != self._power_status: self._power_status, old_status = message.ac_power, self._power_status @@ -467,6 +475,7 @@ class ExpanderMessage(object): """ Represents a message from a zone or relay expansion module. """ + ZONE = 0 RELAY = 1 @@ -516,6 +525,7 @@ class RFMessage(object): """ Represents a message from an RF receiver. """ + def __init__(self, data=None): """ Constructor @@ -546,6 +556,7 @@ class LRRMessage(object): """ Represent a message from a Long Range Radio. """ + def __init__(self, data=None): """ Constructor From d30d657cf0a7987f58309b01d4911ee89b1af646 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 10 Jun 2013 20:24:01 -0700 Subject: [PATCH 19/30] Exception handling. Consistency changes. Docs. --- pyad2usb/devices.py | 78 +++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 27 deletions(-) diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index 119ae1b..8a60ff0 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -26,22 +26,28 @@ class Device(object): on_write = event.Event('Called when data has been written to the device') def __init__(self): + """ + Constructor + """ self._id = '' self._buffer = '' self._interface = None self._device = None self._running = False - self._read_thread = Device.ReadThread(self) # NOTE: not sure this is going to work.. - - def __del__(self): - pass + self._read_thread = Device.ReadThread(self) @property def id(self): + """ + Retrieve the device ID. + """ return self._id @id.setter def id(self, value): + """ + Sets the device ID. + """ self._id = value def is_reader_alive(self): @@ -158,9 +164,7 @@ class USBDevice(Device): self._id = 'USB {0}:{1}'.format(self._device.usb_dev.bus, self._device.usb_dev.address) except (usb.core.USBError, FtdiError), err: - self.on_close() - - raise util.NoDeviceError('Error opening AD2USB device: {0}'.format(str(err))) + raise util.NoDeviceError('Error opening device: {0}'.format(str(err))) else: self._running = True if not no_reader_thread: @@ -194,13 +198,21 @@ class USBDevice(Device): self.on_write(data) except FtdiError, err: - raise util.CommError('Error writing to AD2USB device.') + raise util.CommError('Error writing to device: {0}'.format(str(err))) def read(self): """ Reads a single character from the device. """ - return self._device.read_data(1) + ret = None + + try: + ret = self._device.read_data(1) + + except (usb.core.USBError, FtdiError), err: + raise util.CommError('Error reading from device: {0}'.format(str(err))) + + return ret def read_line(self, timeout=0.0): """ @@ -243,7 +255,7 @@ class USBDevice(Device): except (usb.core.USBError, FtdiError), err: timer.cancel() - raise util.CommError('Error reading from AD2USB device: {0}'.format(str(err))) + raise util.CommError('Error reading from device: {0}'.format(str(err))) else: if got_line: ret = self._buffer @@ -280,8 +292,8 @@ class SerialDevice(Device): devices = serial.tools.list_ports.grep(pattern) else: devices = serial.tools.list_ports.comports() - except Exception, err: - raise util.CommError('Error enumerating AD2SERIAL devices: {0}'.format(str(err))) + except SerialException, err: + raise util.CommError('Error enumerating serial devices: {0}'.format(str(err))) return devices @@ -304,7 +316,7 @@ class SerialDevice(Device): baudrate = SerialDevice.BAUDRATE if self._interface is None and interface is None: - raise util.NoDeviceError('No AD2SERIAL device interface specified.') + raise util.NoDeviceError('No device interface specified.') if interface is not None: self._interface = interface @@ -322,9 +334,7 @@ class SerialDevice(Device): # all issues with it. except (serial.SerialException, ValueError), err: - self.on_close() - - raise util.NoDeviceError('Error opening AD2SERIAL device on port {0}.'.format(interface)) + raise util.NoDeviceError('Error opening device on port {0}.'.format(interface)) else: self._running = True self.on_open(('N/A', "AD2SERIAL")) @@ -355,7 +365,7 @@ class SerialDevice(Device): except serial.SerialTimeoutException, err: pass except serial.SerialException, err: - raise util.CommError('Error writing to serial device.') + raise util.CommError('Error writing to device.') else: self.on_write(data) @@ -363,7 +373,15 @@ class SerialDevice(Device): """ Reads a single character from the device. """ - return self._device.read(1) + ret = None + + try: + ret = self._device.read(1) + + except serial.SerialException, err: + raise util.CommError('Error reading from device: {0}'.format(str(err))) + + return ret def read_line(self, timeout=0.0): """ @@ -406,7 +424,7 @@ class SerialDevice(Device): except (OSError, serial.SerialException), err: timer.cancel() - raise util.CommError('Error reading from AD2SERIAL device: {0}'.format(str(err))) + raise util.CommError('Error reading from device: {0}'.format(str(err))) else: if got_line: ret = self._buffer @@ -452,9 +470,7 @@ class SocketDevice(Device): self._id = '{0}:{1}'.format(self._host, self._port) except socket.error, err: - self.on_close() - - raise util.NoDeviceError('Error opening AD2SOCKET device at {0}:{1}'.format(self._host, self._port)) + raise util.NoDeviceError('Error opening device at {0}:{1}'.format(self._host, self._port)) else: self._running = True @@ -482,19 +498,27 @@ class SocketDevice(Device): """ Writes data to the device. """ - data_sent = self._device.send(data) + data_sent = None + + try: + data_sent = self._device.send(data) + + if data_sent == 0: + raise util.CommError('Error writing to device.') - if data_sent == 0: - raise util.CommError('Error while sending data.') - else: self.on_write(data) + except socket.error, err: + raise util.CommError('Error writing to device: {0}'.format(str(err))) + return data_sent def read(self): """ Reads a single character from the device. """ + data = None + try: data = self._device.recv(1) except socket.error, err: @@ -543,7 +567,7 @@ class SocketDevice(Device): except socket.error, err: timer.cancel() - raise util.CommError('Error reading from Socket device: {0}'.format(str(err))) + raise util.CommError('Error reading from device: {0}'.format(str(err))) else: if got_line: ret = self._buffer From e0b29e363553975c89d0695741381a1b80a8dc37 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 10 Jun 2013 20:32:03 -0700 Subject: [PATCH 20/30] Consistency changes. --- pyad2usb/devices.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index 8a60ff0..909eefc 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -92,6 +92,7 @@ class Device(object): while self._running: try: self._device.read_line(timeout=self.READ_TIMEOUT) + except util.TimeoutError, err: pass @@ -116,6 +117,7 @@ class USBDevice(Device): try: devices = Ftdi.find_all([(USBDevice.FTDI_VENDOR_ID, USBDevice.FTDI_PRODUCT_ID)], nocache=True) + except (usb.core.USBError, FtdiError), err: raise util.CommError('Error enumerating AD2USB devices: {0}'.format(str(err))) @@ -163,8 +165,10 @@ class USBDevice(Device): self._device.set_baudrate(baudrate) self._id = 'USB {0}:{1}'.format(self._device.usb_dev.bus, self._device.usb_dev.address) + except (usb.core.USBError, FtdiError), err: raise util.NoDeviceError('Error opening device: {0}'.format(str(err))) + else: self._running = True if not no_reader_thread: @@ -184,7 +188,8 @@ class USBDevice(Device): # HACK: Probably should fork pyftdi and make this call in .close(). self._device.usb_dev.attach_kernel_driver(self._interface) - except (FtdiError, usb.core.USBError): + + except: pass self.on_close() @@ -256,6 +261,7 @@ class USBDevice(Device): timer.cancel() raise util.CommError('Error reading from device: {0}'.format(str(err))) + else: if got_line: ret = self._buffer @@ -292,6 +298,7 @@ class SerialDevice(Device): devices = serial.tools.list_ports.grep(pattern) else: devices = serial.tools.list_ports.comports() + except SerialException, err: raise util.CommError('Error enumerating serial devices: {0}'.format(str(err))) @@ -335,6 +342,7 @@ class SerialDevice(Device): except (serial.SerialException, ValueError), err: raise util.NoDeviceError('Error opening device on port {0}.'.format(interface)) + else: self._running = True self.on_open(('N/A', "AD2SERIAL")) @@ -351,7 +359,8 @@ class SerialDevice(Device): self._read_thread.stop() self._device.close() - except Exception, err: + + except: pass self.on_close() @@ -362,10 +371,13 @@ class SerialDevice(Device): """ try: self._device.write(data) + except serial.SerialTimeoutException, err: pass + except serial.SerialException, err: raise util.CommError('Error writing to device.') + else: self.on_write(data) @@ -425,6 +437,7 @@ class SerialDevice(Device): timer.cancel() raise util.CommError('Error reading from device: {0}'.format(str(err))) + else: if got_line: ret = self._buffer @@ -471,6 +484,7 @@ class SocketDevice(Device): except socket.error, err: raise util.NoDeviceError('Error opening device at {0}:{1}'.format(self._host, self._port)) + else: self._running = True @@ -489,6 +503,7 @@ class SocketDevice(Device): self._read_thread.stop() self._device.shutdown(socket.SHUT_RDWR) # Make sure that it closes immediately. self._device.close() + except: pass @@ -521,6 +536,7 @@ class SocketDevice(Device): try: data = self._device.recv(1) + except socket.error, err: raise util.CommError('Error while reading from device: {0}'.format(str(err))) @@ -568,6 +584,7 @@ class SocketDevice(Device): timer.cancel() raise util.CommError('Error reading from device: {0}'.format(str(err))) + else: if got_line: ret = self._buffer From 8a9900f501e463d1efce451b5cbf12e4019ca45a Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 10 Jun 2013 20:35:04 -0700 Subject: [PATCH 21/30] Deleting device on close. --- pyad2usb/ad2usb.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 2e2f8d4..38c96d3 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -212,6 +212,7 @@ class AD2USB(object): Closes the device. """ self._device.close() + del self._device self._device = None def get_config(self): From efe0fe9f142498add0f86f45b4c0b7b6923055a4 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Thu, 13 Jun 2013 13:26:23 -0700 Subject: [PATCH 22/30] Fixed expander zone faults. Fixed message fields and added additional ones. --- pyad2usb/ad2usb.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 38c96d3..04706e5 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -262,13 +262,13 @@ class AD2USB(object): """ status = 2 if simulate_wire_problem else 1 - self._device.write("L{0:02}{1}".format(zone, status)) + self._device.write("L{0:02}{1}\r".format(zone, status)) def clear_zone(self, zone): """ Clears a zone if we are emulating a zone expander. """ - self._device.write("L{0:02}0".format(zone)) + self._device.write("L{0:02}0\r".format(zone)) def _wire_events(self): """ @@ -422,7 +422,11 @@ class Message(object): self.chime_on = False self.alarm_event_occurred = False self.alarm_sounding = False + self.battery_low = False + self.entry_delay_off = False self.fire_alarm = False + self.check_zone = False + self.perimeter_only = False self.numeric_code = "" self.text = "" self.cursor_location = -1 @@ -460,7 +464,12 @@ class Message(object): self.chime_on = not self.bitfield[9:10] == "0" self.alarm_event_occurred = not self.bitfield[10:11] == "0" self.alarm_sounding = not self.bitfield[11:12] == "0" - self.fire_alarm = not self.bitfield[13:14] == "0" + self.battery_low = not self.bitfield[12:13] == "0" + self.entry_delay_off = not self.bitfield[13:14] == "0" + self.fire_alarm = not self.bitfield[14:15] == "0" + self.check_zone = not self.bitfield[15:16] == "0" + self.perimeter_only = not self.bitfield[16:17] == "0" + # bits 17-20 unused. self.text = alpha.strip('"') if int(self.panel_data[19:21], 16) & 0x01 > 0: @@ -583,4 +592,4 @@ class LRRMessage(object): self.raw = data _, values = data.split(':') - self._event_data, self._partition, self._event_type = values.split(',') \ No newline at end of file + self._event_data, self._partition, self._event_type = values.split(',') From bf73c6821f6a41772e08117eebc4a84454f3f2b4 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Thu, 13 Jun 2013 13:28:09 -0700 Subject: [PATCH 23/30] Working timeout version of the tracker. --- pyad2usb/ad2usb.py | 37 +++++++++++++++++++++++++++++++++++++ test.py | 26 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 04706e5..5798ee8 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -6,6 +6,7 @@ import time import threading import re import logging +from collections import OrderedDict from .event import event from . import devices from . import util @@ -158,6 +159,8 @@ class AD2USB(object): on_bypass = event.Event('Called when a zone is bypassed.') on_boot = event.Event('Called when the device finishes bootings.') on_config_received = event.Event('Called when the device receives its configuration.') + on_fault = event.Event('Called when the device detects a zone fault.') + on_restore = event.Event('Called when the device detects that a fault is restored.') # Mid-level Events on_message = event.Event('Called when a message has been received from the device.') @@ -174,6 +177,8 @@ class AD2USB(object): F3 = unichr(3) + unichr(3) + unichr(3) F4 = unichr(4) + unichr(4) + unichr(4) + ZONE_EXPIRE = 30 + def __init__(self, device): """ Constructor @@ -184,6 +189,7 @@ class AD2USB(object): self._bypass_status = None self._armed_status = None self._fire_status = None + self._zone_status = OrderedDict() self.address = 18 self.configbits = 0xFF00 @@ -374,6 +380,37 @@ class AD2USB(object): if old_status is not None: self.on_fire(self._fire_status) + if message.check_zone or (not message.ready and "FAULT" in message.text): + self._update_zone_status(message) + + self._clear_expired_zones(message) + + def _update_zone_status(self, message): + zone = -1 + + try: + zone = int(message.numeric_code) + except ValueError: + zone = int(message.numeric_code, 16) + + if zone not in self._zone_status: + self.on_fault(zone) + + self._last_zone_fault = zone + self._zone_status[zone] = (True, time.time()) + + def _clear_expired_zones(self, message): + clear_time = time.time() + cleared_zones = [] + + for z, status in self._zone_status.iteritems(): + if message.ready or (status[0] and clear_time - status[1] >= self.ZONE_EXPIRE): + cleared_zones.append(z) + + for z in cleared_zones: + del self._zone_status[z] + self.on_restore(z) + def _on_open(self, sender, args): """ Internal handler for opening the device. diff --git a/test.py b/test.py index fff0bfb..48c50ad 100755 --- a/test.py +++ b/test.py @@ -84,6 +84,12 @@ def handle_boot(sender, args): def handle_config(sender, args): print 'config', args +def handle_fault(sender, args): + print 'zone fault', args + +def handle_restore(sender, args): + print 'zone restored', args + def upload_usb(): dev = pyad2usb.ad2usb.devices.USBDevice() @@ -228,12 +234,32 @@ def test_socket(): a2u.on_config_received += handle_config a2u.on_arm += handle_arm a2u.on_disarm += handle_disarm + a2u.on_fault += handle_fault + a2u.on_restore += handle_restore a2u.open() #a2u.save_config() #a2u.reboot() a2u.get_config() + #a2u.address = 18 + #a2u.configbits = 0xff00 + #a2u.address_mask = 0xFFFFFFFF + #a2u.emulate_zone[0] = False + #a2u.emulate_relay[0] = False + #a2u.emulate_lrr = False + #a2u.deduplicate = False + + #time.sleep(3) + #a2u.emulate_zone[1] = True + #a2u.save_config() + + #time.sleep(1) + #a2u.fault_zone(17, True) + + #time.sleep(15) + #a2u.clear_zone(17) + while running: time.sleep(0.1) From 9251e192bd0a4920b6f0a6d98cfc07a5dcfb6f09 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Fri, 14 Jun 2013 10:29:35 -0700 Subject: [PATCH 24/30] It's a mess, but I think this works. --- pyad2usb/ad2usb.py | 209 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 188 insertions(+), 21 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 5798ee8..0c7b9cd 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -189,7 +189,9 @@ class AD2USB(object): self._bypass_status = None self._armed_status = None self._fire_status = None - self._zone_status = OrderedDict() + self._zones_faulted = [] + self._last_zone_fault = 0 + self._last_wait = False self.address = 18 self.configbits = 0xFF00 @@ -380,37 +382,202 @@ class AD2USB(object): if old_status is not None: self.on_fire(self._fire_status) - if message.check_zone or (not message.ready and "FAULT" in message.text): - self._update_zone_status(message) + self._update_zone_status(message) - self._clear_expired_zones(message) + #self._clear_expired_zones(message) def _update_zone_status(self, message): - zone = -1 + #if message.check_zone or (not message.ready and "FAULT" in message.text): - try: - zone = int(message.numeric_code) - except ValueError: - zone = int(message.numeric_code, 16) + if "Hit * for faults" in message.text: + self._device.send('*') + return - if zone not in self._zone_status: - self.on_fault(zone) + if message.ready: + cleared_zones = [] - self._last_zone_fault = zone - self._zone_status[zone] = (True, time.time()) + for z in self._zones_faulted: + cleared_zones.append(z) - def _clear_expired_zones(self, message): - clear_time = time.time() - cleared_zones = [] + for idx, status in enumerate(cleared_zones): + del self._zones_faulted[idx] + self.on_restore(z) - for z, status in self._zone_status.iteritems(): - if message.ready or (status[0] and clear_time - status[1] >= self.ZONE_EXPIRE): - cleared_zones.append(z) + elif "FAULT" in message.text: + zone = -1 + + try: + zone = int(message.numeric_code) + except ValueError: + zone = int(message.numeric_code, 16) + + if zone not in self._zones_faulted: + # if self._last_zone_fault == 0: + # idx = 0 + # else: + # idx = self._zones_faulted.index(self._last_zone_fault) + 1 - for z in cleared_zones: - del self._zone_status[z] + self._last_zone_fault = zone + self._last_wait = True + self._zones_faulted.append(zone) + self._zones_faulted.sort() + self.on_fault(zone) + + self._clear_expired_zones(zone) + self._last_zone_fault = zone + + def _clear_expired_zones(self, zone): + cleared_zones = [] + + found_last = False + found_end = False + + print '_clear_expired_zones: ', repr(self._zones_faulted) + + # ---------- + #for idx in range(len(self._zones_faulted)): + # idx = 0 + # while idx < len(self._zones_faulted): + # z = self._zones_faulted[idx] + + # if not found_last: + # if z == self._last_zone_fault: + # print ' found start point', z + # found_last = True + + # if found_last: + # if z == zone and self._last_zone_fault != zone and not break_loop: + # print ' found end point', z + # found_end = True + # break + # elif z != self._last_zone_fault and len(self._zones_faulted) > 1: + # print ' clearing', z + # cleared_zones.append(z) + + # if idx == len(self._zones_faulted) - 1 and not found_end: + # print ' rolling back to front of the list.' + # idx = 0 + # break_loop = True + # else: + # idx += 1 + + # ---------- + # idx = 0 + # while not found_end and idx < len(self._zones_faulted): + # z = self._zones_faulted[idx] + + # if z == zone and found_last: + # print ' found end point, exiting', z + # found_end = True + # break + + # if not found_last and z == self._last_zone_fault: + # print ' found start point', z + # found_last = True + + # if found_last: + # print 'removing', z + # self._zones_faulted.remove(z) + + # #print ' idx', idx + # #print ' end', found_end + # #print ' start', found_last + # if idx >= len(self._zones_faulted) - 1 and not found_end and found_last: + # print ' roll' + # idx = 0 + # else: + # idx += 1 + + # ----- + # idx = 0 + # start_pos = -1 + # end_pos = -1 + + # while idx < len(self._zones_faulted): + # z = self._zones_faulted[idx] + + # if z == self._last_zone_fault or self._last_zone_fault == 0: + # print 'start', idx + # start_pos = idx + + # if z == zone: + # print 'end', idx + # end_pos = idx + + # if idx >= len(self._zones_faulted) - 1 and end_pos == -1 and start_pos != -1: + # print 'roll' + # idx = 0 + # else: + # idx += 1 + + # if start_pos < end_pos: + # diff = end_pos - start_pos + + # if diff > 1 and not self._last_wait: + # print 'deleting', start_pos + 1, end_pos + # del self._zones_faulted[start_pos + 1:end_pos] + # elif end_pos < start_pos: + # diff = len(self._zones_faulted) - start_pos + end_pos + # if diff > 1 and not self._last_wait: + # print 'deleting', start_pos + 1, ' -> end' + # del self._zones_faulted[start_pos + 1:] + + # print 'deleting', 'start -> ', end_pos + # del self._zones_faulted[:end_pos] + + # if self._last_wait == True: + # self._last_wait = False + + # for idx, z in enumerate(cleared_zones): + # print ' !remove it', z + # #del self._zones_faulted[idx] + # self._zones_faulted.remove(z) + # self.on_restore(z) + + # ----- + idx = 0 + start_pos = -1 + end_pos = -1 + + while idx < len(self._zones_faulted): + z = self._zones_faulted[idx] + + if z == self._last_zone_fault or self._last_zone_fault == 0: + print 'start', idx + start_pos = idx + + if z == zone: + print 'end', idx + end_pos = idx + + if idx >= len(self._zones_faulted) - 1 and end_pos == -1 and start_pos != -1: + print 'roll' + idx = 0 + else: + idx += 1 + + if start_pos < end_pos: + diff = end_pos - start_pos + + if diff > 1: + print 'deleting', start_pos + 1, end_pos + del self._zones_faulted[start_pos + 1:end_pos] + elif end_pos <= start_pos: + diff = len(self._zones_faulted) - start_pos + end_pos + if diff > 1: + print 'deleting', start_pos + 1, ' -> end' + del self._zones_faulted[start_pos + 1:] + + print 'deleting', 'start -> ', end_pos + del self._zones_faulted[:end_pos] + + for idx, z in enumerate(cleared_zones): + print ' !remove it', z + #del self._zones_faulted[idx] + self._zones_faulted.remove(z) self.on_restore(z) + def _on_open(self, sender, args): """ Internal handler for opening the device. From 49966e34ce12e7e8b78732aeb3a1b530b6eefc05 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Fri, 14 Jun 2013 14:59:07 -0700 Subject: [PATCH 25/30] With with Sean's implementation. --- pyad2usb/ad2usb.py | 209 ++++++++++----------------------------------- 1 file changed, 46 insertions(+), 163 deletions(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 0c7b9cd..1a00177 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -191,7 +191,6 @@ class AD2USB(object): self._fire_status = None self._zones_faulted = [] self._last_zone_fault = 0 - self._last_wait = False self.address = 18 self.configbits = 0xFF00 @@ -384,25 +383,18 @@ class AD2USB(object): self._update_zone_status(message) - #self._clear_expired_zones(message) - def _update_zone_status(self, message): - #if message.check_zone or (not message.ready and "FAULT" in message.text): - if "Hit * for faults" in message.text: - self._device.send('*') + self._device.write('*') return if message.ready: - cleared_zones = [] - - for z in self._zones_faulted: - cleared_zones.append(z) - - for idx, status in enumerate(cleared_zones): - del self._zones_faulted[idx] + for idx, z in enumerate(self._zones_faulted): self.on_restore(z) + del self._zones_faulted[:] + self._last_zone_fault = 0 + elif "FAULT" in message.text: zone = -1 @@ -411,173 +403,64 @@ class AD2USB(object): except ValueError: zone = int(message.numeric_code, 16) - if zone not in self._zones_faulted: - # if self._last_zone_fault == 0: - # idx = 0 - # else: - # idx = self._zones_faulted.index(self._last_zone_fault) + 1 - - self._last_zone_fault = zone - self._last_wait = True + if zone in self._zones_faulted: + self._clear_expired_zones(zone) + else: self._zones_faulted.append(zone) self._zones_faulted.sort() self.on_fault(zone) - self._clear_expired_zones(zone) self._last_zone_fault = zone def _clear_expired_zones(self, zone): cleared_zones = [] + found_last, found_new, at_end = False, False, False - found_last = False - found_end = False - - print '_clear_expired_zones: ', repr(self._zones_faulted) - - # ---------- - #for idx in range(len(self._zones_faulted)): - # idx = 0 - # while idx < len(self._zones_faulted): - # z = self._zones_faulted[idx] - - # if not found_last: - # if z == self._last_zone_fault: - # print ' found start point', z - # found_last = True - - # if found_last: - # if z == zone and self._last_zone_fault != zone and not break_loop: - # print ' found end point', z - # found_end = True - # break - # elif z != self._last_zone_fault and len(self._zones_faulted) > 1: - # print ' clearing', z - # cleared_zones.append(z) - - # if idx == len(self._zones_faulted) - 1 and not found_end: - # print ' rolling back to front of the list.' - # idx = 0 - # break_loop = True - # else: - # idx += 1 - - # ---------- - # idx = 0 - # while not found_end and idx < len(self._zones_faulted): - # z = self._zones_faulted[idx] - - # if z == zone and found_last: - # print ' found end point, exiting', z - # found_end = True - # break - - # if not found_last and z == self._last_zone_fault: - # print ' found start point', z - # found_last = True - - # if found_last: - # print 'removing', z - # self._zones_faulted.remove(z) - - # #print ' idx', idx - # #print ' end', found_end - # #print ' start', found_last - # if idx >= len(self._zones_faulted) - 1 and not found_end and found_last: - # print ' roll' - # idx = 0 - # else: - # idx += 1 - - # ----- - # idx = 0 - # start_pos = -1 - # end_pos = -1 - - # while idx < len(self._zones_faulted): - # z = self._zones_faulted[idx] - - # if z == self._last_zone_fault or self._last_zone_fault == 0: - # print 'start', idx - # start_pos = idx - - # if z == zone: - # print 'end', idx - # end_pos = idx - - # if idx >= len(self._zones_faulted) - 1 and end_pos == -1 and start_pos != -1: - # print 'roll' - # idx = 0 - # else: - # idx += 1 - - # if start_pos < end_pos: - # diff = end_pos - start_pos - - # if diff > 1 and not self._last_wait: - # print 'deleting', start_pos + 1, end_pos - # del self._zones_faulted[start_pos + 1:end_pos] - # elif end_pos < start_pos: - # diff = len(self._zones_faulted) - start_pos + end_pos - # if diff > 1 and not self._last_wait: - # print 'deleting', start_pos + 1, ' -> end' - # del self._zones_faulted[start_pos + 1:] - - # print 'deleting', 'start -> ', end_pos - # del self._zones_faulted[:end_pos] - - # if self._last_wait == True: - # self._last_wait = False - - # for idx, z in enumerate(cleared_zones): - # print ' !remove it', z - # #del self._zones_faulted[idx] - # self._zones_faulted.remove(z) - # self.on_restore(z) - - # ----- - idx = 0 - start_pos = -1 - end_pos = -1 - - while idx < len(self._zones_faulted): - z = self._zones_faulted[idx] - - if z == self._last_zone_fault or self._last_zone_fault == 0: - print 'start', idx - start_pos = idx - - if z == zone: - print 'end', idx - end_pos = idx - - if idx >= len(self._zones_faulted) - 1 and end_pos == -1 and start_pos != -1: - print 'roll' - idx = 0 - else: - idx += 1 + it = iter(self._zones_faulted) + try: + while not found_last: + z = it.next() - if start_pos < end_pos: - diff = end_pos - start_pos + if z == self._last_zone_fault: + found_last = True + break - if diff > 1: - print 'deleting', start_pos + 1, end_pos - del self._zones_faulted[start_pos + 1:end_pos] - elif end_pos <= start_pos: - diff = len(self._zones_faulted) - start_pos + end_pos - if diff > 1: - print 'deleting', start_pos + 1, ' -> end' - del self._zones_faulted[start_pos + 1:] + except StopIteration: + at_end = True - print 'deleting', 'start -> ', end_pos - del self._zones_faulted[:end_pos] + try: + while not at_end and not found_new: + z = it.next() + + if z == zone: + found_new = True + break + else: + cleared_zones += [z] + + except StopIteration: + pass + + if not found_new: + it = iter(self._zones_faulted) + + try: + while not found_new: + z = it.next() + + if z == zone: + found_new = True + break + else: + cleared_zones += [z] + + except StopIteration: + pass for idx, z in enumerate(cleared_zones): - print ' !remove it', z - #del self._zones_faulted[idx] self._zones_faulted.remove(z) self.on_restore(z) - def _on_open(self, sender, args): """ Internal handler for opening the device. From 93f94fdb635ed8fe391b8692139d27670bd6ef3a Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Fri, 14 Jun 2013 15:00:07 -0700 Subject: [PATCH 26/30] Forgot format parameters for LRRs str conversion. --- pyad2usb/ad2usb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 04706e5..73d974f 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -583,7 +583,7 @@ class LRRMessage(object): """ String conversion operator. """ - return 'lrr > {0} @ {1} -- {2}'.format() + return 'lrr > {0} @ {1} -- {2}'.format(self._event_type, self._partition, self._event_data) def _parse_message(self, data): """ From 286635ea85a61061ff84a6deb5b039aaef0848f9 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 17 Jun 2013 11:08:43 -0700 Subject: [PATCH 27/30] Commenting. --- pyad2usb/ad2usb.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 1a00177..f934653 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -384,10 +384,16 @@ class AD2USB(object): self._update_zone_status(message) def _update_zone_status(self, message): + """ + Update zone statuses based on the current message. + """ + # Retrieve a list of faults. + # NOTE: This only happens on first boot or after exiting programming mode. if "Hit * for faults" in message.text: self._device.write('*') return + # Panel is ready, restore all zones. if message.ready: for idx, z in enumerate(self._zones_faulted): self.on_restore(z) @@ -395,14 +401,19 @@ class AD2USB(object): del self._zones_faulted[:] self._last_zone_fault = 0 + # Process fault elif "FAULT" in message.text: zone = -1 + # Apparently this representation can be both base 10 + # or base 16, depending on where the message came + # from. try: zone = int(message.numeric_code) except ValueError: zone = int(message.numeric_code, 16) + # Add new zones and clear expired ones. if zone in self._zones_faulted: self._clear_expired_zones(zone) else: @@ -410,12 +421,17 @@ class AD2USB(object): self._zones_faulted.sort() self.on_fault(zone) + # Save our spot for the next message. self._last_zone_fault = zone def _clear_expired_zones(self, zone): + """ + Clear all expired zones from our status list. + """ cleared_zones = [] found_last, found_new, at_end = False, False, False + # First pass: Find our start spot. it = iter(self._zones_faulted) try: while not found_last: @@ -428,6 +444,8 @@ class AD2USB(object): except StopIteration: at_end = True + # Continue until we find our end point and add zones in + # between to our clear list. try: while not at_end and not found_new: z = it.next() @@ -441,6 +459,8 @@ class AD2USB(object): except StopIteration: pass + # Second pass: roll through the list again if we didn't find + # our end point and remove everything until we do. if not found_new: it = iter(self._zones_faulted) @@ -457,6 +477,7 @@ class AD2USB(object): except StopIteration: pass + # Actually remove the zones and trigger the restores. for idx, z in enumerate(cleared_zones): self._zones_faulted.remove(z) self.on_restore(z) From 2fe77a2571d745146e79dd445c6e798ca141874c Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 17 Jun 2013 16:57:24 -0700 Subject: [PATCH 28/30] Moved to its own class. ADded support for timeouts and check zones. --- pyad2usb/ad2usb.py | 123 +++++---------------------- pyad2usb/zonetracking.py | 176 +++++++++++++++++++++++++++++++++++++++ test.py | 4 +- 3 files changed, 201 insertions(+), 102 deletions(-) create mode 100644 pyad2usb/zonetracking.py diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index f934653..69bff97 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -10,6 +10,7 @@ from collections import OrderedDict from .event import event from . import devices from . import util +from . import zonetracking class Overseer(object): """ @@ -159,8 +160,8 @@ class AD2USB(object): on_bypass = event.Event('Called when a zone is bypassed.') on_boot = event.Event('Called when the device finishes bootings.') on_config_received = event.Event('Called when the device receives its configuration.') - on_fault = event.Event('Called when the device detects a zone fault.') - on_restore = event.Event('Called when the device detects that a fault is restored.') + on_zone_fault = event.Event('Called when the device detects a zone fault.') + on_zone_restore = event.Event('Called when the device detects that a fault is restored.') # Mid-level Events on_message = event.Event('Called when a message has been received from the device.') @@ -177,20 +178,18 @@ class AD2USB(object): F3 = unichr(3) + unichr(3) + unichr(3) F4 = unichr(4) + unichr(4) + unichr(4) - ZONE_EXPIRE = 30 - def __init__(self, device): """ Constructor """ self._device = device + self._zonetracker = zonetracking.Zonetracker() + self._power_status = None self._alarm_status = None self._bypass_status = None self._armed_status = None self._fire_status = None - self._zones_faulted = [] - self._last_zone_fault = 0 self.address = 18 self.configbits = 0xFF00 @@ -285,6 +284,8 @@ class AD2USB(object): self._device.on_close += self._on_close self._device.on_read += self._on_read self._device.on_write += self._on_write + self._zonetracker.on_fault += self._on_zone_fault + self._zonetracker.on_restore += self._on_zone_restore def _handle_message(self, data): """ @@ -381,106 +382,16 @@ class AD2USB(object): if old_status is not None: self.on_fire(self._fire_status) - self._update_zone_status(message) + self._update_zone_tracker(message) - def _update_zone_status(self, message): - """ - Update zone statuses based on the current message. - """ + def _update_zone_tracker(self, message): # Retrieve a list of faults. # NOTE: This only happens on first boot or after exiting programming mode. - if "Hit * for faults" in message.text: + if not message.ready and "Hit * for faults" in message.text: self._device.write('*') return - # Panel is ready, restore all zones. - if message.ready: - for idx, z in enumerate(self._zones_faulted): - self.on_restore(z) - - del self._zones_faulted[:] - self._last_zone_fault = 0 - - # Process fault - elif "FAULT" in message.text: - zone = -1 - - # Apparently this representation can be both base 10 - # or base 16, depending on where the message came - # from. - try: - zone = int(message.numeric_code) - except ValueError: - zone = int(message.numeric_code, 16) - - # Add new zones and clear expired ones. - if zone in self._zones_faulted: - self._clear_expired_zones(zone) - else: - self._zones_faulted.append(zone) - self._zones_faulted.sort() - self.on_fault(zone) - - # Save our spot for the next message. - self._last_zone_fault = zone - - def _clear_expired_zones(self, zone): - """ - Clear all expired zones from our status list. - """ - cleared_zones = [] - found_last, found_new, at_end = False, False, False - - # First pass: Find our start spot. - it = iter(self._zones_faulted) - try: - while not found_last: - z = it.next() - - if z == self._last_zone_fault: - found_last = True - break - - except StopIteration: - at_end = True - - # Continue until we find our end point and add zones in - # between to our clear list. - try: - while not at_end and not found_new: - z = it.next() - - if z == zone: - found_new = True - break - else: - cleared_zones += [z] - - except StopIteration: - pass - - # Second pass: roll through the list again if we didn't find - # our end point and remove everything until we do. - if not found_new: - it = iter(self._zones_faulted) - - try: - while not found_new: - z = it.next() - - if z == zone: - found_new = True - break - else: - cleared_zones += [z] - - except StopIteration: - pass - - # Actually remove the zones and trigger the restores. - for idx, z in enumerate(cleared_zones): - self._zones_faulted.remove(z) - self.on_restore(z) + self._zonetracker.update(message) def _on_open(self, sender, args): """ @@ -510,6 +421,18 @@ class AD2USB(object): """ self.on_write(args) + def _on_zone_fault(self, sender, args): + """ + Internal handler for zone faults. + """ + self.on_zone_fault(args) + + def _on_zone_restore(self, sender, args): + """ + Internal handler for zone restoration. + """ + self.on_zone_restore(args) + class Message(object): """ Represents a message from the alarm panel. diff --git a/pyad2usb/zonetracking.py b/pyad2usb/zonetracking.py new file mode 100644 index 0000000..47d3755 --- /dev/null +++ b/pyad2usb/zonetracking.py @@ -0,0 +1,176 @@ +""" +Provides zone tracking functionality for the AD2USB device family. +""" + +import time +from .event import event + +class Zone(object): + """ + Representation of a panel zone. + """ + + CLEAR = 0 + FAULT = 1 + WIRE_FAULT = 2 + + def __init__(self, zone=0, name='', status=CLEAR): + self.zone = zone + self.name = name + self.status = status + self.timestamp = time.time() + + def __str__(self): + return '[{0}] {1} - ts {2}'.format(self.zone, self.status, self.timestamp) + +class Zonetracker(object): + """ + Handles tracking of zone and their statuses. + """ + + on_fault = event.Event('Called when the device detects a zone fault.') + on_restore = event.Event('Called when the device detects that a fault is restored.') + + EXPIRE = 30 + + def __init__(self): + """ + Constructor + """ + self._zones = {} + self._zones_faulted = [] + self._last_zone_fault = 0 + + def update(self, message): + """ + Update zone statuses based on the current message. + """ + # Panel is ready, restore all zones. + if message.ready: + for idx, z in enumerate(self._zones_faulted): + self._update_zone(z, Zone.CLEAR) + + self._last_zone_fault = 0 + + # Process fault + elif "FAULT" in message.text or message.check_zone: + zone = -1 + + # Apparently this representation can be both base 10 + # or base 16, depending on where the message came + # from. + try: + zone = int(message.numeric_code) + except ValueError: + zone = int(message.numeric_code, 16) + + # Add new zones and clear expired ones. + if zone in self._zones_faulted: + self._update_zone(zone, Zone.FAULT) + self._clear_zones(zone) + else: + self._add_zone(zone, status=Zone.FAULT) + + # Save our spot for the next message. + self._last_zone_fault = zone + + self._clear_expired_zones() + + def _clear_zones(self, zone): + """ + Clear all expired zones from our status list. + """ + cleared_zones = [] + found_last = found_new = at_end = False + + # First pass: Find our start spot. + it = iter(self._zones_faulted) + try: + while not found_last: + z = it.next() + + if z == self._last_zone_fault: + found_last = True + break + + except StopIteration: + at_end = True + + # Continue until we find our end point and add zones in + # between to our clear list. + try: + while not at_end and not found_new: + z = it.next() + + if z == zone: + found_new = True + break + else: + cleared_zones += [z] + + except StopIteration: + pass + + # Second pass: roll through the list again if we didn't find + # our end point and remove everything until we do. + if not found_new: + it = iter(self._zones_faulted) + + try: + while not found_new: + z = it.next() + + if z == zone: + found_new = True + break + else: + cleared_zones += [z] + + except StopIteration: + pass + + # Actually remove the zones and trigger the restores. + for idx, z in enumerate(cleared_zones): + self._update_zone(z, Zone.CLEAR) + + def _clear_expired_zones(self): + cleared_zones = [] + + for z in self._zones_faulted: + cleared_zones += [z] + + for z in cleared_zones: + if self._zone_expired(z): + self._update_zone(z, Zone.CLEAR) + + def _add_zone(self, zone, name='', status=Zone.CLEAR): + """ + Adds a zone to the internal zone list. + """ + if not zone in self._zones: + self._zones[zone] = Zone(zone=zone, name=name, status=status) + + if status != Zone.CLEAR: + self._zones_faulted.append(zone) + self._zones_faulted.sort() + self.on_fault(zone) + + def _update_zone(self, zone, status): + """ + Updates a zones status. + """ + if not zone in self._zones: + raise IndexError('Zone does not exist and cannot be updated: %d', zone) + + self._zones[zone].status = status + self._zones[zone].timestamp = time.time() + + if status == Zone.CLEAR: + self._zones_faulted.remove(zone) + self.on_restore(zone) + + def _zone_expired(self, zone): + if time.time() > self._zones[zone].timestamp + Zonetracker.EXPIRE: + return True + + return False diff --git a/test.py b/test.py index 48c50ad..21a9059 100755 --- a/test.py +++ b/test.py @@ -234,8 +234,8 @@ def test_socket(): a2u.on_config_received += handle_config a2u.on_arm += handle_arm a2u.on_disarm += handle_disarm - a2u.on_fault += handle_fault - a2u.on_restore += handle_restore + a2u.on_zone_fault += handle_fault + a2u.on_zone_restore += handle_restore a2u.open() #a2u.save_config() From 1ffbb4a22b87fd9c76e77fcf50e284ad0bd5059f Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Mon, 17 Jun 2013 17:21:08 -0700 Subject: [PATCH 29/30] Added support for wire faults and fixed up repr for zone. --- pyad2usb/zonetracking.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pyad2usb/zonetracking.py b/pyad2usb/zonetracking.py index 47d3755..32d475d 100644 --- a/pyad2usb/zonetracking.py +++ b/pyad2usb/zonetracking.py @@ -12,7 +12,9 @@ class Zone(object): CLEAR = 0 FAULT = 1 - WIRE_FAULT = 2 + CHECK = 2 # Wire fault + + STATUS = { CLEAR: 'CLEAR', FAULT: 'FAULT', CHECK: 'CHECK' } def __init__(self, zone=0, name='', status=CLEAR): self.zone = zone @@ -21,7 +23,10 @@ class Zone(object): self.timestamp = time.time() def __str__(self): - return '[{0}] {1} - ts {2}'.format(self.zone, self.status, self.timestamp) + return 'Zone {0} {1}'.format(self.zone, self.name) + + def __repr__(self): + return 'Zone({0}, {1}, ts {2})'.format(self.zone, Zone.STATUS[self.status], self.timestamp) class Zonetracker(object): """ @@ -66,10 +71,14 @@ class Zonetracker(object): # Add new zones and clear expired ones. if zone in self._zones_faulted: - self._update_zone(zone, Zone.FAULT) + self._update_zone(zone) self._clear_zones(zone) else: - self._add_zone(zone, status=Zone.FAULT) + status = Zone.FAULT + if message.check_zone: + status = Zone.CHECK + + self._add_zone(zone, status=status) # Save our spot for the next message. self._last_zone_fault = zone @@ -83,6 +92,8 @@ class Zonetracker(object): cleared_zones = [] found_last = found_new = at_end = False + #print 'zones', self._zones + # First pass: Find our start spot. it = iter(self._zones_faulted) try: @@ -155,14 +166,16 @@ class Zonetracker(object): self._zones_faulted.sort() self.on_fault(zone) - def _update_zone(self, zone, status): + def _update_zone(self, zone, status=None): """ Updates a zones status. """ if not zone in self._zones: raise IndexError('Zone does not exist and cannot be updated: %d', zone) - self._zones[zone].status = status + if status is not None: + self._zones[zone].status = status + self._zones[zone].timestamp = time.time() if status == Zone.CLEAR: From 7e2ad594cafea946beaa24c51ae5f589d44ab399 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Tue, 18 Jun 2013 11:57:33 -0700 Subject: [PATCH 30/30] Added support for Expander messages. API changes to support address/channel targeting of faults. Moved messages into their own namespace. Bugfixes. --- pyad2usb/ad2usb.py | 263 ++++++--------------------------------- pyad2usb/messages.py | 197 +++++++++++++++++++++++++++++ pyad2usb/zonetracking.py | 90 ++++++++------ test.py | 10 +- 4 files changed, 300 insertions(+), 260 deletions(-) create mode 100644 pyad2usb/messages.py diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 69bff97..a034004 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -10,6 +10,7 @@ from collections import OrderedDict from .event import event from . import devices from . import util +from . import messages from . import zonetracking class Overseer(object): @@ -266,6 +267,13 @@ class AD2USB(object): """ Faults a zone if we are emulating a zone expander. """ + # Allow ourselves to also be passed an address/channel combination + # for zone expanders. + # + # Format (expander index, channel) + if isinstance(zone, tuple): + zone = self._zonetracker._expander_to_zone(*zone) + status = 2 if simulate_wire_problem else 1 self._device.write("L{0:02}{1}\r".format(zone, status)) @@ -297,7 +305,7 @@ class AD2USB(object): msg = None if data[0] != '!': - msg = Message(data) + msg = messages.Message(data) if self.address_mask & msg.mask > 0: self._update_internal_states(msg) @@ -306,11 +314,12 @@ class AD2USB(object): header = data[0:4] if header == '!EXP' or header == '!REL': - msg = ExpanderMessage(data) + msg = messages.ExpanderMessage(data) + self._update_internal_states(msg) elif header == '!RFX': - msg = RFMessage(data) + msg = messages.RFMessage(data) elif header == '!LRR': - msg = LRRMessage(data) + msg = messages.LRRMessage(data) elif data.startswith('!Ready'): self.on_boot() elif data.startswith('!CONFIG'): @@ -349,47 +358,49 @@ class AD2USB(object): """ Updates internal device states. """ - if message.ac_power != self._power_status: - self._power_status, old_status = message.ac_power, self._power_status + if isinstance(message, messages.Message): + if message.ac_power != self._power_status: + self._power_status, old_status = message.ac_power, self._power_status - if old_status is not None: - self.on_power_changed(self._power_status) + if old_status is not None: + self.on_power_changed(self._power_status) - if message.alarm_sounding != self._alarm_status: - self._alarm_status, old_status = message.alarm_sounding, self._alarm_status + if message.alarm_sounding != self._alarm_status: + self._alarm_status, old_status = message.alarm_sounding, self._alarm_status - if old_status is not None: - self.on_alarm(self._alarm_status) + if old_status is not None: + self.on_alarm(self._alarm_status) - if message.zone_bypassed != self._bypass_status: - self._bypass_status, old_status = message.zone_bypassed, self._bypass_status + if message.zone_bypassed != self._bypass_status: + self._bypass_status, old_status = message.zone_bypassed, self._bypass_status - if old_status is not None: - self.on_bypass(self._bypass_status) + if old_status is not None: + self.on_bypass(self._bypass_status) - if (message.armed_away | message.armed_home) != self._armed_status: - self._armed_status, old_status = message.armed_away | message.armed_home, self._armed_status + if (message.armed_away | message.armed_home) != self._armed_status: + self._armed_status, old_status = message.armed_away | message.armed_home, self._armed_status - if old_status is not None: - if self._armed_status: - self.on_arm() - else: - self.on_disarm() + if old_status is not None: + if self._armed_status: + self.on_arm() + else: + self.on_disarm() - if message.fire_alarm != self._fire_status: - self._fire_status, old_status = message.fire_alarm, self._fire_status + if message.fire_alarm != self._fire_status: + self._fire_status, old_status = message.fire_alarm, self._fire_status - if old_status is not None: - self.on_fire(self._fire_status) + if old_status is not None: + self.on_fire(self._fire_status) self._update_zone_tracker(message) def _update_zone_tracker(self, message): # Retrieve a list of faults. # NOTE: This only happens on first boot or after exiting programming mode. - if not message.ready and "Hit * for faults" in message.text: - self._device.write('*') - return + if isinstance(message, messages.Message): + if not message.ready and "Hit * for faults" in message.text: + self._device.write('*') + return self._zonetracker.update(message) @@ -432,195 +443,3 @@ class AD2USB(object): Internal handler for zone restoration. """ self.on_zone_restore(args) - -class Message(object): - """ - Represents a message from the alarm panel. - """ - - def __init__(self, data=None): - """ - Constructor - """ - self.ready = False - self.armed_away = False - self.armed_home = False - self.backlight_on = False - self.programming_mode = False - self.beeps = -1 - self.zone_bypassed = False - self.ac_power = False - self.chime_on = False - self.alarm_event_occurred = False - self.alarm_sounding = False - self.battery_low = False - self.entry_delay_off = False - self.fire_alarm = False - self.check_zone = False - self.perimeter_only = False - self.numeric_code = "" - self.text = "" - self.cursor_location = -1 - self.data = "" - self.mask = "" - self.bitfield = "" - self.panel_data = "" - - self._regex = re.compile('("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*)') - - if data is not None: - self._parse_message(data) - - def _parse_message(self, data): - """ - Parse the message from the device. - """ - m = self._regex.match(data) - - if m is None: - raise util.InvalidMessageError('Received invalid message: {0}'.format(data)) - - self.bitfield, self.numeric_code, self.panel_data, alpha = m.group(1, 2, 3, 4) - self.mask = int(self.panel_data[3:3+8], 16) - - self.data = data - self.ready = not self.bitfield[1:2] == "0" - self.armed_away = not self.bitfield[2:3] == "0" - self.armed_home = not self.bitfield[3:4] == "0" - self.backlight_on = not self.bitfield[4:5] == "0" - self.programming_mode = not self.bitfield[5:6] == "0" - self.beeps = int(self.bitfield[6:7], 16) - self.zone_bypassed = not self.bitfield[7:8] == "0" - self.ac_power = not self.bitfield[8:9] == "0" - self.chime_on = not self.bitfield[9:10] == "0" - self.alarm_event_occurred = not self.bitfield[10:11] == "0" - self.alarm_sounding = not self.bitfield[11:12] == "0" - self.battery_low = not self.bitfield[12:13] == "0" - self.entry_delay_off = not self.bitfield[13:14] == "0" - self.fire_alarm = not self.bitfield[14:15] == "0" - self.check_zone = not self.bitfield[15:16] == "0" - self.perimeter_only = not self.bitfield[16:17] == "0" - # bits 17-20 unused. - self.text = alpha.strip('"') - - if int(self.panel_data[19:21], 16) & 0x01 > 0: - self.cursor_location = int(self.bitfield[21:23], 16) # Alpha character index that the cursor is on. - - def __str__(self): - """ - String conversion operator. - """ - return 'msg > {0:0<9} [{1}{2}{3}] -- ({4}) {5}'.format(hex(self.mask), 1 if self.ready else 0, 1 if self.armed_away else 0, 1 if self.armed_home else 0, self.numeric_code, self.text) - -class ExpanderMessage(object): - """ - Represents a message from a zone or relay expansion module. - """ - - ZONE = 0 - RELAY = 1 - - def __init__(self, data=None): - """ - Constructor - """ - self.type = None - self.address = None - self.channel = None - self.value = None - self.raw = None - - if data is not None: - self._parse_message(data) - - def __str__(self): - """ - String conversion operator. - """ - expander_type = 'UNKWN' - if self.type == ExpanderMessage.ZONE: - expander_type = 'ZONE' - elif self.type == ExpanderMessage.RELAY: - expander_type = 'RELAY' - - return 'exp > [{0: <5}] {1}/{2} -- {3}'.format(expander_type, self.address, self.channel, self.value) - - def _parse_message(self, data): - """ - Parse the raw message from the device. - """ - header, values = data.split(':') - address, channel, value = values.split(',') - - self.raw = data - self.address = address - self.channel = channel - self.value = value - - if header == '!EXP': - self.type = ExpanderMessage.ZONE - elif header == '!REL': - self.type = ExpanderMessage.RELAY - -class RFMessage(object): - """ - Represents a message from an RF receiver. - """ - - def __init__(self, data=None): - """ - Constructor - """ - self.raw = None - self.serial_number = None - self.value = None - - if data is not None: - self._parse_message(data) - - def __str__(self): - """ - String conversion operator. - """ - return 'rf > {0}: {1}'.format(self.serial_number, self.value) - - def _parse_message(self, data): - """ - Parses the raw message from the device. - """ - self.raw = data - - _, values = data.split(':') - self.serial_number, self.value = values.split(',') - -class LRRMessage(object): - """ - Represent a message from a Long Range Radio. - """ - - def __init__(self, data=None): - """ - Constructor - """ - self.raw = None - self._event_data = None - self._partition = None - self._event_type = None - - if data is not None: - self._parse_message(data) - - def __str__(self): - """ - String conversion operator. - """ - return 'lrr > {0} @ {1} -- {2}'.format() - - def _parse_message(self, data): - """ - Parses the raw message from the device. - """ - self.raw = data - - _, values = data.split(':') - self._event_data, self._partition, self._event_type = values.split(',') diff --git a/pyad2usb/messages.py b/pyad2usb/messages.py new file mode 100644 index 0000000..86e6e54 --- /dev/null +++ b/pyad2usb/messages.py @@ -0,0 +1,197 @@ +""" +Message representations received from the panel through the AD2USB. +""" + +import re + +class Message(object): + """ + Represents a message from the alarm panel. + """ + + def __init__(self, data=None): + """ + Constructor + """ + self.ready = False + self.armed_away = False + self.armed_home = False + self.backlight_on = False + self.programming_mode = False + self.beeps = -1 + self.zone_bypassed = False + self.ac_power = False + self.chime_on = False + self.alarm_event_occurred = False + self.alarm_sounding = False + self.battery_low = False + self.entry_delay_off = False + self.fire_alarm = False + self.check_zone = False + self.perimeter_only = False + self.numeric_code = "" + self.text = "" + self.cursor_location = -1 + self.data = "" + self.mask = "" + self.bitfield = "" + self.panel_data = "" + + self._regex = re.compile('("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*),("(?:[^"]|"")*"|[^,]*)') + + if data is not None: + self._parse_message(data) + + def _parse_message(self, data): + """ + Parse the message from the device. + """ + m = self._regex.match(data) + + if m is None: + raise util.InvalidMessageError('Received invalid message: {0}'.format(data)) + + self.bitfield, self.numeric_code, self.panel_data, alpha = m.group(1, 2, 3, 4) + self.mask = int(self.panel_data[3:3+8], 16) + + self.data = data + self.ready = not self.bitfield[1:2] == "0" + self.armed_away = not self.bitfield[2:3] == "0" + self.armed_home = not self.bitfield[3:4] == "0" + self.backlight_on = not self.bitfield[4:5] == "0" + self.programming_mode = not self.bitfield[5:6] == "0" + self.beeps = int(self.bitfield[6:7], 16) + self.zone_bypassed = not self.bitfield[7:8] == "0" + self.ac_power = not self.bitfield[8:9] == "0" + self.chime_on = not self.bitfield[9:10] == "0" + self.alarm_event_occurred = not self.bitfield[10:11] == "0" + self.alarm_sounding = not self.bitfield[11:12] == "0" + self.battery_low = not self.bitfield[12:13] == "0" + self.entry_delay_off = not self.bitfield[13:14] == "0" + self.fire_alarm = not self.bitfield[14:15] == "0" + self.check_zone = not self.bitfield[15:16] == "0" + self.perimeter_only = not self.bitfield[16:17] == "0" + # bits 17-20 unused. + self.text = alpha.strip('"') + + if int(self.panel_data[19:21], 16) & 0x01 > 0: + self.cursor_location = int(self.bitfield[21:23], 16) # Alpha character index that the cursor is on. + + def __str__(self): + """ + String conversion operator. + """ + return 'msg > {0:0<9} [{1}{2}{3}] -- ({4}) {5}'.format(hex(self.mask), 1 if self.ready else 0, 1 if self.armed_away else 0, 1 if self.armed_home else 0, self.numeric_code, self.text) + +class ExpanderMessage(object): + """ + Represents a message from a zone or relay expansion module. + """ + + ZONE = 0 + RELAY = 1 + + def __init__(self, data=None): + """ + Constructor + """ + self.type = None + self.address = None + self.channel = None + self.value = None + self.raw = None + + if data is not None: + self._parse_message(data) + + def __str__(self): + """ + String conversion operator. + """ + expander_type = 'UNKWN' + if self.type == ExpanderMessage.ZONE: + expander_type = 'ZONE' + elif self.type == ExpanderMessage.RELAY: + expander_type = 'RELAY' + + return 'exp > [{0: <5}] {1}/{2} -- {3}'.format(expander_type, self.address, self.channel, self.value) + + def _parse_message(self, data): + """ + Parse the raw message from the device. + """ + header, values = data.split(':') + address, channel, value = values.split(',') + + self.raw = data + self.address = address + self.channel = channel + self.value = value + + if header == '!EXP': + self.type = ExpanderMessage.ZONE + elif header == '!REL': + self.type = ExpanderMessage.RELAY + +class RFMessage(object): + """ + Represents a message from an RF receiver. + """ + + def __init__(self, data=None): + """ + Constructor + """ + self.raw = None + self.serial_number = None + self.value = None + + if data is not None: + self._parse_message(data) + + def __str__(self): + """ + String conversion operator. + """ + return 'rf > {0}: {1}'.format(self.serial_number, self.value) + + def _parse_message(self, data): + """ + Parses the raw message from the device. + """ + self.raw = data + + _, values = data.split(':') + self.serial_number, self.value = values.split(',') + +class LRRMessage(object): + """ + Represent a message from a Long Range Radio. + """ + + def __init__(self, data=None): + """ + Constructor + """ + self.raw = None + self._event_data = None + self._partition = None + self._event_type = None + + if data is not None: + self._parse_message(data) + + def __str__(self): + """ + String conversion operator. + """ + return 'lrr > {0} @ {1} -- {2}'.format() + + def _parse_message(self, data): + """ + Parses the raw message from the device. + """ + self.raw = data + + _, values = data.split(':') + self._event_data, self._partition, self._event_type = values.split(',') diff --git a/pyad2usb/zonetracking.py b/pyad2usb/zonetracking.py index 32d475d..db312a3 100644 --- a/pyad2usb/zonetracking.py +++ b/pyad2usb/zonetracking.py @@ -4,6 +4,7 @@ Provides zone tracking functionality for the AD2USB device family. import time from .event import event +from . import messages class Zone(object): """ @@ -50,40 +51,56 @@ class Zonetracker(object): """ Update zone statuses based on the current message. """ - # Panel is ready, restore all zones. - if message.ready: - for idx, z in enumerate(self._zones_faulted): - self._update_zone(z, Zone.CLEAR) + zone = -1 - self._last_zone_fault = 0 + if isinstance(message, messages.ExpanderMessage): + zone = self._expander_to_zone(int(message.address), int(message.channel)) - # Process fault - elif "FAULT" in message.text or message.check_zone: - zone = -1 + status = Zone.CLEAR + if int(message.value) == 1: + status = Zone.FAULT + elif int(message.value) == 2: + status = Zone.CHECK - # Apparently this representation can be both base 10 - # or base 16, depending on where the message came - # from. try: - zone = int(message.numeric_code) - except ValueError: - zone = int(message.numeric_code, 16) + self._update_zone(zone, status=status) + except IndexError: + self._add_zone(zone, status=status) - # Add new zones and clear expired ones. - if zone in self._zones_faulted: - self._update_zone(zone) - self._clear_zones(zone) - else: - status = Zone.FAULT - if message.check_zone: - status = Zone.CHECK + else: + # Panel is ready, restore all zones. + if message.ready: + for idx, z in enumerate(self._zones_faulted): + self._update_zone(z, Zone.CLEAR) + + self._last_zone_fault = 0 + + # Process fault + elif "FAULT" in message.text or message.check_zone: + # Apparently this representation can be both base 10 + # or base 16, depending on where the message came + # from. + try: + zone = int(message.numeric_code) + except ValueError: + zone = int(message.numeric_code, 16) + + # Add new zones and clear expired ones. + if zone in self._zones_faulted: + self._update_zone(zone) + self._clear_zones(zone) + else: + status = Zone.FAULT + if message.check_zone: + status = Zone.CHECK - self._add_zone(zone, status=status) + self._add_zone(zone, status=status) + self._zones_faulted.append(zone) + self._zones_faulted.sort() # Save our spot for the next message. self._last_zone_fault = zone - - self._clear_expired_zones() + self._clear_expired_zones() def _clear_zones(self, zone): """ @@ -92,8 +109,6 @@ class Zonetracker(object): cleared_zones = [] found_last = found_new = at_end = False - #print 'zones', self._zones - # First pass: Find our start spot. it = iter(self._zones_faulted) try: @@ -145,13 +160,13 @@ class Zonetracker(object): self._update_zone(z, Zone.CLEAR) def _clear_expired_zones(self): - cleared_zones = [] + zones = [] - for z in self._zones_faulted: - cleared_zones += [z] + for z in self._zones.keys(): + zones += [z] - for z in cleared_zones: - if self._zone_expired(z): + for z in zones: + if self._zones[z].status != Zone.CLEAR and self._zone_expired(z): self._update_zone(z, Zone.CLEAR) def _add_zone(self, zone, name='', status=Zone.CLEAR): @@ -162,8 +177,6 @@ class Zonetracker(object): self._zones[zone] = Zone(zone=zone, name=name, status=status) if status != Zone.CLEAR: - self._zones_faulted.append(zone) - self._zones_faulted.sort() self.on_fault(zone) def _update_zone(self, zone, status=None): @@ -179,7 +192,9 @@ class Zonetracker(object): self._zones[zone].timestamp = time.time() if status == Zone.CLEAR: - self._zones_faulted.remove(zone) + if zone in self._zones_faulted: + self._zones_faulted.remove(zone) + self.on_restore(zone) def _zone_expired(self, zone): @@ -187,3 +202,8 @@ class Zonetracker(object): return True return False + + def _expander_to_zone(self, address, channel): + idx = address - 7 # Expanders start at address 7. + + return address + channel + (idx * 7) + 1 diff --git a/test.py b/test.py index 21a9059..acdfa27 100755 --- a/test.py +++ b/test.py @@ -254,11 +254,15 @@ def test_socket(): #a2u.emulate_zone[1] = True #a2u.save_config() + time.sleep(1) + a2u.fault_zone(17, True) + + time.sleep(15) + a2u.clear_zone(17) + #time.sleep(1) - #a2u.fault_zone(17, True) + #a2u.fault_zone((2, 2), True) - #time.sleep(15) - #a2u.clear_zone(17) while running: time.sleep(0.1)