Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-26 10:26:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle PDT_CONTROL in FunctionPropertyExt*

Browse Source
This commit is contained in:
Nanosonde 2020-06-30 22:05:26 +02:00
parent de87c2a3a3
commit 2164d3896f
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/knx/bau_systemB.cpp
View File

@ -410,7 +410,20 @@ void BauSystemB::functionPropertyExtCommandIndication(Priority priority, HopCoun
InterfaceObject* obj = getInterfaceObject(objectType, objectInstance); InterfaceObject* obj = getInterfaceObject(objectType, objectInstance);
if(obj) if(obj)
obj->command((PropertyID)propertyId, data, length, resultData, resultLength); {
if (obj->property((PropertyID)propertyId)->Type() == PDT_CONTROL)
{
uint8_t count = 1;
obj->writeProperty((PropertyID)propertyId, 1, data, count);
resultLength = count ? 2 : 1;
resultData[0] = count ? ReturnCodes::Success : ReturnCodes::DataVoid;
resultData[1] = data[0];
}
else if (obj->property((PropertyID)propertyId)->Type() == PDT_FUNCTION)
{
obj->command((PropertyID)propertyId, data, length, resultData, resultLength);
}
}
_appLayer.functionPropertyExtStateResponse(AckRequested, priority, hopType, asap, secCtrl, objectType, objectInstance, propertyId, resultData, resultLength); _appLayer.functionPropertyExtStateResponse(AckRequested, priority, hopType, asap, secCtrl, objectType, objectInstance, propertyId, resultData, resultLength);
} }
@ -423,8 +436,19 @@ void BauSystemB::functionPropertyExtStateIndication(Priority priority, HopCountT
InterfaceObject* obj = getInterfaceObject(objectType, objectInstance); InterfaceObject* obj = getInterfaceObject(objectType, objectInstance);
if(obj) if(obj)
obj->state((PropertyID)propertyId, data, length, resultData, resultLength); {
if (obj->property((PropertyID)propertyId)->Type() == PDT_CONTROL)
{
uint8_t count = 1;
obj->readProperty((PropertyID)propertyId, 1, count, &resultData[1]);
resultLength = count ? 2 : 1;
resultData[0] = count ? ReturnCodes::Success : ReturnCodes::DataVoid;
}
else if (obj->property((PropertyID)propertyId)->Type() == PDT_FUNCTION)
{
obj->state((PropertyID)propertyId, data, length, resultData, resultLength);
}
}
_appLayer.functionPropertyExtStateResponse(AckRequested, priority, hopType, asap, secCtrl, objectType, objectInstance, propertyId, resultData, resultLength); _appLayer.functionPropertyExtStateResponse(AckRequested, priority, hopType, asap, secCtrl, objectType, objectInstance, propertyId, resultData, resultLength);
} }