mirror/modpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/modpypes synced 2025-10-19 22:08:20 +08:00
Code Issues Releases Wiki Activity

replace class_debugging with bacpypes_debugging

Browse Source
This commit is contained in:
Joel Bender 2016-09-21 14:49:38 -04:00
parent 8bb6f2473b
commit d8294b1367
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modpypes/app.py
View File

@ -6,7 +6,7 @@ Application
=========== ===========
""" """
from bacpypes.debugging import class_debugging, ModuleLogger from bacpypes.debugging import bacpypes_debugging, ModuleLogger
from bacpypes.comm import PDU, Client, Server, ServiceAccessPoint, bind from bacpypes.comm import PDU, Client, Server, ServiceAccessPoint, bind
from bacpypes.tcp import TCPClientDirector, TCPServerDirector, StreamToPacket from bacpypes.tcp import TCPClientDirector, TCPServerDirector, StreamToPacket
@ -77,7 +77,7 @@ def stream_to_packet(data):
# #
@class_debugging @bacpypes_debugging
class ModbusServiceAccessPoint(Client, Server, ServiceAccessPoint): class ModbusServiceAccessPoint(Client, Server, ServiceAccessPoint):
""" """
A service access point so applications can be both a client and A service access point so applications can be both a client and
@ -198,7 +198,7 @@ class ModbusServiceAccessPoint(Client, Server, ServiceAccessPoint):
# ModbusClient # ModbusClient
# #
@class_debugging @bacpypes_debugging
class ModbusClient(Client, Server): class ModbusClient(Client, Server):
"""This class simplifies building MODBUS client applications. All of """This class simplifies building MODBUS client applications. All of
@ -264,7 +264,7 @@ class ModbusClient(Client, Server):
# ModbusServer # ModbusServer
# #
@class_debugging @bacpypes_debugging
class ModbusServer(Client, Server): class ModbusServer(Client, Server):
def __init__(self, port=502, **kwargs): def __init__(self, port=502, **kwargs):

78
modpypes/pdu.py
View File

@ -8,7 +8,7 @@ Protocol Data Units
import struct import struct
from bacpypes.debugging import class_debugging, DebugContents, ModuleLogger from bacpypes.debugging import bacpypes_debugging, DebugContents, ModuleLogger
from bacpypes.comm import PDUData, PCI from bacpypes.comm import PDUData, PCI
from bacpypes.errors import DecodingError from bacpypes.errors import DecodingError
@ -77,7 +77,7 @@ class _Struct:
def unpack(self, registers): def unpack(self, registers):
raise NotImplementedError("unpack is not implemented in %s" % (self.__class__.__name__,)) raise NotImplementedError("unpack is not implemented in %s" % (self.__class__.__name__,))
@class_debugging @bacpypes_debugging
class Byte(_Struct): class Byte(_Struct):
""" """
@ -96,7 +96,7 @@ class Byte(_Struct):
return registers[0] return registers[0]
@class_debugging @bacpypes_debugging
class Int(_Struct): class Int(_Struct):
""" """
@ -119,7 +119,7 @@ class Int(_Struct):
return value return value
@class_debugging @bacpypes_debugging
class UnsignedInt(_Struct): class UnsignedInt(_Struct):
""" """
@ -138,7 +138,7 @@ class UnsignedInt(_Struct):
return registers[0] return registers[0]
@class_debugging @bacpypes_debugging
class DoubleInt(_Struct): class DoubleInt(_Struct):
""" """
@ -161,7 +161,7 @@ class DoubleInt(_Struct):
return value return value
@class_debugging @bacpypes_debugging
class UnsignedDoubleInt(_Struct): class UnsignedDoubleInt(_Struct):
""" """
@ -180,7 +180,7 @@ class UnsignedDoubleInt(_Struct):
return (registers[0] << 16) | registers[1] return (registers[0] << 16) | registers[1]
@class_debugging @bacpypes_debugging
class Real(_Struct): class Real(_Struct):
registerLength = 2 registerLength = 2
@ -202,7 +202,7 @@ class Real(_Struct):
value, = struct.unpack(">f", struct.pack(">HH", registers[1], registers[0])) value, = struct.unpack(">f", struct.pack(">HH", registers[1], registers[0]))
return value return value
@class_debugging @bacpypes_debugging
class ROCReal(_Struct): class ROCReal(_Struct):
registerLength = 1 registerLength = 1
@ -222,7 +222,7 @@ class ROCReal(_Struct):
value, = struct.unpack(">f", struct.pack(">HH", r1, r0)) value, = struct.unpack(">f", struct.pack(">HH", r1, r0))
return value return value
@class_debugging @bacpypes_debugging
class BigEndianDoubleInt(_Struct): class BigEndianDoubleInt(_Struct):
""" """
@ -245,7 +245,7 @@ class BigEndianDoubleInt(_Struct):
return value return value
@class_debugging @bacpypes_debugging
class BigEndianUnsignedDoubleInt(_Struct): class BigEndianUnsignedDoubleInt(_Struct):
""" """
@ -264,7 +264,7 @@ class BigEndianUnsignedDoubleInt(_Struct):
return (registers[1] << 16) | registers[0] return (registers[1] << 16) | registers[0]
@class_debugging @bacpypes_debugging
class BigEndianReal(_Struct): class BigEndianReal(_Struct):
registerLength = 2 registerLength = 2
@ -286,7 +286,7 @@ class BigEndianReal(_Struct):
value, = struct.unpack(">f", struct.pack(">HH", registers[0], registers[1])) value, = struct.unpack(">f", struct.pack(">HH", registers[0], registers[1]))
return value return value
@class_debugging @bacpypes_debugging
class String(_Struct): class String(_Struct):
""" """
@ -315,7 +315,7 @@ class String(_Struct):
value = value[:value.find('\x00')] value = value[:value.find('\x00')]
return value return value
@class_debugging @bacpypes_debugging
class BigEndianString(_Struct): class BigEndianString(_Struct):
""" """
@ -367,7 +367,7 @@ ModbusStruct = {
# MPCI # MPCI
# #
@class_debugging @bacpypes_debugging
class MPCI(PCI, DebugContents): class MPCI(PCI, DebugContents):
""" """
@ -446,7 +446,7 @@ class MPCI(PCI, DebugContents):
# MPDU # MPDU
# #
@class_debugging @bacpypes_debugging
class MPDU(MPCI, PDUData): class MPDU(MPCI, PDUData):
""" """
@ -474,7 +474,7 @@ class MPDU(MPCI, PDUData):
#------------------------------ #------------------------------
@class_debugging @bacpypes_debugging
class ReadBitsRequestBase(MPCI, DebugContents): class ReadBitsRequestBase(MPCI, DebugContents):
""" """
@ -506,7 +506,7 @@ class ReadBitsRequestBase(MPCI, DebugContents):
self.address = pdu.get_short() self.address = pdu.get_short()
self.count = pdu.get_short() self.count = pdu.get_short()
@class_debugging @bacpypes_debugging
class ReadBitsResponseBase(MPCI, DebugContents): class ReadBitsResponseBase(MPCI, DebugContents):
""" """
@ -542,7 +542,7 @@ class ReadBitsResponseBase(MPCI, DebugContents):
datalen = pdu.get() datalen = pdu.get()
self.bits = _unpackBitsFromString(pdu.get_data(datalen)) self.bits = _unpackBitsFromString(pdu.get_data(datalen))
@class_debugging @bacpypes_debugging
class ReadRegistersRequestBase(MPCI, DebugContents): class ReadRegistersRequestBase(MPCI, DebugContents):
""" """
@ -575,7 +575,7 @@ class ReadRegistersRequestBase(MPCI, DebugContents):
self.address = pdu.get_short() self.address = pdu.get_short()
self.count = pdu.get_short() self.count = pdu.get_short()
@class_debugging @bacpypes_debugging
class ReadRegistersResponseBase(MPCI, DebugContents): class ReadRegistersResponseBase(MPCI, DebugContents):
""" """
@ -613,7 +613,7 @@ class ReadRegistersResponseBase(MPCI, DebugContents):
for i in range(datalen / 2): for i in range(datalen / 2):
self.registers.append(pdu.get_short()) self.registers.append(pdu.get_short())
@class_debugging @bacpypes_debugging
class ReadWriteValueBase(MPCI, DebugContents): class ReadWriteValueBase(MPCI, DebugContents):
""" """
@ -652,7 +652,7 @@ class ReadWriteValueBase(MPCI, DebugContents):
# ReadCoils # ReadCoils
# #
@class_debugging @bacpypes_debugging
class ReadCoilsRequest(ReadBitsRequestBase): class ReadCoilsRequest(ReadBitsRequestBase):
""" """
@ -669,7 +669,7 @@ class ReadCoilsRequest(ReadBitsRequestBase):
register_request_type(ReadCoilsRequest) register_request_type(ReadCoilsRequest)
@class_debugging @bacpypes_debugging
class ReadCoilsResponse(ReadBitsResponseBase): class ReadCoilsResponse(ReadBitsResponseBase):
""" """
@ -690,7 +690,7 @@ register_response_type(ReadCoilsResponse)
# ReadDescreteInputs # ReadDescreteInputs
# #
@class_debugging @bacpypes_debugging
class ReadDiscreteInputsRequest(ReadBitsRequestBase): class ReadDiscreteInputsRequest(ReadBitsRequestBase):
""" """
@ -707,7 +707,7 @@ class ReadDiscreteInputsRequest(ReadBitsRequestBase):
register_request_type(ReadDiscreteInputsRequest) register_request_type(ReadDiscreteInputsRequest)
@class_debugging @bacpypes_debugging
class ReadDiscreteInputsResponse(ReadBitsResponseBase): class ReadDiscreteInputsResponse(ReadBitsResponseBase):
""" """
@ -728,7 +728,7 @@ register_response_type(ReadDiscreteInputsResponse)
# ReadMultipleRegisters # ReadMultipleRegisters
# #
@class_debugging @bacpypes_debugging
class ReadMultipleRegistersRequest(ReadRegistersRequestBase): class ReadMultipleRegistersRequest(ReadRegistersRequestBase):
""" """
@ -745,7 +745,7 @@ class ReadMultipleRegistersRequest(ReadRegistersRequestBase):
register_request_type(ReadMultipleRegistersRequest) register_request_type(ReadMultipleRegistersRequest)
@class_debugging @bacpypes_debugging
class ReadMultipleRegistersResponse(ReadRegistersResponseBase): class ReadMultipleRegistersResponse(ReadRegistersResponseBase):
""" """
@ -766,7 +766,7 @@ register_response_type(ReadMultipleRegistersResponse)
# ReadInputRegisters # ReadInputRegisters
# #
@class_debugging @bacpypes_debugging
class ReadInputRegistersRequest(ReadRegistersRequestBase): class ReadInputRegistersRequest(ReadRegistersRequestBase):
""" """
@ -783,7 +783,7 @@ class ReadInputRegistersRequest(ReadRegistersRequestBase):
register_request_type(ReadInputRegistersRequest) register_request_type(ReadInputRegistersRequest)
@class_debugging @bacpypes_debugging
class ReadInputRegistersResponse(ReadRegistersResponseBase): class ReadInputRegistersResponse(ReadRegistersResponseBase):
""" """
@ -804,7 +804,7 @@ register_response_type(ReadInputRegistersResponse)
# WriteSingleCoil # WriteSingleCoil
# #
@class_debugging @bacpypes_debugging
class WriteSingleCoilRequest(ReadWriteValueBase): class WriteSingleCoilRequest(ReadWriteValueBase):
""" """
@ -821,7 +821,7 @@ class WriteSingleCoilRequest(ReadWriteValueBase):
register_request_type(WriteSingleCoilRequest) register_request_type(WriteSingleCoilRequest)
@class_debugging @bacpypes_debugging
class WriteSingleCoilResponse(ReadWriteValueBase): class WriteSingleCoilResponse(ReadWriteValueBase):
""" """
@ -842,7 +842,7 @@ register_response_type(WriteSingleCoilResponse)
# WriteSingleRegister # WriteSingleRegister
# #
@class_debugging @bacpypes_debugging
class WriteSingleRegisterRequest(ReadWriteValueBase): class WriteSingleRegisterRequest(ReadWriteValueBase):
""" """
@ -859,7 +859,7 @@ class WriteSingleRegisterRequest(ReadWriteValueBase):
register_request_type(WriteSingleRegisterRequest) register_request_type(WriteSingleRegisterRequest)
@class_debugging @bacpypes_debugging
class WriteSingleRegisterResponse(ReadWriteValueBase): class WriteSingleRegisterResponse(ReadWriteValueBase):
""" """
@ -880,7 +880,7 @@ register_response_type(WriteSingleRegisterResponse)
# WriteMultipleCoils # WriteMultipleCoils
# #
@class_debugging @bacpypes_debugging
class WriteMultipleCoilsRequest(MPCI, DebugContents): class WriteMultipleCoilsRequest(MPCI, DebugContents):
""" """
@ -930,7 +930,7 @@ class WriteMultipleCoilsRequest(MPCI, DebugContents):
register_request_type(WriteMultipleCoilsRequest) register_request_type(WriteMultipleCoilsRequest)
@class_debugging @bacpypes_debugging
class WriteMultipleCoilsResponse(MPCI, DebugContents): class WriteMultipleCoilsResponse(MPCI, DebugContents):
""" """
@ -970,7 +970,7 @@ register_response_type(WriteMultipleCoilsResponse)
# WriteMultipleRegisters # WriteMultipleRegisters
# #
@class_debugging @bacpypes_debugging
class WriteMultipleRegistersRequest(MPCI, DebugContents): class WriteMultipleRegistersRequest(MPCI, DebugContents):
""" """
@ -1022,7 +1022,7 @@ class WriteMultipleRegistersRequest(MPCI, DebugContents):
register_request_type(WriteMultipleRegistersRequest) register_request_type(WriteMultipleRegistersRequest)
@class_debugging @bacpypes_debugging
class WriteMultipleRegistersResponse(MPCI, DebugContents): class WriteMultipleRegistersResponse(MPCI, DebugContents):
""" """
@ -1062,7 +1062,7 @@ register_response_type(WriteMultipleRegistersResponse)
# ReadWriteMultipleRegistersRequest # ReadWriteMultipleRegistersRequest
# #
@class_debugging @bacpypes_debugging
class ReadWriteMultipleRegistersRequest(MPCI, DebugContents): class ReadWriteMultipleRegistersRequest(MPCI, DebugContents):
""" """
@ -1118,7 +1118,7 @@ class ReadWriteMultipleRegistersRequest(MPCI, DebugContents):
register_request_type(ReadWriteMultipleRegistersRequest) register_request_type(ReadWriteMultipleRegistersRequest)
@class_debugging @bacpypes_debugging
class ReadWriteMultipleRegistersResponse(MPCI, DebugContents): class ReadWriteMultipleRegistersResponse(MPCI, DebugContents):
""" """
@ -1163,7 +1163,7 @@ register_response_type(ReadWriteMultipleRegistersResponse)
# ExceptionResponse # ExceptionResponse
# #
@class_debugging @bacpypes_debugging
class ExceptionResponse(MPCI, DebugContents): class ExceptionResponse(MPCI, DebugContents):
""" """