Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add mandatory property description PID_OBJECT_TYPE and fix returned size for this property.

Browse Source
This commit is contained in:
nanosonde 2018-04-24 11:49:04 +02:00
parent 7e440ae816
commit 2a4473c5ff
7 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
address_table_object.cpp
View File

@ -84,7 +84,9 @@ void AddressTableObject::beforeStateChange(LoadState& newState)
_groupAddresses = (uint16_t*)_data; _groupAddresses = (uint16_t*)_data;
} }
static PropertyDescription _propertyDescriptions[] = { }; static PropertyDescription _propertyDescriptions[] = {
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
};
static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription); static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);
uint8_t AddressTableObject::propertyCount() uint8_t AddressTableObject::propertyCount()

9
application_program_object.cpp
View File

@ -43,10 +43,11 @@ uint8_t ApplicationProgramObject::propertySize(PropertyID id)
{ {
switch (id) switch (id)
{ {
case PID_OBJECT_TYPE:
case PID_PEI_TYPE: case PID_PEI_TYPE:
return 1; return 1;
case PID_PROG_VERSION: case PID_OBJECT_TYPE:
return 2;
case PID_PROG_VERSION:
return 5; return 5;
} }
return TableObject::propertySize(id); return TableObject::propertySize(id);
@ -86,7 +87,9 @@ uint8_t* ApplicationProgramObject::restore(uint8_t* buffer)
return TableObject::restore(buffer); return TableObject::restore(buffer);
} }
static PropertyDescription _propertyDescriptions[] = {}; static PropertyDescription _propertyDescriptions[] = {
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
};
static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription); static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);
uint8_t ApplicationProgramObject::propertyCount() uint8_t ApplicationProgramObject::propertyCount()

1
association_table_object.cpp
View File

@ -70,6 +70,7 @@ void AssociationTableObject::beforeStateChange(LoadState& newState)
static PropertyDescription _propertyDescriptions[] = static PropertyDescription _propertyDescriptions[] =
{ {
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
{ PID_TABLE, false, PDT_GENERIC_02, 254, ReadLv3 | WriteLv0 }, { PID_TABLE, false, PDT_GENERIC_02, 254, ReadLv3 | WriteLv0 },
}; };
static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription); static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);

7
device_object.cpp
View File

@ -83,13 +83,13 @@ uint8_t DeviceObject::propertySize(PropertyID id)
{ {
switch (id) switch (id)
{ {
case PID_OBJECT_TYPE:
case PID_DEVICE_CONTROL: case PID_DEVICE_CONTROL:
case PID_ROUTING_COUNT: case PID_ROUTING_COUNT:
case PID_PROG_MODE: case PID_PROG_MODE:
case PID_SUBNET_ADDR: case PID_SUBNET_ADDR:
case PID_DEVICE_ADDR: case PID_DEVICE_ADDR:
return 1; return 1;
case PID_OBJECT_TYPE:
case PID_MANUFACTURER_ID: case PID_MANUFACTURER_ID:
case PID_VERSION: case PID_VERSION:
case PID_DEVICE_DESCRIPTOR: case PID_DEVICE_DESCRIPTOR:
@ -254,7 +254,10 @@ void DeviceObject::version(uint16_t value)
_version = value; _version = value;
} }
static PropertyDescription _propertyDescriptions[] = {}; static PropertyDescription _propertyDescriptions[] = {
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
{ PID_SERIAL_NUMBER, false, PDT_GENERIC_06, 1, ReadLv3 | WriteLv0 },
};
static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription); static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);
uint8_t DeviceObject::propertyCount() uint8_t DeviceObject::propertyCount()

4
group_object_table_object.cpp
View File

@ -120,7 +120,9 @@ bool GroupObjectTableObject::initGroupObjects()
return true; return true;
} }
static PropertyDescription _propertyDescriptions[] = { }; static PropertyDescription _propertyDescriptions[] = {
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
};
static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription); static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);
uint8_t GroupObjectTableObject::propertyCount() uint8_t GroupObjectTableObject::propertyCount()

4
ip_parameter_object.cpp
View File

@ -304,7 +304,9 @@ void IpParameterObject::additionalLoadControls(uint8_t* data)
return; return;
} }
static PropertyDescription _propertyDescriptions[] = { }; static PropertyDescription _propertyDescriptions[] = {
{ PID_OBJECT_TYPE, false, PDT_UNSIGNED_INT, 1, ReadLv3 | WriteLv0 },
};
static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription); static uint8_t _propertyCount = sizeof(_propertyDescriptions) / sizeof(PropertyDescription);
uint8_t IpParameterObject::propertyCount() uint8_t IpParameterObject::propertyCount()

2
table_object.cpp
View File

@ -52,6 +52,8 @@ uint8_t TableObject::propertySize(PropertyID id)
return 4; return 4;
case PID_ERROR_CODE: case PID_ERROR_CODE:
return 1; return 1;
case PID_OBJECT_TYPE:
return 2;
} }
return 0; return 0;
} }