1
0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Commit Graph

283 Commits

Author SHA1 Message Date
Joel Bender
9fa5b749f9 remove the localDevice dependancy and shift settings over to the state machine access point 2016-08-26 13:42:08 -04:00
Joel Bender
b5671a18c8 return the default value to what's in clause 12.11.27 (hotfix) 2016-08-26 11:07:55 -04:00
Joel Bender
2a623aff98 update the maxSegmentsAccepted in the segmentation state machine when the device supports segmentation 2016-08-26 09:28:36 -04:00
Joel Bender
20a0e6a79f bring branch up to date with stage 2016-08-26 07:44:23 -04:00
Joel Bender
25ddfe1ef3 fix the max APDU length accepted encoding (check was in the wrong direction), make sure the local device has a value that is at least 50 2016-08-26 00:25:50 -04:00
Christian Tremblay
f247ab34c4 Correction done to encode_max_apdu_length_accepted
If not, 50 is always the answer...

relates to issue-90

Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2016-08-25 22:02:42 -04:00
Joel Bender
af6f1cec68 create the service subpackage and a test module in it 2016-08-25 17:24:59 -04:00
Joel Bender
c669b87daa extended debugging #76 works as intended 2016-08-25 12:17:08 -04:00
Joel Bender
122fd355ae tell the cache the device info has been updated when the incoming request APCI fields are inconsistent with the device info (hotfix) 2016-08-25 10:07:40 -04:00
Joel Bender
6a530b3c38 get ready for the next release 2016-08-25 09:34:49 -04:00
Joel Bender
3d18cf1f85 wrote some tests, found a bug 2016-08-24 10:45:35 -04:00
Joel Bender
5650bd413a sync missed changes to indication() processing 2016-08-24 10:21:19 -04:00
Joel Bender
ac6fb33e5f merge in hotfix changes from master -- no differences 2016-08-24 10:05:03 -04:00
Joel Bender
14b23d7755 clean up debugging code, better code for dumping objects 2016-08-24 09:43:28 -04:00
Joel Bender
05b1d44fac set the application service retry settings 2016-08-23 17:07:04 -04:00
Joel Bender
aecb06c727 fix the names of the encode and decode functions 2016-08-23 16:17:04 -04:00
Joel Bender
a7868cfc63 synchronize fixes across source directories, remove flakes, decorate is_valid() as a class method and not a static method 2016-08-23 14:03:07 -04:00
Joel Bender
6ecb67883d do not prematurely remove references to the access point and device information 2016-08-23 10:37:48 -04:00
Joel Bender
168e32fc79 merge in stage to bring branch up-to-date for testing 2016-08-22 00:03:53 -04:00
Joel Bender
73bf17f453 resultBlock parameter in ack is also optional #86 2016-07-08 16:32:31 -04:00
Bob Fox
b608859e1b make Service Parameters optional for ConfirmedPrivateTransferRequest 2016-07-07 15:07:48 -05:00
Joel Bender
f78a8c9d67 sync py34 with py27 2016-07-03 00:08:07 -04:00
Joel Bender
ebb3970c74 fix device information handling -- needs more testing 2016-06-21 16:40:29 -04:00
Joel Bender
3401e535ab simple typo 2016-06-21 16:39:19 -04:00
Joel Bender
e20d09b195 Merge branch 'KunalSaini-fix/segmentAck' into issue-73 2016-06-17 22:39:08 -04:00
Kunal Saini
bb2d01ba3d Fix segment ack pdu read from network 2016-06-17 11:47:34 -05:00
Joel Bender
6917edd46d bring issue branch up-to-date with stage 2016-05-31 21:26:59 -04:00
Joel Bender
219607336d sync changes to ErrorClass 2016-05-31 21:21:25 -04:00
Joel Bender
ad42e13ce6 catch the decoding error explicitly 2016-05-07 20:25:37 -04:00
Joel Bender
1465deb43e merge in stage and fix conflicts 2016-05-07 16:56:21 -04:00
Joel Bender
3ed5224238 ready for next release 2016-05-05 23:35:34 -04:00
Joel Bender
e80c1ad05a bring the branch up to date before continuing on #58 2016-04-30 23:30:55 -04:00
Joel Bender
d5c08c8a20 move some project metadata - issue #70 2016-04-30 22:01:03 -04:00
Joel Bender
8619522ade check the instance number of objects being added - note this does not apply to the device object 2016-04-29 20:24:52 -04:00
Joel Bender
99cb079492 check the instance number and add a test for it 2016-04-29 20:23:59 -04:00
Joel Bender
6804298aa5 synchronize the py27 changes into py25 and py34, fix the test to match the new exception 2016-02-26 20:55:56 -05:00
Joel Bender
7703588ffc pull in issue-45 2016-02-25 01:08:26 -05:00
Joel Bender
48342e0bec closes #66 2016-02-21 14:36:05 -05:00
Joel Bender
aee6c9736e wrong class in debugging statement 2016-02-13 16:15:00 -05:00
Joel Bender
e2b4d9009e platform doesn't contain the major version since Python 3.3 2016-02-04 14:53:19 -05:00
Joel Bender
b13d65bbf2 simplify the platform check and add a warning 2016-02-04 14:48:35 -05:00
Joel Bender
f22f345a1d minor debugging 2016-01-31 01:43:21 -05:00
Joel Bender
8e1e2b2cd6 bind the device object to this application 2016-01-31 01:41:56 -05:00
Joel Bender
04a77cbd96 sync the changes from py27 to the others 2016-01-30 14:05:33 -05:00
Joel Bender
7e0b3a627a rip out the allow_exec from consolecmd with extreme prejudice 2016-01-28 15:10:35 -05:00
Joel Bender
f4afe0ce19 check to see if the application is running interactively (using isatty) and be a little quieter 2016-01-28 14:13:28 -05:00
Joel Bender
461f1f79f6 bring samples branch up-to-date with stage 2016-01-27 16:55:53 -05:00
Joel Bender
214e8b97ee update tcp contents from strings to bytes, add some debugging to find the problem, changed internal 'Chop' function to 'chop' 2016-01-23 21:27:37 -05:00
Joel Bender
36a2aa754a match darwin as well as linux for triggers, which fixes a really irritating bug in MacOS that kept applications from quitting correctly and they would have to be killed 2016-01-23 21:22:21 -05:00
Joel Bender
b065f5fb24 minor debugging addition 2016-01-23 21:20:23 -05:00
Joel Bender
1bcb93ba3d minor debugging addition 2016-01-23 21:19:31 -05:00
Joel Bender
a2fe66ad00 hooks in the application to set/clear the _app value in the object 2016-01-23 21:18:34 -05:00
Joel Bender
da161c0203 objects get a new attribute that references the application stack they belong to 2016-01-23 21:17:18 -05:00
Joel Bender
96fb40ee8a the issueConfirmedNotifications and lifetime are optional 2016-01-23 21:12:35 -05:00
Joel Bender
ac4cb8bd99 patch for #65 2015-12-16 14:34:22 -05:00
Joel Bender
539e199470 mini-language parser to create tag lists 2015-11-18 01:48:22 -05:00
Joel Bender
829ca711e8 bring this branch up-to-date before attempting changes outlined in #45 issue comment 2015-11-03 20:53:25 -05:00
Joel Bender
21c819af72 merging issue-63 (#63) into stage, checking on a routing problem (issue not created yet) 2015-11-02 15:27:29 -05:00
Joel Bender
a85f67699b synchronize changes with other versions 2015-10-28 22:13:16 -04:00
Joel Bender
412f1da368 unpack addresses coming downstream rather than assuming they have been created as IP addresses 2015-10-20 16:54:52 -04:00
Christian Tremblay
6a75341ec3 Don't bind broadcast address for Windows platform
Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2015-10-17 11:04:26 -04:00
Joel Bender
b1ed353950 fix the _barf class to eat any __init__() parameters 2015-09-29 19:50:18 -04:00
Joel Bender
baa28cc8c0 merging in from stage to continue 2015-09-29 19:39:27 -04:00
Joel Bender
5e9f5ea693 a little more debugging, starting on the next layer 2015-09-28 20:51:31 -04:00
Joel Bender
3c3ad2fe7f raise the new InvalidTag exception in the decode() functions of the primitive data types 2015-09-25 22:25:47 -04:00
Joel Bender
a344b188c2 first add the classes to the errors module 2015-09-21 22:42:48 -04:00
Joel Bender
4c45c8d70a rather than installing the task, ask the task to install itself 2015-09-17 09:49:06 -04:00
Joel Bender
7ad5c34e20 socket.inet_ntoa() does not like bytearray's 2015-09-16 15:18:00 -04:00
Joel Bender
4ebcbd8c79 add default support for I-Am and use decorators for debugging 2015-09-16 14:44:53 -04:00
Joel Bender
da236c0486 add get_services_supported() function 2015-09-15 00:35:51 -04:00
Joel Bender
e4a89fa574 add the 'writeGroup' services supported enumeration 2015-09-14 23:39:57 -04:00
Joel Bender
305bf298b7 remove the registration of AuthenticateRequest, AuthenticateACK, and RequestKeyRequest (but leave the definitions, just in case), add the 'writeGroup' services supported enumeration, expand the service choice enumerations rather than leaving them to be expanded on demand 2015-09-14 23:38:17 -04:00
Joel Bender
46b9b1e1ab console had to convert strings to bytes to go in the data portion of a PDU 2015-09-14 16:45:54 -04:00
Joel Bender
866222ed30 remove comments from bvllservice (use noBroadcast=True) 2015-09-14 16:44:53 -04:00
Christian Tremblay
584c639b5e Commented lines that were creating binding error when trying to start app using address including mask ex. (Address('192.168.1.2/24'))
Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2015-09-12 17:22:41 -04:00
Joel Bender
dec01bcdab more error checking - see issue #57 2015-09-07 22:08:56 -04:00
Joel Bender
ccd7558476 slightly more restrictive month test, disallow '00' 2015-09-07 21:58:38 -04:00
Joel Bender
72fdddaf33 double check day-of-week value, even though it shouldn't match 2015-09-07 21:55:21 -04:00
Joel Bender
1d9ea1bc73 allow explicit 255 for day 2015-09-07 21:26:07 -04:00
Joel Bender
0b94ac7d80 allow explicit 255 for month 2015-09-07 21:23:27 -04:00
Joel Bender
f8a9ee5bd6 check for a valid year, raise ValueError for invalid days and months 2015-09-07 21:20:10 -04:00
Joel Bender
41a66ad92d concluding merge of issue-48 changes 2015-09-06 00:54:28 -04:00
Joel Bender
0a40541576 manually merge in the appropriate differences between issue-38 and issue-48 2015-09-06 00:46:59 -04:00
Joel Bender
a6e035d5ee wandering sys.stderr.write commented out 2015-09-06 00:12:01 -04:00
Joel Bender
b5d2b56191 make the str() of a CharacterString more closely match an OctetString because the strValue is an octet string 2015-09-05 23:56:56 -04:00
Joel Bender
b468f724b8 manually merge in fixes already in stage 2015-09-05 23:24:33 -04:00
Joel Bender
f0919d27b7 wandering sys.stderr.write commented out 2015-09-05 22:50:21 -04:00
Joel Bender
5eb4f820be it seems like I ripped the bytearray stuff out of py25 once already 2015-09-05 22:27:41 -04:00
Joel Bender
d0249dd799 bring issue up-to-date with the stage 2015-09-05 18:07:01 -04:00
Joel Bender
af7e2e34a4 date class rolled in 2015-09-05 18:02:17 -04:00
Joel Bender
a4f07bac9b manually merge in Date class changes from #48 2015-09-01 11:18:05 -04:00
Joel Bender
1881dcfdbc merge issue-48 branch for discussion 2015-08-31 22:35:49 -04:00
Christian Tremblay, ing
4a2770c5d6 Tried to add a lot of flexibility to the Date object.
Regex now recognize a lot of different formats
Deal with errors when trying to find day of week
test_date.py covers a lot of different formats but can be improved.

Signed-off-by: Christian Tremblay, ing. <christian.tremblay@servisys.com>
2015-08-31 22:06:44 -04:00
Christian Tremblay, ing
736187580b Modifications to Date object to handle multiple string format
Signed-off-by: Christian Tremblay, ing. <christian.tremblay@servisys.com>
2015-08-29 21:29:18 -04:00
Joel Bender
350333fb89 whip through the __mro__ looking for enumerations, polish the __str__ 2015-08-25 10:32:26 -04:00
Joel Bender
0b6544f206 adjusted encoding, it relies on tagLVT being zero and tagData being b'' for opening and closing tags 2015-08-24 23:33:15 -04:00
Christian Tremblay, ing
852b1833dc Work started for date object parsing using regex
Signed-off-by: Christian Tremblay, ing. <christian.tremblay@servisys.com>
2015-08-24 23:14:25 -04:00
Joel Bender
d358a6246d moved the isinstance check 2015-08-24 22:54:50 -04:00
Joel Bender
5c51cf1bc3 fixed the bug, added wildcard patterns 2015-08-24 22:04:10 -04:00
Joel Bender
00a74fb8a2 make a clearer distinction between the value (str) and encoded value (bytes) (again?) 2015-08-24 14:03:42 -04:00
Christian Tremblay, ing
ec3b18a082 Removed presumption on datatype when writing to a property so we can limit trying to write to a property using wrong type
Signed-off-by: Christian Tremblay, ing. <christian.tremblay@servisys.com>
2015-08-15 19:29:43 -04:00
Joel Bender
c461566fb2 merging in issue-38, but I'm leaving the issue open until the rest of the datatypes are finished 2015-08-13 14:18:17 -04:00
Joel Bender
34ed6bd399 Python3 no longer uses __cmp__, incorrect initialization for octet strings 2015-08-12 09:07:11 -04:00
Joel Bender
11caa8a18a add __lt__ function to make tasks orderable (so heappush is happy in py34), update metaclass syntax in py34 singleton 2015-08-09 23:26:03 -04:00
Joel Bender
bbcf3c2bc0 synchronize task changes with other sources 2015-08-09 22:09:11 -04:00
Joel Bender
181e224ae0 a little better parameter type checking, a lot more tests 2015-08-03 14:29:58 -04:00
Joel Bender
7f80cc43d8 merge resolved 2015-08-03 00:52:23 -04:00
Joel Bender
9c8ec37938 change all the signed octet pack/unpack to unsigned 2015-08-02 23:12:58 -04:00
Joel Bender
85a8ce9558 fixes #10 2015-08-02 22:17:11 -04:00
Joel Bender
8d6508a853 turn the first byte into an int, then pass to str() 2015-07-31 23:23:44 -04:00
Joel Bender
8cba67d803 minor stylistic change 2015-07-31 21:56:25 -04:00
Joel Bender
2f6d7170c3 Merge branch 'issue-6' of https://github.com/ChristianTremblay/bacpypes into ChristianTremblay-issue-6 2015-07-31 21:51:29 -04:00
Joel Bender
263853760c backport changes to py25 and py27 2015-07-31 21:42:42 -04:00
Christian Tremblay
937da35780 No need to struct.unpack as pdu.pduData is already hex in that specific context
Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2015-07-31 19:58:25 -04:00
Christian Tremblay
cecb6770cd Forgotten xrange replaced by range
Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2015-07-31 19:22:56 -04:00
Christian Tremblay
f130a42ca9 Correct property named as in object.py line 342 is vendorIdentifier, not vendorId
Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2015-07-31 19:21:32 -04:00
Joel Bender
37ae6d00f6 working on issue 5 2015-07-30 23:16:55 -04:00
Joel Bender
fb192ea623 fixes #4 2015-07-23 13:44:19 -04:00
Joel Bender
f7da4242a9 Merge branch 'issue-3' 2015-07-23 02:51:19 -04:00
Joel Bender
0a7300f894 add debugging pieces to sync with py27 2015-07-23 02:46:45 -04:00
Joel Bender
e7d315ef8b in theory fixes #3 2015-07-23 02:42:17 -04:00
Joel Bender
699a7805d4 in theory fixes #2 2015-07-23 02:15:19 -04:00
Joel Bender
1305d12017 remove flakes 2015-07-17 09:45:39 -04:00
Joel Bender
f0af96c55b remove flakes 2015-07-17 09:24:05 -04:00
Joel Bender
4a7870ae12 removing flakes 2015-07-16 17:01:44 -04:00
Joel Bender
72ff10a79e removing flakes 2015-07-16 16:53:21 -04:00
Joel Bender
946ea12701 removing flakes 2015-07-16 16:40:47 -04:00
Joel Bender
4b2715d173 bring the object definitions up to date 2015-07-16 12:35:01 -04:00
Joel Bender
62ae0f8328 py3 no like trailing spaces 2015-07-16 11:47:12 -04:00
Joel Bender
adb085b4a9 missing tuple element selection after unpack 2015-07-16 10:33:35 -04:00
Joel Bender
b4594bfad2 silly spelling error 2015-07-16 08:18:06 -04:00
Joel Bender
ac064581f3 starting py25, syncing some py27 and py34 changes 2015-07-15 22:24:07 -04:00
Joel Bender
2a63f9a25d initial commit 2015-07-15 16:51:27 -04:00