mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

Merge branch 'stage' of github.com:JoelBender/bacpypes into stage

Browse Source
This commit is contained in:
Joel Bender 2019-03-11 09:51:38 -04:00
commit 91fae08d51
18 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/COVClient.py
View File

@ -11,7 +11,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -145,7 +145,7 @@ class SubscribeCOVConsoleCmd(ConsoleCmd):
if _debug: SubscribeCOVConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/DeviceCommunicationControl.py
View File

@ -11,7 +11,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -78,7 +78,7 @@ class DCCConsoleCmd(ConsoleCmd):
if _debug: DCCConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

10
samples/Discover.py
View File

@ -72,7 +72,7 @@ from bacpypes.consolecmd import ConsoleCmd
from bacpypes.pdu import Address, LocalBroadcast, GlobalBroadcast
from bacpypes.comm import bind
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
# application layer
@ -490,7 +490,7 @@ class DiscoverConsoleCmd(ConsoleCmd):
if _debug: DiscoverConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# sleep for responses
time.sleep(3.0)
@ -575,7 +575,7 @@ class DiscoverConsoleCmd(ConsoleCmd):
if _debug: DiscoverConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -716,7 +716,7 @@ class DiscoverConsoleCmd(ConsoleCmd):
if _debug: DiscoverConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -789,7 +789,7 @@ class DiscoverConsoleCmd(ConsoleCmd):
print("{}: {}".format(property_label, str_value))
# save it in the snapshot
snapshot.upsert(devid, '{}:{}'.format(*objectIdentifier), propertyIdentifier, str_value)
snapshot.upsert(devid, '{}:{}'.format(*objectIdentifier), property_label, str_value)
# do something for error/reject/abort
if iocb.ioError:

4
samples/HTTPServer.py
View File

@ -17,7 +17,7 @@ import SimpleHTTPServer
from bacpypes.debugging import class_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.core import run
from bacpypes.core import run, deferred
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address, GlobalBroadcast
@ -138,7 +138,7 @@ class ThreadedHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
if _debug: ThreadedHTTPRequestHandler._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

2
samples/MultipleReadPropertyThreaded.py
View File

@ -75,7 +75,7 @@ class ReadPointListThread(Thread):
if _debug: ReadPointListThread._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for the response
iocb.wait()

4
samples/ReadProperty.py
View File

@ -12,7 +12,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -68,7 +68,7 @@ class ReadPropertyConsoleCmd(ConsoleCmd):
if _debug: ReadPropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/ReadProperty25.py
View File

@ -12,7 +12,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -73,7 +73,7 @@ class ReadPropertyConsoleCmd(ConsoleCmd):
if _debug: ReadPropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/ReadPropertyAny.py
View File

@ -13,7 +13,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -64,7 +64,7 @@ class ReadPropertyAnyConsoleCmd(ConsoleCmd):
if _debug: ReadPropertyAnyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/ReadPropertyMultiple.py
View File

@ -12,7 +12,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -112,7 +112,7 @@ class ReadPropertyMultipleConsoleCmd(ConsoleCmd):
if _debug: ReadPropertyMultipleConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/ReadPropertyMultiple25.py
View File

@ -12,7 +12,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -119,7 +119,7 @@ class ReadPropertyMultipleConsoleCmd(ConsoleCmd):
if _debug: ReadPropertyMultipleConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/ReadRange.py
View File

@ -12,7 +12,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -66,7 +66,7 @@ class ReadRangeConsoleCmd(ConsoleCmd):
if _debug: ReadRangeConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

4
samples/ReadWriteEventMessageTexts.py
View File

@ -11,7 +11,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -71,7 +71,7 @@ class ReadWritePropertyConsoleCmd(ConsoleCmd):
if _debug: ReadWritePropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

10
samples/ReadWriteFile.py
View File

@ -14,7 +14,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -78,7 +78,7 @@ class TestConsoleCmd(ConsoleCmd):
if _debug: TestConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -140,7 +140,7 @@ class TestConsoleCmd(ConsoleCmd):
if _debug: TestConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -204,7 +204,7 @@ class TestConsoleCmd(ConsoleCmd):
if _debug: TestConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -266,7 +266,7 @@ class TestConsoleCmd(ConsoleCmd):
if _debug: TestConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

6
samples/ReadWriteProperty.py
View File

@ -14,7 +14,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -72,7 +72,7 @@ class ReadWritePropertyConsoleCmd(ConsoleCmd):
if _debug: ReadWritePropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -212,7 +212,7 @@ class ReadWritePropertyConsoleCmd(ConsoleCmd):
if _debug: ReadWritePropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

2
samples/ThreadedReadProperty.py
View File

@ -86,7 +86,7 @@ class ReadPointListThread(Thread):
if _debug: ReadPointListThread._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for the response
iocb.wait()

6
samples/VendorReadWriteProperty.py
View File

@ -14,7 +14,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address
@ -76,7 +76,7 @@ class ReadWritePropertyConsoleCmd(ConsoleCmd):
if _debug: ReadWritePropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()
@ -199,7 +199,7 @@ class ReadWritePropertyConsoleCmd(ConsoleCmd):
if _debug: ReadWritePropertyConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()

2
samples/WhoIsIAm.py
View File

@ -12,7 +12,7 @@ from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.consolelogging import ConfigArgumentParser
from bacpypes.consolecmd import ConsoleCmd
from bacpypes.core import run, enable_sleeping
from bacpypes.core import run, deferred, enable_sleeping
from bacpypes.iocb import IOCB
from bacpypes.pdu import Address, GlobalBroadcast

2
samples/WriteSomething.py
View File

@ -80,7 +80,7 @@ class WriteSomethingConsoleCmd(ConsoleCmd):
if _debug: WriteSomethingConsoleCmd._debug(" - iocb: %r", iocb)
# give it to the application
this_application.request_io(iocb)
deferred(this_application.request_io, iocb)
# wait for it to complete
iocb.wait()