Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-12-18 19:08:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Do NOT Send when Updating KO Failed on Value Conversion

Browse Source
This commit is contained in:
Cornelius Köpp 2024-11-01 20:44:51 +01:00
parent 483d868dac
commit b8f914c358
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/knx/group_object.cpp
View File

@ -226,8 +226,11 @@ GroupObjectUpdatedHandler GroupObject::callback()
void GroupObject::value(const KNXValue& value, const Dpt& type) void GroupObject::value(const KNXValue& value, const Dpt& type)
{ {
valueNoSend(value, type); if (_valueNoSend(value, type))
objectWritten(); {
// write on successful conversion/setting value only
objectWritten();
}
} }
@ -281,12 +284,20 @@ void GroupObject::valueNoSend(const KNXValue& value)
#endif #endif
void GroupObject::valueNoSend(const KNXValue& value, const Dpt& type) void GroupObject::valueNoSend(const KNXValue& value, const Dpt& type)
{
// ignore actual updating TODO check replacing valueNoSend with _valueNoSend
_valueNoSend(value, type);
}
bool GroupObject::_valueNoSend(const KNXValue& value, const Dpt& type)
{ {
const bool encodingDone = KNX_Encode_Value(value, _data, _dataLength, type); const bool encodingDone = KNX_Encode_Value(value, _data, _dataLength, type);
// initialize on succesful conversion only // initialize on succesful conversion only
if (encodingDone && _commFlagEx.uninitialized) if (encodingDone && _commFlagEx.uninitialized)
commFlag(Ok); commFlag(Ok);
return encodingDone;
} }
bool GroupObject::valueNoSendCompare(const KNXValue& value, const Dpt& type) bool GroupObject::valueNoSendCompare(const KNXValue& value, const Dpt& type)
@ -294,8 +305,7 @@ bool GroupObject::valueNoSendCompare(const KNXValue& value, const Dpt& type)
if (_commFlagEx.uninitialized) if (_commFlagEx.uninitialized)
{ {
// always set first value // always set first value
this->valueNoSend(value, type); return _valueNoSend(value, type);
return true;
} }
else else
{ {

12
src/knx/group_object.h
View File

@ -284,4 +284,16 @@ class GroupObject
GroupObjectUpdatedHandler _updateHandler; GroupObjectUpdatedHandler _updateHandler;
Dpt _datapointType; Dpt _datapointType;
#endif #endif
/**
* set the current value of the group object and show success.
* @param value the value the group object is set to
* @param type the datapoint type used for the conversion.
*
* The parameters must fit the group object. Otherwise it will stay unchanged.
*
* @returns true if the value of the group object was updated after successful conversion.
*/
bool _valueNoSend(const KNXValue& value, const Dpt& type);
}; };