mirror of
https://github.com/thelsing/knx.git
synced 2025-06-04 01:15:26 +02:00
initialize all fields (hopefully)
This commit is contained in:
parent
c5bf61a44f
commit
b3f6a0e3fa
@ -9,18 +9,18 @@
|
|||||||
* See section 4.10 of @cite knx:3/5/1 for further details.
|
* See section 4.10 of @cite knx:3/5/1 for further details.
|
||||||
* It implements realisation type 7 (see section 4.10.7 of @cite knx:3/5/1).
|
* It implements realisation type 7 (see section 4.10.7 of @cite knx:3/5/1).
|
||||||
*/
|
*/
|
||||||
class AddressTableObject: public TableObject
|
class AddressTableObject : public TableObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* The contructor.
|
* The contructor.
|
||||||
*
|
*
|
||||||
* @param platform This parameter is only passed to the custructor of TableObject an not used by this class.
|
* @param platform This parameter is only passed to the custructor of TableObject an not used by this class.
|
||||||
*/
|
*/
|
||||||
AddressTableObject(Platform& platform);
|
AddressTableObject(Platform& platform);
|
||||||
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t *data);
|
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
||||||
uint8_t *save(uint8_t *buffer);
|
uint8_t* save(uint8_t* buffer);
|
||||||
uint8_t *restore(uint8_t *buffer);
|
uint8_t* restore(uint8_t* buffer);
|
||||||
/**
|
/**
|
||||||
* returns the number of group addresses of the object.
|
* returns the number of group addresses of the object.
|
||||||
*/
|
*/
|
||||||
@ -49,10 +49,12 @@ public:
|
|||||||
* @return true if the address table contains the group address, false otherwise
|
* @return true if the address table contains the group address, false otherwise
|
||||||
*/
|
*/
|
||||||
bool contains(uint16_t groupAddress);
|
bool contains(uint16_t groupAddress);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
virtual void beforeStateChange(LoadState& newState);
|
virtual void beforeStateChange(LoadState& newState);
|
||||||
uint8_t propertyCount();
|
uint8_t propertyCount();
|
||||||
PropertyDescription* propertyDescriptions();
|
PropertyDescription* propertyDescriptions();
|
||||||
private:
|
|
||||||
uint16_t* _groupAddresses;
|
private:
|
||||||
|
uint16_t* _groupAddresses = 0;
|
||||||
};
|
};
|
||||||
|
@ -48,6 +48,6 @@ class APDU
|
|||||||
APDU(uint8_t* data, CemiFrame& frame);
|
APDU(uint8_t* data, CemiFrame& frame);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t* _data;
|
uint8_t* _data = 0;
|
||||||
CemiFrame& _frame;
|
CemiFrame& _frame;
|
||||||
};
|
};
|
@ -146,6 +146,6 @@ class ApplicationLayer
|
|||||||
uint16_t _savedAsapResponse;
|
uint16_t _savedAsapResponse;
|
||||||
AssociationTableObject& _assocTable;
|
AssociationTableObject& _assocTable;
|
||||||
BusAccessUnit& _bau;
|
BusAccessUnit& _bau;
|
||||||
TransportLayer* _transportLayer;
|
TransportLayer* _transportLayer = 0;
|
||||||
int32_t _connectedTsap;
|
int32_t _connectedTsap;
|
||||||
};
|
};
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
#include "table_object.h"
|
#include "table_object.h"
|
||||||
|
|
||||||
class ApplicationProgramObject: public TableObject
|
class ApplicationProgramObject : public TableObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ApplicationProgramObject(Platform& platform);
|
ApplicationProgramObject(Platform& platform);
|
||||||
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
||||||
void writeProperty(PropertyID id, uint8_t start, uint8_t* data, uint8_t count);
|
void writeProperty(PropertyID id, uint8_t start, uint8_t* data, uint8_t count);
|
||||||
@ -15,9 +15,11 @@ public:
|
|||||||
uint32_t getInt(uint32_t addr);
|
uint32_t getInt(uint32_t addr);
|
||||||
uint8_t* save(uint8_t* buffer);
|
uint8_t* save(uint8_t* buffer);
|
||||||
uint8_t* restore(uint8_t* buffer);
|
uint8_t* restore(uint8_t* buffer);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
uint8_t propertyCount();
|
uint8_t propertyCount();
|
||||||
PropertyDescription* propertyDescriptions();
|
PropertyDescription* propertyDescriptions();
|
||||||
private:
|
|
||||||
uint8_t _programVersion[5];
|
private:
|
||||||
|
uint8_t _programVersion[5] = {0, 0, 0, 0, 0};
|
||||||
};
|
};
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
#include "table_object.h"
|
#include "table_object.h"
|
||||||
|
|
||||||
class AssociationTableObject: public TableObject
|
class AssociationTableObject : public TableObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
AssociationTableObject(Platform& platform);
|
AssociationTableObject(Platform& platform);
|
||||||
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
||||||
uint16_t entryCount();
|
uint16_t entryCount();
|
||||||
@ -13,10 +13,12 @@ public:
|
|||||||
uint8_t* restore(uint8_t* buffer);
|
uint8_t* restore(uint8_t* buffer);
|
||||||
|
|
||||||
int32_t translateAsap(uint16_t asap);
|
int32_t translateAsap(uint16_t asap);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
void beforeStateChange(LoadState& newState);
|
void beforeStateChange(LoadState& newState);
|
||||||
uint8_t propertyCount();
|
uint8_t propertyCount();
|
||||||
PropertyDescription* propertyDescriptions();
|
PropertyDescription* propertyDescriptions();
|
||||||
private:
|
|
||||||
uint16_t* _tableData;
|
private:
|
||||||
|
uint16_t* _tableData = 0;
|
||||||
};
|
};
|
@ -4,107 +4,107 @@
|
|||||||
|
|
||||||
class BusAccessUnit
|
class BusAccessUnit
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void groupValueReadLocalConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopType, bool status);
|
virtual void groupValueReadLocalConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopType, bool status);
|
||||||
virtual void groupValueReadIndication(uint16_t asap, Priority priority, HopCountType hopType);
|
virtual void groupValueReadIndication(uint16_t asap, Priority priority, HopCountType hopType);
|
||||||
virtual void groupValueReadResponseConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopTtype,
|
virtual void groupValueReadResponseConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopTtype,
|
||||||
uint8_t* data, uint8_t dataLength, bool status);
|
uint8_t* data, uint8_t dataLength, bool status);
|
||||||
virtual void groupValueReadAppLayerConfirm(uint16_t asap, Priority priority, HopCountType hopType,
|
virtual void groupValueReadAppLayerConfirm(uint16_t asap, Priority priority, HopCountType hopType,
|
||||||
uint8_t* data, uint8_t dataLength);
|
uint8_t* data, uint8_t dataLength);
|
||||||
virtual void groupValueWriteLocalConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopType,
|
virtual void groupValueWriteLocalConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopType,
|
||||||
uint8_t* data, uint8_t dataLength, bool status);
|
uint8_t* data, uint8_t dataLength, bool status);
|
||||||
virtual void groupValueWriteIndication(uint16_t asap, Priority priority, HopCountType hopType,
|
virtual void groupValueWriteIndication(uint16_t asap, Priority priority, HopCountType hopType,
|
||||||
uint8_t* data, uint8_t dataLength);
|
uint8_t* data, uint8_t dataLength);
|
||||||
virtual void individualAddressWriteLocalConfirm(AckType ack, HopCountType hopType,
|
virtual void individualAddressWriteLocalConfirm(AckType ack, HopCountType hopType,
|
||||||
uint16_t newaddress, bool status);
|
uint16_t newaddress, bool status);
|
||||||
virtual void individualAddressWriteIndication(HopCountType hopType, uint16_t newaddress);
|
virtual void individualAddressWriteIndication(HopCountType hopType, uint16_t newaddress);
|
||||||
virtual void individualAddressReadLocalConfirm(AckType ack, HopCountType hopType, bool status);
|
virtual void individualAddressReadLocalConfirm(AckType ack, HopCountType hopType, bool status);
|
||||||
virtual void individualAddressReadIndication(HopCountType hopType);
|
virtual void individualAddressReadIndication(HopCountType hopType);
|
||||||
virtual void individualAddressReadResponseConfirm(AckType ack, HopCountType hopType, bool status);
|
virtual void individualAddressReadResponseConfirm(AckType ack, HopCountType hopType, bool status);
|
||||||
virtual void individualAddressReadAppLayerConfirm(HopCountType hopType, uint16_t individualAddress);
|
virtual void individualAddressReadAppLayerConfirm(HopCountType hopType, uint16_t individualAddress);
|
||||||
virtual void individualAddressSerialNumberReadLocalConfirm(AckType ack, HopCountType hopType,
|
virtual void individualAddressSerialNumberReadLocalConfirm(AckType ack, HopCountType hopType,
|
||||||
uint8_t* serialNumber, bool status);
|
uint8_t* serialNumber, bool status);
|
||||||
virtual void individualAddressSerialNumberReadIndication(HopCountType hopType, uint8_t* serialNumber);
|
virtual void individualAddressSerialNumberReadIndication(HopCountType hopType, uint8_t* serialNumber);
|
||||||
virtual void individualAddressSerialNumberReadResponseConfirm(AckType ack, HopCountType hopType,
|
virtual void individualAddressSerialNumberReadResponseConfirm(AckType ack, HopCountType hopType,
|
||||||
uint8_t* serialNumber, uint16_t domainAddress, bool status);
|
uint8_t* serialNumber, uint16_t domainAddress, bool status);
|
||||||
virtual void individualAddressSerialNumberReadAppLayerConfirm(HopCountType hopType, uint8_t* serialNumber,
|
virtual void individualAddressSerialNumberReadAppLayerConfirm(HopCountType hopType, uint8_t* serialNumber,
|
||||||
uint16_t individualAddress, uint16_t domainAddress);
|
uint16_t individualAddress, uint16_t domainAddress);
|
||||||
virtual void individualAddressSerialNumberWriteLocalConfirm(AckType ack, HopCountType hopType, uint8_t* serialNumber,
|
virtual void individualAddressSerialNumberWriteLocalConfirm(AckType ack, HopCountType hopType, uint8_t* serialNumber,
|
||||||
uint16_t newaddress, bool status);
|
uint16_t newaddress, bool status);
|
||||||
virtual void individualAddressSerialNumberWriteIndication(HopCountType hopType, uint8_t* serialNumber, uint16_t newaddress);
|
virtual void individualAddressSerialNumberWriteIndication(HopCountType hopType, uint8_t* serialNumber, uint16_t newaddress);
|
||||||
virtual void deviceDescriptorReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void deviceDescriptorReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t descriptorType, bool status);
|
uint8_t descriptorType, bool status);
|
||||||
virtual void deviceDescriptorReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t descriptorType);
|
virtual void deviceDescriptorReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t descriptorType);
|
||||||
virtual void deviceDescriptorReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void deviceDescriptorReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t descriptor_type, uint8_t* device_descriptor, bool status);
|
uint8_t descriptor_type, uint8_t* device_descriptor, bool status);
|
||||||
virtual void deviceDescriptorReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void deviceDescriptorReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t descriptortype, uint8_t* deviceDescriptor);
|
uint8_t descriptortype, uint8_t* deviceDescriptor);
|
||||||
virtual void restartRequestLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, bool status);
|
virtual void restartRequestLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, bool status);
|
||||||
virtual void restartRequestIndication(Priority priority, HopCountType hopType, uint16_t asap);
|
virtual void restartRequestIndication(Priority priority, HopCountType hopType, uint16_t asap);
|
||||||
virtual void propertyValueReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void propertyValueReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t objectIndex, uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, bool status);
|
uint8_t objectIndex, uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, bool status);
|
||||||
virtual void propertyValueReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
virtual void propertyValueReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
||||||
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex);
|
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex);
|
||||||
virtual void propertyValueReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
virtual void propertyValueReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
||||||
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length, bool status);
|
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length, bool status);
|
||||||
virtual void propertyValueReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
virtual void propertyValueReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
||||||
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length);
|
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length);
|
||||||
virtual void propertyValueWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
virtual void propertyValueWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
||||||
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length, bool status);
|
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length, bool status);
|
||||||
virtual void propertyValueWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
virtual void propertyValueWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t objectIndex,
|
||||||
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length);
|
uint8_t propertyId, uint8_t numberOfElements, uint16_t startIndex, uint8_t* data, uint8_t length);
|
||||||
virtual void propertyDescriptionReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void propertyDescriptionReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool status);
|
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool status);
|
||||||
virtual void propertyDescriptionReadIndication(Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void propertyDescriptionReadIndication(Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex);
|
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex);
|
||||||
virtual void propertyDescriptionReadResponse(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void propertyDescriptionReadResponse(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool writeEnable, uint8_t type,
|
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool writeEnable, uint8_t type,
|
||||||
uint16_t maxNumberOfElements, uint8_t access);
|
uint16_t maxNumberOfElements, uint8_t access);
|
||||||
virtual void propertyDescriptionReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void propertyDescriptionReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool writeEnable, uint8_t type,
|
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool writeEnable, uint8_t type,
|
||||||
uint16_t maxNumberOfElements, uint8_t access, bool status);
|
uint16_t maxNumberOfElements, uint8_t access, bool status);
|
||||||
virtual void propertyDescriptionReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void propertyDescriptionReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool writeEnable, uint8_t type,
|
uint8_t objectIndex, uint8_t propertyId, uint8_t propertyIndex, bool writeEnable, uint8_t type,
|
||||||
uint16_t maxNumberOfElements, uint8_t access);
|
uint16_t maxNumberOfElements, uint8_t access);
|
||||||
virtual void memoryReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void memoryReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress, bool status);
|
uint16_t memoryAddress, bool status);
|
||||||
virtual void memoryReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number, uint16_t memoryAddress);
|
virtual void memoryReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number, uint16_t memoryAddress);
|
||||||
virtual void memoryReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void memoryReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress, uint8_t* data, bool status);
|
uint16_t memoryAddress, uint8_t* data, bool status);
|
||||||
virtual void memoryReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void memoryReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress, uint8_t* data);
|
uint16_t memoryAddress, uint8_t* data);
|
||||||
virtual void memoryWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void memoryWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress, uint8_t* data, bool status);
|
uint16_t memoryAddress, uint8_t* data, bool status);
|
||||||
virtual void memoryWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void memoryWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress, uint8_t* data);
|
uint16_t memoryAddress, uint8_t* data);
|
||||||
virtual void userMemoryReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void userMemoryReadLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint32_t memoryAddress, bool status);
|
uint32_t memoryAddress, bool status);
|
||||||
virtual void userMemoryReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void userMemoryReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint32_t memoryAddress);
|
uint32_t memoryAddress);
|
||||||
virtual void userMemoryReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void userMemoryReadResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint32_t memoryAddress, uint8_t* memoryData, bool status);
|
uint32_t memoryAddress, uint8_t* memoryData, bool status);
|
||||||
virtual void userMemoryReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void userMemoryReadAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint32_t memoryAddress, uint8_t* memoryData);
|
uint32_t memoryAddress, uint8_t* memoryData);
|
||||||
virtual void userMemoryWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void userMemoryWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint32_t memoryAddress, uint8_t* memoryData, bool status);
|
uint32_t memoryAddress, uint8_t* memoryData, bool status);
|
||||||
virtual void userMemoryWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
virtual void userMemoryWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint32_t memoryAddress, uint8_t* memoryData);
|
uint32_t memoryAddress, uint8_t* memoryData);
|
||||||
virtual void userManufacturerInfoLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, bool status);
|
virtual void userManufacturerInfoLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, bool status);
|
||||||
virtual void userManufacturerInfoIndication(Priority priority, HopCountType hopType, uint16_t asap);
|
virtual void userManufacturerInfoIndication(Priority priority, HopCountType hopType, uint16_t asap);
|
||||||
virtual void userManufacturerInfoResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void userManufacturerInfoResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t* info, bool status);
|
uint8_t* info, bool status);
|
||||||
virtual void userManufacturerInfoAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap,
|
virtual void userManufacturerInfoAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap,
|
||||||
uint8_t* info);
|
uint8_t* info);
|
||||||
virtual void authorizeLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint32_t key, bool status);
|
virtual void authorizeLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint32_t key, bool status);
|
||||||
virtual void authorizeIndication(Priority priority, HopCountType hopType, uint16_t asap, uint32_t key);
|
virtual void authorizeIndication(Priority priority, HopCountType hopType, uint16_t asap, uint32_t key);
|
||||||
virtual void authorizeResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
virtual void authorizeResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
||||||
bool status);
|
bool status);
|
||||||
virtual void authorizeAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t level);
|
virtual void authorizeAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t level);
|
||||||
virtual void keyWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
virtual void keyWriteLocalConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
||||||
uint32_t key, bool status);
|
uint32_t key, bool status);
|
||||||
virtual void keyWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
virtual void keyWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
||||||
uint32_t key);
|
uint32_t key);
|
||||||
virtual void keyWriteResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
virtual void keyWriteResponseConfirm(AckType ack, Priority priority, HopCountType hopType, uint16_t asap, uint8_t level,
|
||||||
bool status);
|
bool status);
|
||||||
virtual void keyWriteAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t level);
|
virtual void keyWriteAppLayerConfirm(Priority priority, HopCountType hopType, uint16_t asap, uint8_t level);
|
||||||
};
|
};
|
||||||
|
@ -2,37 +2,33 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
Bau07B0::Bau07B0(Platform& platform): BauSystemB(platform),
|
Bau07B0::Bau07B0(Platform& platform)
|
||||||
_dlLayer(_deviceObj, _addrTable, _netLayer, _platform)
|
: BauSystemB(platform),
|
||||||
|
_dlLayer(_deviceObj, _addrTable, _netLayer, _platform)
|
||||||
{
|
{
|
||||||
_netLayer.dataLinkLayer(_dlLayer);
|
_netLayer.dataLinkLayer(_dlLayer);
|
||||||
|
|
||||||
uint8_t descriptor[] = { 0x07, 0xb0 };
|
|
||||||
_descriptor[0] = descriptor[0];
|
|
||||||
_descriptor[1] = descriptor[1];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
InterfaceObject* Bau07B0::getInterfaceObject(uint8_t idx)
|
InterfaceObject* Bau07B0::getInterfaceObject(uint8_t idx)
|
||||||
{
|
{
|
||||||
switch (idx)
|
switch (idx)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
return &_deviceObj;
|
return &_deviceObj;
|
||||||
case 1:
|
case 1:
|
||||||
return &_addrTable;
|
return &_addrTable;
|
||||||
case 2:
|
case 2:
|
||||||
return &_assocTable;
|
return &_assocTable;
|
||||||
case 3:
|
case 3:
|
||||||
return &_groupObjTable;
|
return &_groupObjTable;
|
||||||
case 4:
|
case 4:
|
||||||
return &_appProgram;
|
return &_appProgram;
|
||||||
case 5: // would be app_program 2
|
case 5: // would be app_program 2
|
||||||
return nullptr;
|
return nullptr;
|
||||||
default:
|
default:
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,15 +3,17 @@
|
|||||||
#include "bau_systemB.h"
|
#include "bau_systemB.h"
|
||||||
#include "tpuart_data_link_layer.h"
|
#include "tpuart_data_link_layer.h"
|
||||||
|
|
||||||
class Bau07B0: public BauSystemB
|
class Bau07B0 : public BauSystemB
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Bau07B0(Platform& platform);
|
Bau07B0(Platform& platform);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
InterfaceObject* getInterfaceObject(uint8_t idx);
|
InterfaceObject* getInterfaceObject(uint8_t idx);
|
||||||
uint8_t* descriptor();
|
uint8_t* descriptor();
|
||||||
DataLinkLayer& dataLinkLayer();
|
DataLinkLayer& dataLinkLayer();
|
||||||
private:
|
|
||||||
|
private:
|
||||||
TpUartDataLinkLayer _dlLayer;
|
TpUartDataLinkLayer _dlLayer;
|
||||||
uint8_t _descriptor[2];
|
uint8_t _descriptor[2] = {0x07, 0xb0};
|
||||||
};
|
};
|
@ -4,38 +4,35 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
Bau57B0::Bau57B0(Platform& platform): BauSystemB(platform),
|
Bau57B0::Bau57B0(Platform& platform)
|
||||||
_ipParameters(_deviceObj, platform),
|
: BauSystemB(platform),
|
||||||
_dlLayer(_deviceObj, _addrTable, _ipParameters, _netLayer, _platform)
|
_ipParameters(_deviceObj, platform),
|
||||||
|
_dlLayer(_deviceObj, _addrTable, _ipParameters, _netLayer, _platform)
|
||||||
{
|
{
|
||||||
_netLayer.dataLinkLayer(_dlLayer);
|
_netLayer.dataLinkLayer(_dlLayer);
|
||||||
_memory.addSaveRestore(&_ipParameters);
|
_memory.addSaveRestore(&_ipParameters);
|
||||||
|
|
||||||
uint8_t descriptor[] = { 0x57, 0xb0 };
|
|
||||||
_descriptor[0] = descriptor[0];
|
|
||||||
_descriptor[1] = descriptor[1];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
InterfaceObject* Bau57B0::getInterfaceObject(uint8_t idx)
|
InterfaceObject* Bau57B0::getInterfaceObject(uint8_t idx)
|
||||||
{
|
{
|
||||||
switch (idx)
|
switch (idx)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
return &_deviceObj;
|
return &_deviceObj;
|
||||||
case 1:
|
case 1:
|
||||||
return &_addrTable;
|
return &_addrTable;
|
||||||
case 2:
|
case 2:
|
||||||
return &_assocTable;
|
return &_assocTable;
|
||||||
case 3:
|
case 3:
|
||||||
return &_groupObjTable;
|
return &_groupObjTable;
|
||||||
case 4:
|
case 4:
|
||||||
return &_appProgram;
|
return &_appProgram;
|
||||||
case 5: // would be app_program 2
|
case 5: // would be app_program 2
|
||||||
return nullptr;
|
return nullptr;
|
||||||
case 6:
|
case 6:
|
||||||
return &_ipParameters;
|
return &_ipParameters;
|
||||||
default:
|
default:
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,16 +4,18 @@
|
|||||||
#include "ip_parameter_object.h"
|
#include "ip_parameter_object.h"
|
||||||
#include "ip_data_link_layer.h"
|
#include "ip_data_link_layer.h"
|
||||||
|
|
||||||
class Bau57B0: public BauSystemB
|
class Bau57B0 : public BauSystemB
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Bau57B0(Platform& platform);
|
Bau57B0(Platform& platform);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
InterfaceObject* getInterfaceObject(uint8_t idx);
|
InterfaceObject* getInterfaceObject(uint8_t idx);
|
||||||
uint8_t* descriptor();
|
uint8_t* descriptor();
|
||||||
DataLinkLayer& dataLinkLayer();
|
DataLinkLayer& dataLinkLayer();
|
||||||
private:
|
|
||||||
|
private:
|
||||||
IpParameterObject _ipParameters;
|
IpParameterObject _ipParameters;
|
||||||
IpDataLinkLayer _dlLayer;
|
IpDataLinkLayer _dlLayer;
|
||||||
uint8_t _descriptor[2];
|
uint8_t _descriptor[2] = {0x57, 0xb0};
|
||||||
};
|
};
|
@ -13,9 +13,9 @@
|
|||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
|
|
||||||
class BauSystemB: protected BusAccessUnit
|
class BauSystemB : protected BusAccessUnit
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BauSystemB(Platform& platform);
|
BauSystemB(Platform& platform);
|
||||||
virtual void loop();
|
virtual void loop();
|
||||||
DeviceObject& deviceObject();
|
DeviceObject& deviceObject();
|
||||||
@ -28,13 +28,14 @@ public:
|
|||||||
void writeMemory();
|
void writeMemory();
|
||||||
void addSaveRestore(SaveRestore* obj);
|
void addSaveRestore(SaveRestore* obj);
|
||||||
void restartRequest(uint16_t asap);
|
void restartRequest(uint16_t asap);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
virtual DataLinkLayer& dataLinkLayer() = 0;
|
virtual DataLinkLayer& dataLinkLayer() = 0;
|
||||||
virtual uint8_t* descriptor() = 0;
|
virtual uint8_t* descriptor() = 0;
|
||||||
void memoryWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
void memoryWriteIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress, uint8_t* data) override;
|
uint16_t memoryAddress, uint8_t* data) override;
|
||||||
void memoryReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
void memoryReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t number,
|
||||||
uint16_t memoryAddress) override;
|
uint16_t memoryAddress) override;
|
||||||
void deviceDescriptorReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t descriptorType) override;
|
void deviceDescriptorReadIndication(Priority priority, HopCountType hopType, uint16_t asap, uint8_t descriptorType) override;
|
||||||
void restartRequestIndication(Priority priority, HopCountType hopType, uint16_t asap) override;
|
void restartRequestIndication(Priority priority, HopCountType hopType, uint16_t asap) override;
|
||||||
void authorizeIndication(Priority priority, HopCountType hopType, uint16_t asap, uint32_t key) override;
|
void authorizeIndication(Priority priority, HopCountType hopType, uint16_t asap, uint32_t key) override;
|
||||||
@ -58,7 +59,6 @@ protected:
|
|||||||
void groupValueWriteIndication(uint16_t asap, Priority priority, HopCountType hopType,
|
void groupValueWriteIndication(uint16_t asap, Priority priority, HopCountType hopType,
|
||||||
uint8_t* data, uint8_t dataLength) override;
|
uint8_t* data, uint8_t dataLength) override;
|
||||||
|
|
||||||
|
|
||||||
virtual InterfaceObject* getInterfaceObject(uint8_t idx) = 0;
|
virtual InterfaceObject* getInterfaceObject(uint8_t idx) = 0;
|
||||||
void sendNextGroupTelegram();
|
void sendNextGroupTelegram();
|
||||||
void updateGroupObject(GroupObject& go, uint8_t* data, uint8_t length);
|
void updateGroupObject(GroupObject& go, uint8_t* data, uint8_t length);
|
||||||
|
@ -15,18 +15,19 @@
|
|||||||
class CemiFrame
|
class CemiFrame
|
||||||
{
|
{
|
||||||
friend class DataLinkLayer;
|
friend class DataLinkLayer;
|
||||||
public:
|
|
||||||
|
public:
|
||||||
CemiFrame(uint8_t* data, uint16_t length);
|
CemiFrame(uint8_t* data, uint16_t length);
|
||||||
CemiFrame(uint8_t apduLength);
|
CemiFrame(uint8_t apduLength);
|
||||||
CemiFrame(const CemiFrame& other);
|
CemiFrame(const CemiFrame& other);
|
||||||
CemiFrame& operator= (CemiFrame other);
|
CemiFrame& operator=(CemiFrame other);
|
||||||
|
|
||||||
MessageCode messageCode() const;
|
MessageCode messageCode() const;
|
||||||
void messageCode(MessageCode value);
|
void messageCode(MessageCode value);
|
||||||
uint16_t totalLenght() const;
|
uint16_t totalLenght() const;
|
||||||
uint16_t telegramLengthtTP() const;
|
uint16_t telegramLengthtTP() const;
|
||||||
void fillTelegramTP(uint8_t* data);
|
void fillTelegramTP(uint8_t* data);
|
||||||
|
|
||||||
FrameFormat frameType() const;
|
FrameFormat frameType() const;
|
||||||
void frameType(FrameFormat value);
|
void frameType(FrameFormat value);
|
||||||
Repetition repetition() const;
|
Repetition repetition() const;
|
||||||
@ -49,15 +50,16 @@ public:
|
|||||||
NPDU& npdu();
|
NPDU& npdu();
|
||||||
TPDU& tpdu();
|
TPDU& tpdu();
|
||||||
APDU& apdu();
|
APDU& apdu();
|
||||||
|
|
||||||
uint8_t calcCRC(uint8_t* buffer, uint16_t len);
|
uint8_t calcCRC(uint8_t* buffer, uint16_t len);
|
||||||
bool valid() const;
|
bool valid() const;
|
||||||
private:
|
|
||||||
uint8_t buffer[0xff + NPDU_LPDU_DIFF]; //only valid of add info is zero
|
private:
|
||||||
uint8_t* _data;
|
uint8_t buffer[0xff + NPDU_LPDU_DIFF] = {0}; //only valid of add info is zero
|
||||||
uint8_t* _ctrl1;
|
uint8_t* _data = 0;
|
||||||
|
uint8_t* _ctrl1 = 0;
|
||||||
NPDU _npdu;
|
NPDU _npdu;
|
||||||
TPDU _tpdu;
|
TPDU _tpdu;
|
||||||
APDU _apdu;
|
APDU _apdu;
|
||||||
uint16_t _length; // only set if created from byte array
|
uint16_t _length = 0; // only set if created from byte array
|
||||||
};
|
};
|
@ -8,21 +8,22 @@
|
|||||||
|
|
||||||
class DataLinkLayer
|
class DataLinkLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DataLinkLayer(DeviceObject& devObj, AddressTableObject& addrTab, NetworkLayer& layer,
|
DataLinkLayer(DeviceObject& devObj, AddressTableObject& addrTab, NetworkLayer& layer,
|
||||||
Platform& platform);
|
Platform& platform);
|
||||||
|
|
||||||
// from network layer
|
// from network layer
|
||||||
void dataRequest(AckType ack, AddressType addrType, uint16_t destinationAddr, FrameFormat format,
|
void dataRequest(AckType ack, AddressType addrType, uint16_t destinationAddr, FrameFormat format,
|
||||||
Priority priority, NPDU& npdu);
|
Priority priority, NPDU& npdu);
|
||||||
void systemBroadcastRequest(AckType ack, FrameFormat format, Priority priority, NPDU& npdu);
|
void systemBroadcastRequest(AckType ack, FrameFormat format, Priority priority, NPDU& npdu);
|
||||||
virtual void loop() = 0;
|
virtual void loop() = 0;
|
||||||
virtual void enabled(bool value) = 0;
|
virtual void enabled(bool value) = 0;
|
||||||
virtual bool enabled() const = 0;
|
virtual bool enabled() const = 0;
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
void frameRecieved(CemiFrame& frame);
|
void frameRecieved(CemiFrame& frame);
|
||||||
void dataConReceived(CemiFrame& frame, bool success);
|
void dataConReceived(CemiFrame& frame, bool success);
|
||||||
bool sendTelegram(NPDU &npdu, AckType ack, uint16_t destinationAddr, AddressType addrType, FrameFormat format, Priority priority);
|
bool sendTelegram(NPDU& npdu, AckType ack, uint16_t destinationAddr, AddressType addrType, FrameFormat format, Priority priority);
|
||||||
virtual bool sendFrame(CemiFrame& frame) = 0;
|
virtual bool sendFrame(CemiFrame& frame) = 0;
|
||||||
uint8_t* frameData(CemiFrame& frame);
|
uint8_t* frameData(CemiFrame& frame);
|
||||||
DeviceObject& _deviceObject;
|
DeviceObject& _deviceObject;
|
||||||
|
@ -39,13 +39,13 @@ protected:
|
|||||||
uint8_t propertyCount();
|
uint8_t propertyCount();
|
||||||
PropertyDescription* propertyDescriptions();
|
PropertyDescription* propertyDescriptions();
|
||||||
private:
|
private:
|
||||||
uint8_t _deviceControl;
|
uint8_t _deviceControl = 0;
|
||||||
uint8_t _routingCount;
|
uint8_t _routingCount = 0;
|
||||||
uint8_t _prgMode;
|
uint8_t _prgMode = 0;
|
||||||
uint16_t _ownAddress;
|
uint16_t _ownAddress = 0;
|
||||||
uint16_t _manufacturerId = 0xfa; //Default to KNXA
|
uint16_t _manufacturerId = 0xfa; //Default to KNXA
|
||||||
uint32_t _bauNumber;
|
uint32_t _bauNumber = 0;
|
||||||
char _orderNumber[10];
|
char _orderNumber[10] = "";
|
||||||
uint8_t _hardwareType[6];
|
uint8_t _hardwareType[6] = { 0, 0, 0, 0, 0, 0};
|
||||||
uint16_t _version;
|
uint16_t _version = 0;
|
||||||
};
|
};
|
@ -36,110 +36,110 @@
|
|||||||
/**
|
/**
|
||||||
* Converts the KNX Payload given by the specific DPT and puts the value in the KNXValue struc
|
* Converts the KNX Payload given by the specific DPT and puts the value in the KNXValue struc
|
||||||
*/
|
*/
|
||||||
int KNX_Decode_Value(uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int KNX_Decode_Value(uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts the KNXValue struct to the KNX Payload as the specific DPT
|
* Converts the KNXValue struct to the KNX Payload as the specific DPT
|
||||||
*/
|
*/
|
||||||
int KNX_Encode_Value(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int KNX_Encode_Value(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
|
|
||||||
//KNX to internal
|
//KNX to internal
|
||||||
int busValueToBinary(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToBinary(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToBinaryControl(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToBinaryControl(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToStepControl(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToStepControl(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToCharacter(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToCharacter(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToUnsigned8(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToUnsigned8(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSigned8(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSigned8(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToStatusAndMode(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToStatusAndMode(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToUnsigned16(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToUnsigned16(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToTimePeriod(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToTimePeriod(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSigned16(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSigned16(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToTimeDelta(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToTimeDelta(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToFloat16(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToFloat16(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToTime(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToTime(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToDate(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToDate(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToUnsigned32(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToUnsigned32(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSigned32(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSigned32(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToLongTimePeriod(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToLongTimePeriod(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToFloat32(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToFloat32(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToAccess(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToAccess(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToString(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToString(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToScene(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToScene(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSceneControl(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSceneControl(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSceneInfo(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSceneInfo(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSceneConfig(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSceneConfig(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToDateTime(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToDateTime(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToUnicode(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToUnicode(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSigned64(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSigned64(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToAlarmInfo(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToAlarmInfo(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToSerialNumber(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToSerialNumber(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToVersion(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToVersion(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToScaling(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToScaling(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToTariff(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToTariff(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToLocale(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToLocale(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToRGB(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToRGB(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToFlaggedScaling(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToFlaggedScaling(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
int busValueToActiveEnergy(const uint8_t *payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
int busValueToActiveEnergy(const uint8_t* payload, int payload_length, const Dpt& datatype, KNXValue& value);
|
||||||
|
|
||||||
//Internal to KNX
|
//Internal to KNX
|
||||||
int valueToBusValueBinary(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueBinary(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueBinaryControl(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueBinaryControl(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueStepControl(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueStepControl(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueCharacter(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueCharacter(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueUnsigned8(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueUnsigned8(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSigned8(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSigned8(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueStatusAndMode(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueStatusAndMode(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueUnsigned16(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueUnsigned16(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueTimePeriod(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueTimePeriod(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSigned16(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSigned16(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueTimeDelta(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueTimeDelta(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueFloat16(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueFloat16(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueTime(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueTime(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueDate(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueDate(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueUnsigned32(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueUnsigned32(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSigned32(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSigned32(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueLongTimePeriod(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueLongTimePeriod(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueFloat32(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueFloat32(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueAccess(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueAccess(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueString(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueString(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueScene(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueScene(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSceneControl(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSceneControl(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSceneInfo(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSceneInfo(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSceneConfig(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSceneConfig(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueDateTime(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueDateTime(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueUnicode(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueUnicode(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSigned64(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSigned64(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueAlarmInfo(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueAlarmInfo(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueSerialNumber(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueSerialNumber(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueVersion(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueVersion(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueScaling(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueScaling(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueTariff(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueTariff(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueLocale(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueLocale(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueRGB(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueRGB(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueFlaggedScaling(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueFlaggedScaling(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
int valueToBusValueActiveEnergy(const KNXValue& value, uint8_t *payload, int payload_length, const Dpt& datatype);
|
int valueToBusValueActiveEnergy(const KNXValue& value, uint8_t* payload, int payload_length, const Dpt& datatype);
|
||||||
|
|
||||||
//Payload manipulation
|
//Payload manipulation
|
||||||
bool bitFromPayload(const uint8_t *payload, int index);
|
bool bitFromPayload(const uint8_t* payload, int index);
|
||||||
uint8_t unsigned8FromPayload(const uint8_t *payload, int index);
|
uint8_t unsigned8FromPayload(const uint8_t* payload, int index);
|
||||||
int8_t signed8FromPayload(const uint8_t *payload, int index);
|
int8_t signed8FromPayload(const uint8_t* payload, int index);
|
||||||
uint16_t unsigned16FromPayload(const uint8_t *payload, int index);
|
uint16_t unsigned16FromPayload(const uint8_t* payload, int index);
|
||||||
int16_t signed16FromPayload(const uint8_t *payload, int index);
|
int16_t signed16FromPayload(const uint8_t* payload, int index);
|
||||||
uint32_t unsigned32FromPayload(const uint8_t *payload, int index);
|
uint32_t unsigned32FromPayload(const uint8_t* payload, int index);
|
||||||
int32_t signed32FromPayload(const uint8_t *payload, int index);
|
int32_t signed32FromPayload(const uint8_t* payload, int index);
|
||||||
double float16FromPayload(const uint8_t *payload, int index);
|
double float16FromPayload(const uint8_t* payload, int index);
|
||||||
float float32FromPayload(const uint8_t *payload, int index);
|
float float32FromPayload(const uint8_t* payload, int index);
|
||||||
int64_t signed64FromPayload(const uint8_t *payload, int index);
|
int64_t signed64FromPayload(const uint8_t* payload, int index);
|
||||||
uint8_t bcdFromPayload(const uint8_t *payload, int index);
|
uint8_t bcdFromPayload(const uint8_t* payload, int index);
|
||||||
|
|
||||||
void bitToPayload(uint8_t *payload, int payload_length, int index, bool value);
|
void bitToPayload(uint8_t* payload, int payload_length, int index, bool value);
|
||||||
void unsigned8ToPayload(uint8_t *payload, int payload_length, int index, uint8_t value, uint8_t mask); //mask 0xFF
|
void unsigned8ToPayload(uint8_t* payload, int payload_length, int index, uint8_t value, uint8_t mask); //mask 0xFF
|
||||||
void signed8ToPayload(uint8_t *payload, int payload_length, int index, int8_t value, uint8_t mask); //mask 0xFF
|
void signed8ToPayload(uint8_t* payload, int payload_length, int index, int8_t value, uint8_t mask); //mask 0xFF
|
||||||
void unsigned16ToPayload(uint8_t *payload, int payload_length, int index, uint16_t value, uint16_t mask); //mask 0xFFFF
|
void unsigned16ToPayload(uint8_t* payload, int payload_length, int index, uint16_t value, uint16_t mask); //mask 0xFFFF
|
||||||
void signed16ToPayload(uint8_t *payload, int payload_length, int index, int16_t value, uint16_t mask); //mask 0xFFFF
|
void signed16ToPayload(uint8_t* payload, int payload_length, int index, int16_t value, uint16_t mask); //mask 0xFFFF
|
||||||
void unsigned32ToPayload(uint8_t *payload, int payload_length, int index, uint32_t value, uint32_t mask); //mask = 0xFFFFFFFF
|
void unsigned32ToPayload(uint8_t* payload, int payload_length, int index, uint32_t value, uint32_t mask); //mask = 0xFFFFFFFF
|
||||||
void signed32ToPayload(uint8_t *payload, int payload_length, int index, int32_t value, uint32_t mask); //mask = 0xFFFFFFFF
|
void signed32ToPayload(uint8_t* payload, int payload_length, int index, int32_t value, uint32_t mask); //mask = 0xFFFFFFFF
|
||||||
void float16ToPayload(uint8_t *payload, int payload_length, int index, double value, uint16_t mask); //mask = 0xFFFF
|
void float16ToPayload(uint8_t* payload, int payload_length, int index, double value, uint16_t mask); //mask = 0xFFFF
|
||||||
void float32ToPayload(uint8_t *payload, int payload_length, int index, double value, uint32_t mask); //mask = 0xFFFFFFFF
|
void float32ToPayload(uint8_t* payload, int payload_length, int index, double value, uint32_t mask); //mask = 0xFFFFFFFF
|
||||||
void signed64ToPayload(uint8_t *payload, int payload_length, int index, int64_t value, uint64_t mask); //mask = UINT64_C(0xFFFFFFFFFFFFFFFF)
|
void signed64ToPayload(uint8_t* payload, int payload_length, int index, int64_t value, uint64_t mask); //mask = UINT64_C(0xFFFFFFFFFFFFFFFF)
|
||||||
void bcdToPayload(uint8_t *payload, int payload_length, int index, uint8_t value);
|
void bcdToPayload(uint8_t* payload, int payload_length, int index, uint8_t value);
|
@ -9,7 +9,7 @@ class GroupObjectTableObject;
|
|||||||
|
|
||||||
enum ComFlag
|
enum ComFlag
|
||||||
{
|
{
|
||||||
Updated = 0, //!< Group object was updated
|
Updated = 0, //!< Group object was updated
|
||||||
ReadRequest = 1, //!< Read was requested but was not processed
|
ReadRequest = 1, //!< Read was requested but was not processed
|
||||||
WriteRequest = 2, //!< Write was requested but was not processed
|
WriteRequest = 2, //!< Write was requested but was not processed
|
||||||
Transmitting = 3, //!< Group Object is processed a the moment (read or write)
|
Transmitting = 3, //!< Group Object is processed a the moment (read or write)
|
||||||
@ -19,12 +19,11 @@ enum ComFlag
|
|||||||
|
|
||||||
class GroupObject;
|
class GroupObject;
|
||||||
|
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <functional>
|
#include <functional>
|
||||||
typedef std::function<void(GroupObject&)> GroupObjectUpdatedHandler;
|
typedef std::function<void(GroupObject&)> GroupObjectUpdatedHandler;
|
||||||
#else
|
#else
|
||||||
typedef void(*GroupObjectUpdatedHandler)(GroupObject& go);
|
typedef void (*GroupObjectUpdatedHandler)(GroupObject& go);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,7 +32,8 @@ typedef void(*GroupObjectUpdatedHandler)(GroupObject& go);
|
|||||||
class GroupObject
|
class GroupObject
|
||||||
{
|
{
|
||||||
friend class GroupObjectTableObject;
|
friend class GroupObjectTableObject;
|
||||||
public:
|
|
||||||
|
public:
|
||||||
/**
|
/**
|
||||||
* The constructor.
|
* The constructor.
|
||||||
*/
|
*/
|
||||||
@ -41,7 +41,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
* The copy constructor.
|
* The copy constructor.
|
||||||
*/
|
*/
|
||||||
GroupObject(const GroupObject& other);
|
GroupObject(const GroupObject& other);
|
||||||
/**
|
/**
|
||||||
* The destructor.
|
* The destructor.
|
||||||
*/
|
*/
|
||||||
@ -71,12 +71,12 @@ public:
|
|||||||
* Check if the communication flag (C) was set. (K-flag in german)
|
* Check if the communication flag (C) was set. (K-flag in german)
|
||||||
*/
|
*/
|
||||||
bool communicationEnable();
|
bool communicationEnable();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the priority of the group object.
|
* Get the priority of the group object.
|
||||||
*/
|
*/
|
||||||
Priority priority();
|
Priority priority();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the current state of the group object. See ::ComFlag
|
* Return the current state of the group object. See ::ComFlag
|
||||||
*/
|
*/
|
||||||
@ -206,10 +206,10 @@ public:
|
|||||||
size_t asapValueSize(uint8_t code);
|
size_t asapValueSize(uint8_t code);
|
||||||
GroupObjectUpdatedHandler _updateHandler;
|
GroupObjectUpdatedHandler _updateHandler;
|
||||||
size_t goSize();
|
size_t goSize();
|
||||||
uint16_t _asap;
|
uint16_t _asap = 0;
|
||||||
ComFlag _commFlag;
|
ComFlag _commFlag = Ok;
|
||||||
uint8_t* _data;
|
uint8_t* _data = 0;
|
||||||
uint8_t _dataLength;
|
uint8_t _dataLength = 0;
|
||||||
GroupObjectTableObject* _table;
|
GroupObjectTableObject* _table = 0;
|
||||||
Dpt _datapointType;
|
Dpt _datapointType;
|
||||||
};
|
};
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
#include "table_object.h"
|
#include "table_object.h"
|
||||||
#include "group_object.h"
|
#include "group_object.h"
|
||||||
|
|
||||||
class GroupObjectTableObject: public TableObject
|
class GroupObjectTableObject : public TableObject
|
||||||
{
|
{
|
||||||
friend class GroupObject;
|
friend class GroupObject;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GroupObjectTableObject(Platform& platform);
|
GroupObjectTableObject(Platform& platform);
|
||||||
virtual ~GroupObjectTableObject();
|
virtual ~GroupObjectTableObject();
|
||||||
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
||||||
@ -18,11 +18,13 @@ public:
|
|||||||
|
|
||||||
virtual uint8_t* save(uint8_t* buffer);
|
virtual uint8_t* save(uint8_t* buffer);
|
||||||
virtual uint8_t* restore(uint8_t* buffer);
|
virtual uint8_t* restore(uint8_t* buffer);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
virtual void beforeStateChange(LoadState& newState);
|
virtual void beforeStateChange(LoadState& newState);
|
||||||
uint8_t propertyCount();
|
uint8_t propertyCount();
|
||||||
PropertyDescription* propertyDescriptions();
|
PropertyDescription* propertyDescriptions();
|
||||||
private:
|
|
||||||
|
private:
|
||||||
void freeGroupObjects();
|
void freeGroupObjects();
|
||||||
bool initGroupObjects();
|
bool initGroupObjects();
|
||||||
uint16_t* _tableData = 0;
|
uint16_t* _tableData = 0;
|
||||||
|
@ -53,9 +53,9 @@ enum ObjectType
|
|||||||
/**
|
/**
|
||||||
* This class represents and interface object. See section 4 of @cite knx:3/4/1.
|
* This class represents and interface object. See section 4 of @cite knx:3/4/1.
|
||||||
*/
|
*/
|
||||||
class InterfaceObject: public SaveRestore
|
class InterfaceObject : public SaveRestore
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* Destructor
|
* Destructor
|
||||||
*/
|
*/
|
||||||
@ -112,9 +112,10 @@ public:
|
|||||||
*
|
*
|
||||||
* @param[out] access the ::AccessLevel necessary to read/write the property.
|
* @param[out] access the ::AccessLevel necessary to read/write the property.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void readPropertyDescription(uint8_t& propertyId, uint8_t& propertyIndex, bool& writeEnable, uint8_t& type, uint16_t& numberOfElements, uint8_t& access);
|
void readPropertyDescription(uint8_t& propertyId, uint8_t& propertyIndex, bool& writeEnable, uint8_t& type, uint16_t& numberOfElements, uint8_t& access);
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
/**
|
/**
|
||||||
* Returns the number of properties the interface object has.
|
* Returns the number of properties the interface object has.
|
||||||
*/
|
*/
|
||||||
|
@ -4,17 +4,19 @@
|
|||||||
#include "data_link_layer.h"
|
#include "data_link_layer.h"
|
||||||
#include "ip_parameter_object.h"
|
#include "ip_parameter_object.h"
|
||||||
|
|
||||||
class IpDataLinkLayer: public DataLinkLayer
|
class IpDataLinkLayer : public DataLinkLayer
|
||||||
{
|
{
|
||||||
using DataLinkLayer::_deviceObject;
|
using DataLinkLayer::_deviceObject;
|
||||||
public:
|
|
||||||
IpDataLinkLayer(DeviceObject& devObj, AddressTableObject& addrTab, IpParameterObject& ipParam, NetworkLayer& layer,
|
public:
|
||||||
Platform& platform);
|
IpDataLinkLayer(DeviceObject& devObj, AddressTableObject& addrTab, IpParameterObject& ipParam, NetworkLayer& layer,
|
||||||
|
Platform& platform);
|
||||||
|
|
||||||
void loop();
|
void loop();
|
||||||
void enabled(bool value);
|
void enabled(bool value);
|
||||||
bool enabled() const;
|
bool enabled() const;
|
||||||
private:
|
|
||||||
|
private:
|
||||||
bool _enabled = false;
|
bool _enabled = false;
|
||||||
bool sendFrame(CemiFrame& frame);
|
bool sendFrame(CemiFrame& frame);
|
||||||
bool sendBytes(uint8_t* buffer, uint16_t length);
|
bool sendBytes(uint8_t* buffer, uint16_t length);
|
||||||
|
@ -4,9 +4,9 @@
|
|||||||
#include "device_object.h"
|
#include "device_object.h"
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
class IpParameterObject: public InterfaceObject
|
class IpParameterObject : public InterfaceObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
IpParameterObject(DeviceObject& deviceObject, Platform& platform);
|
IpParameterObject(DeviceObject& deviceObject, Platform& platform);
|
||||||
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
void readProperty(PropertyID id, uint32_t start, uint32_t& count, uint8_t* data);
|
||||||
void writeProperty(PropertyID id, uint8_t start, uint8_t* data, uint8_t count);
|
void writeProperty(PropertyID id, uint8_t start, uint8_t* data, uint8_t count);
|
||||||
@ -17,10 +17,12 @@ public:
|
|||||||
|
|
||||||
uint32_t multicastAddress() const;
|
uint32_t multicastAddress() const;
|
||||||
uint8_t ttl() const { return _ttl; }
|
uint8_t ttl() const { return _ttl; }
|
||||||
protected:
|
|
||||||
|
protected:
|
||||||
uint8_t propertyCount();
|
uint8_t propertyCount();
|
||||||
PropertyDescription* propertyDescriptions();
|
PropertyDescription* propertyDescriptions();
|
||||||
private:
|
|
||||||
|
private:
|
||||||
uint16_t _projectInstallationId = 0;
|
uint16_t _projectInstallationId = 0;
|
||||||
uint8_t _ipAssignmentMethod = 0;
|
uint8_t _ipAssignmentMethod = 0;
|
||||||
uint8_t _ipCapabilities = 0;
|
uint8_t _ipCapabilities = 0;
|
||||||
@ -29,7 +31,7 @@ private:
|
|||||||
uint32_t _defaultGateway = 0;
|
uint32_t _defaultGateway = 0;
|
||||||
uint32_t _multicastAddress = 0;
|
uint32_t _multicastAddress = 0;
|
||||||
uint8_t _ttl = 60;
|
uint8_t _ttl = 60;
|
||||||
char _friendlyName[30] = { 0 };
|
char _friendlyName[30] = {0};
|
||||||
DeviceObject& _deviceObject;
|
DeviceObject& _deviceObject;
|
||||||
Platform& _platform;
|
Platform& _platform;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
Platform& _platform;
|
Platform& _platform;
|
||||||
bool _modified = false;
|
bool _modified = false;
|
||||||
SaveRestore* _saveRestores[MAXSAVE];
|
SaveRestore* _saveRestores[MAXSAVE] = {0};
|
||||||
int _saveCount = 0;
|
int _saveCount = 0;
|
||||||
uint8_t* _data = 0;
|
uint8_t* _data = 0;
|
||||||
};
|
};
|
||||||
|
@ -8,20 +8,20 @@ class DataLinkLayer;
|
|||||||
|
|
||||||
class NetworkLayer
|
class NetworkLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NetworkLayer(TransportLayer& layer);
|
NetworkLayer(TransportLayer& layer);
|
||||||
|
|
||||||
void dataLinkLayer(DataLinkLayer& layer);
|
void dataLinkLayer(DataLinkLayer& layer);
|
||||||
uint8_t hopCount() const;
|
uint8_t hopCount() const;
|
||||||
void hopCount(uint8_t value);
|
void hopCount(uint8_t value);
|
||||||
|
|
||||||
// from data link layer
|
// from data link layer
|
||||||
void dataIndication(AckType ack, AddressType addType, uint16_t destination, FrameFormat format, NPDU& npdu,
|
void dataIndication(AckType ack, AddressType addType, uint16_t destination, FrameFormat format, NPDU& npdu,
|
||||||
Priority priority, uint16_t source);
|
Priority priority, uint16_t source);
|
||||||
void dataConfirm(AckType ack, AddressType addressType, uint16_t destination, FrameFormat format, Priority priority,
|
void dataConfirm(AckType ack, AddressType addressType, uint16_t destination, FrameFormat format, Priority priority,
|
||||||
uint16_t source, NPDU& npdu, bool status);
|
uint16_t source, NPDU& npdu, bool status);
|
||||||
void systemBroadcastIndication(AckType ack, FrameFormat format, NPDU& npdu,
|
void systemBroadcastIndication(AckType ack, FrameFormat format, NPDU& npdu,
|
||||||
Priority priority, uint16_t source);
|
Priority priority, uint16_t source);
|
||||||
void systemBroadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status);
|
void systemBroadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status);
|
||||||
|
|
||||||
// from transport layer
|
// from transport layer
|
||||||
@ -30,9 +30,9 @@ public:
|
|||||||
void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu);
|
void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu);
|
||||||
void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu);
|
void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void sendDataRequest(TPDU &tpdu, HopCountType hopType, AckType ack, uint16_t destination, Priority priority, AddressType addrType);
|
void sendDataRequest(TPDU& tpdu, HopCountType hopType, AckType ack, uint16_t destination, Priority priority, AddressType addrType);
|
||||||
uint8_t _hopCount = 6;
|
uint8_t _hopCount = 6;
|
||||||
DataLinkLayer* _dataLinkLayer;
|
DataLinkLayer* _dataLinkLayer = 0;
|
||||||
TransportLayer& _transportLayer;
|
TransportLayer& _transportLayer;
|
||||||
};
|
};
|
||||||
|
@ -22,6 +22,6 @@ class NPDU
|
|||||||
NPDU(uint8_t* data, CemiFrame& frame);
|
NPDU(uint8_t* data, CemiFrame& frame);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t* _data;
|
uint8_t* _data = 0;
|
||||||
CemiFrame& _frame;
|
CemiFrame& _frame;
|
||||||
};
|
};
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
class SaveRestore
|
class SaveRestore
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* This method is called when the object should save its state to the buffer.
|
* This method is called when the object should save its state to the buffer.
|
||||||
*
|
*
|
||||||
|
@ -31,6 +31,6 @@ class TPDU
|
|||||||
TPDU(uint8_t* data, CemiFrame& frame);
|
TPDU(uint8_t* data, CemiFrame& frame);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t* _data;
|
uint8_t* _data = 0;
|
||||||
CemiFrame& _frame;
|
CemiFrame& _frame;
|
||||||
};
|
};
|
||||||
|
@ -51,15 +51,15 @@ public:
|
|||||||
void cmdlineArgs(int argc, char** argv);
|
void cmdlineArgs(int argc, char** argv);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint32_t _multicastAddr;
|
uint32_t _multicastAddr = -1;
|
||||||
uint16_t _port;
|
uint16_t _port = -1;
|
||||||
int _socketFd = -1;
|
int _socketFd = -1;
|
||||||
void doMemoryMapping();
|
void doMemoryMapping();
|
||||||
uint8_t* _mappedFile;
|
uint8_t* _mappedFile = 0;
|
||||||
int _fd = -1;
|
int _fd = -1;
|
||||||
uint8_t* _currentMaxMem = 0;
|
uint8_t* _currentMaxMem = 0;
|
||||||
std::string _flashFilePath = "flash.bin";
|
std::string _flashFilePath = "flash.bin";
|
||||||
char** _args;
|
char** _args = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
Loading…
Reference in New Issue
Block a user