Commit Graph

  • *
  • *
  • *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • |/
  • *
  • *
  • *
  • |\
  • | *
  • | *
  • | *
  • | *
  • * |
  • * |
  • |\|
  • | *
  • * |
  • * |
  • * |
  • |\|
  • | *
  • * |
  • |/
  • *
  • |\
  • * |
  • | *
  • | *
  • |/
  • *
  • *
  • |\
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • | * |
  • | * |
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • | | *
  • | | *
  • | | *
  • | | *
  • | * |
  • | | *
  • | |/
  • |/|
  • * |
  • |\ \
  • * \ \
  • |\ \ \
  • | | * |
  • | | * |
  • | | |\ \
  • | |_|/ /
  • |/| | |
  • * | | |
  • | | * |
  • | | |/
  • | | *
  • | |/
  • | *
  • * |
  • |/
  • *
  • *
  • |\
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | | *
  • | | *
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | *
  • | *
  • | *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | *
  • | *
  • | *
  • | *
  • |/
  • *
  • |\
  • c674852 Apparently there's a space in the alternate fault message. by Scott Petersen 2017-07-10 11:45:57 -0700
  • 2070c0b Added a limiter to the automatic sending of '*' when a specific message is displayed to avoid flooding the panel in weird cases. by Scott Petersen 2017-07-06 16:21:44 -0700
  • 6dc5e50 Added additional * for faults message to the trigger. by Scott Petersen 2017-07-06 16:07:40 -0700
  • bdd99fa Mid-process commit now that the fire refactor works correctly. by Scott Petersen 2017-07-06 12:16:22 -0700
  • 900d2af Filled in values for DSC LRR events. by Scott Petersen 2017-06-21 16:15:20 -0700
  • fea12a1 Including human-readable event description in LRR messages. by Scott Petersen 2017-06-13 15:35:25 -0700
  • e8913be Added support for old-style messages in the LRRSystem. by Scott Petersen 2017-06-13 13:14:18 -0700
  • 14ac51c Initial work on LRR system. by Scott Petersen 2017-06-13 11:41:42 -0700
  • e411d97 Structural work by Scott Petersen 2017-05-24 11:45:45 -0700
  • b0b22e9 Moved the messages into their own directories and files to make maintaining them easier. Added a gazillion ContactID codes. by Scott Petersen 2017-05-08 11:58:32 -0700
  • 3cf2c48 Version bump by Scott Petersen 2017-04-20 15:32:26 -0700
  • 55f7a9b Reworked alarm status logic for triggering arm stay events. by Scott Petersen 2017-04-20 15:19:42 -0700
  • 3f369ba Merge branch 'dev' by Scott Petersen 2017-04-13 11:45:33 -0700
  • 615548f Added ability to differentiate between stay and away in on_arm events. by Scott Petersen 2017-03-23 13:03:39 -0700
  • 8c9b863 Reworked firmware upload into something that's more manageable and less flakey. by Scott Petersen 2017-03-20 16:17:10 -0700
  • 358a950 Reworked SerialDevice to use select as well as associated test patches and 2/3 support. by Scott Petersen 2017-03-20 16:16:14 -0700
  • d69a210 A few more fixes for supporting Python 2 and 3. by Scott Petersen 2017-02-28 12:59:17 -0800
  • c632fef Version bump by Scott Petersen 2017-02-01 11:29:26 -0800
  • b7bdc19 Fixed conflict. by Scott Petersen 2017-02-01 11:29:04 -0800
  • 5e1d3f5 Fix for Python 2 and unicode. by Scott Petersen 2017-02-01 11:20:58 -0800
  • 277d60d Bumped version, added compatibility listing for Python 3. by Scott Petersen 2017-01-18 14:46:05 -0800
  • 5244e91 Another 2to3 workaround. by Scott Petersen 2017-01-10 10:57:39 -0800
  • 50846ac Merge branch 'dev' by Scott Petersen 2016-12-12 14:02:49 -0800
  • 644ded7 Hack for existing installs without python-future. by Scott Petersen 2016-12-12 14:02:43 -0800
  • ed71d2b Updated version and documentation. by Scott Petersen 2016-12-05 11:34:27 -0800
  • db1e40c Merge branch 'dev' of git.corp.nutech.com:ad2usb/pyad2usb into dev by Scott Petersen 2016-12-02 14:36:09 -0800
  • 3c64e95 Added support for cursor locations with DSC panels. by Scott Petersen 2016-11-15 12:09:43 -0800
  • 73ad6e9 Blank defaults for version so we don't report bad stuff by Kevin Roberts 2016-11-03 13:51:07 -0700
  • 74d4004 Added version information to object by Kevin Roberts 2016-11-03 13:27:41 -0700
  • a1de499 Revert incorrect 2to3 change. by Scott Petersen 2016-08-09 12:11:31 -0700
  • c25a70a Merged old 2to3 branch in with a few other tweaks. by Scott Petersen 2016-08-08 16:34:29 -0700
  • 21f8507 example formatting. by Kevin Gottsman 2016-07-23 04:17:43 -0400
  • bd166b2 Fix pyftdi import statement by Kevin Gottsman 2016-07-23 04:12:41 -0400
  • a4b3295 undeleted util.py and ran 2to3 on it by Kevin Gottsman 2016-07-23 03:44:24 -0400
  • 41eb291 Revert "missed one file" by Kevin Gottsman 2016-07-23 03:41:55 -0400
  • ef36600 missed one file by Kevin Gottsman 2016-07-23 03:32:26 -0400
  • 6e9efed 2to3 conversions by Kevin Gottsman 2016-07-23 02:56:19 -0400
  • 19736d4 Fix readme punctuation typo by Kevin Gottsman 2016-07-23 02:29:29 -0400
  • 78ab171 Merge branch 'fabaff-master' into dev by Scott Petersen 2016-05-16 11:38:14 -0700
  • c11b744 Update formatting of commands by Fabian Affolter 2016-05-06 09:12:18 +0200
  • 56f691e Update layout by Fabian Affolter 2016-05-06 09:11:19 +0200
  • 2db424d Updating version number. by Scott Petersen 2016-04-11 11:40:20 -0700
  • 53c75ad Merge branch 'dev' by Scott Petersen 2016-04-11 11:39:57 -0700
  • 44c90d3 Now tracking faulted zones from ALARM messages. by Scott Petersen 2016-04-11 11:39:20 -0700
  • e57c2b8 Updating version number. by Scott Petersen 2016-03-03 14:10:10 -0800
  • b66bfcd Merge branch 'dev' by Scott Petersen 2016-03-03 14:09:23 -0800
  • 9ab05d9 Typo in address mask. by Scott Petersen 2016-03-03 14:08:55 -0800
  • a76a079 Updated version number. by Scott Petersen 2016-02-23 13:28:32 -0800
  • 4aced9b Merge branch 'dev' by Scott Petersen 2016-02-23 12:17:09 -0800
  • 44b03f4 Firmware upload utility improvements. by Scott Petersen 2016-02-23 12:13:32 -0800
  • fcea425 Updated tests for use of select.select and the changed ZoneTracking constructor. by Scott Petersen 2016-02-23 11:23:53 -0800
  • ecd3904 Fixed incorrect defaults for panic status and address mask. by Scott Petersen 2016-02-23 11:23:17 -0800
  • d75749b Better error handling in firmware upload. Made SocketDevice behave similarly to the others with regards to blocking. Added ability to retrieve current configuration string. by Scott Petersen 2015-10-23 14:07:04 -0700
  • 8b9a45d More tweaks and error handling for the firmware upload. by Scott Petersen 2015-10-08 14:54:24 -0700
  • f87692e Added retries for the reboot/bootloader entry. Attempting to fix timeout issues. by Scott Petersen 2015-10-07 15:07:49 -0700
  • 8a46d9e Updating docs for the new version. by Scott Petersen 2015-09-22 11:10:59 -0700
  • fea5747 Merge branch 'dev' by Scott Petersen 2015-09-22 11:03:24 -0700
  • ce7008a Fixed internal address mask. by Scott Petersen 2015-09-17 12:15:30 -0700
  • 2f1db61 Added support for tracking DSC zones. Added internal address mask for filtering status updates. More bugfixes with zonetracking to keep it quiet and avoid missed events. by Scott Petersen 2015-08-19 13:59:11 -0700
  • b992ae1 More conversion. by Scott Petersen 2015-08-13 13:04:37 -0700
  • d8958ea Fixed string encoding used with send. by Scott Petersen 2015-03-27 14:47:22 -0700
  • b22e7c3 Correctly decoding byte string. Added future requirement. by Scott Petersen 2015-03-27 12:33:25 -0700
  • 0d3b6fe Python3-friendly fix for the optional SSL stuff in the thread. by Scott Petersen 2015-03-27 11:13:47 -0700
  • 5c7f954 Updated version information. by Scott Petersen 2015-03-23 12:01:51 -0700
  • f4fe9be Initial pass. by Scott Petersen 2015-03-23 11:55:16 -0700
  • 42abc69 Merge branch 'dependence-changes' into dev by Scott Petersen 2015-03-20 15:30:51 -0700
  • 756bcba Merge branch 'dev' of git.corp.nutech.com:ad2usb/pyad2usb into dev by Scott Petersen 2015-03-20 15:26:34 -0700
  • 3e8ebe1 Made SSL support optional. by Scott Petersen 2015-03-20 12:58:00 -0700
  • c00c2b1 Merge branch 'dev' into dependence-changes by Scott Petersen 2015-03-20 12:12:08 -0700
  • 25738fe Added missing tests. by Scott Petersen 2015-03-20 11:55:29 -0700
  • e663d60 Made USB (via pyftdi) optional. Changed examples to use SerialDevice and moved USB to it's own example. Updated requirements and setup. by Scott Petersen 2015-03-20 11:54:56 -0700
  • bdf0ac7 Fixing typo in zone expander example. by Scott Petersen 2015-03-03 14:34:44 -0800
  • 10a7534 Sean found a bug in cursor location by Kevin Roberts 2015-01-13 15:24:05 -0800
  • e9de0ff Added support for uploading to a networked ad2usb in ad2-firmwareupload. by Scott Petersen 2014-09-16 11:56:58 -0700
  • 12aad5c Updated version and documentation. by Scott Petersen 2014-07-08 11:43:42 -0700
  • d35bcb8 Merge branch 'usb-2.4-support' into dev by Scott Petersen 2014-07-08 10:37:16 -0700
  • 5e83d30 Split out alarm sounding status into two events. by Scott Petersen 2014-07-08 10:29:06 -0700
  • 4499bbf Updated documentation for on_alarm. by Scott Petersen 2014-07-07 14:59:53 -0700
  • 7a511fe Merge branch 'master' into dev by Scott Petersen 2014-07-07 14:59:06 -0700
  • 4d0d590 Offending zone is now passed to on_alarm events. by Scott Petersen 2014-07-07 14:58:01 -0700
  • 10316b8 Added support for catching exceptions when trying to use a vid/pid not supported under pyftdi. by Scott Petersen 2014-07-07 11:18:03 -0700
  • 79f2c33 Added support for the new FT230X chip. by Scott Petersen 2014-07-01 12:08:37 -0700
  • e867a4f Added LRR example. Updated gitignore. by Scott Petersen 2014-06-17 10:35:51 -0700
  • fba1baa Moved read thread initialization to support reopening closed devices. by Scott Petersen 2014-06-10 12:09:32 -0700
  • 3c1973b Bumped version number. by Scott Petersen 2014-05-15 14:44:19 -0700
  • e485872 Fixed issues where SYSTEM messages were causing zones to bounce. Fixed an issue where ZONES FAULTED messages were causing premature restoration on the 128. by Scott Petersen 2014-05-12 11:29:40 -0700
  • e3eccd1 Updated docs by Scott Petersen 2014-05-07 15:00:58 -0700
  • 03358b0 Updated version. by Scott Petersen 2014-05-07 15:00:21 -0700
  • 20aa779 Merge branch 'dev' by Scott Petersen 2014-05-07 14:58:15 -0700
  • 5ea201c Renamed MODES to PANEL_TYPES. by Scott Petersen 2014-05-06 10:23:19 -0700
  • e8e541e Fixed backwards lookup. by Scott Petersen 2014-05-06 10:18:39 -0700
  • 9de9e9f Added check for ADEMCO panel before pulling out the mask and cursor location. Mask now defaults to 0xFFFFFFFF. by Scott Petersen 2014-05-06 10:10:55 -0700
  • eb699b6 Added support for the system fault bit as well as source panel type for messages. by Scott Petersen 2014-05-06 10:08:31 -0700
  • 14cca0a Added initial support for DSC in the beta firmware. by Scott Petersen 2014-05-05 13:47:14 -0700
  • dcb5f01 Lets try this again.. by Scott Petersen 2014-04-30 11:34:07 -0700
  • 52c8e37 More requirements.. by Scott Petersen 2014-04-30 11:16:50 -0700
  • 9eb6999 Added requirements.txt. by Scott Petersen 2014-04-30 11:15:06 -0700
  • 630c1be Fixing docs. by Scott Petersen 2014-04-30 11:05:59 -0700
  • 8f9911e Updated docs and setup.py for 0.7 by Scott Petersen 2014-04-30 10:46:49 -0700
  • 752183e Merge pull request #3 from nutechsoftware/dev by endlesscoil 2014-04-29 12:01:28 -0700