From fae5b55e82d69f2fd3a2eb19152d9d722e8307de Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Sun, 20 Oct 2024 18:53:30 +0200 Subject: [PATCH] aqhome-nodes: introduced DENOM to value (not sure whether this is needed). --- apps/aqhome-nodes/devicesdump.c | 7 +++++-- apps/aqhome-nodes/devicesread.c | 1 + apps/aqhome-nodes/types/value.t2d | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/aqhome-nodes/devicesdump.c b/apps/aqhome-nodes/devicesdump.c index a95eaad..7ace40e 100644 --- a/apps/aqhome-nodes/devicesdump.c +++ b/apps/aqhome-nodes/devicesdump.c @@ -97,6 +97,7 @@ void _dumpValue(const AQHNODE_VALUE *value, GWEN_BUFFER *dbuf, int indent) int dataType; int modality; const char *units; + int denom; id=AQHNODE_Value_GetId(value); name=AQHNODE_Value_GetName(value); @@ -105,16 +106,18 @@ void _dumpValue(const AQHNODE_VALUE *value, GWEN_BUFFER *dbuf, int indent) dataType=AQHNODE_Value_GetDataType(value); modality=AQHNODE_Value_GetModality(value); units=AQHNODE_Value_GetValueUnits(value); + denom=AQHNODE_Value_GetDenom(value); GWEN_Buffer_FillWithBytes(dbuf, ' ', indent); - GWEN_Buffer_AppendArgs(dbuf, "Value: %d[%02x] (%s, %s, %s, %s, %s, %s)\n", + GWEN_Buffer_AppendArgs(dbuf, "Value: %d[%02x] (%s, %s, %s, %s, %s, %s, %d)\n", id, id, name?name:"", AQH_ValueType_toString(valueType), AQH_ValueDataType_toString(dataType), AQH_ValueModality_toString(modality), units?units:"", - descr?descr:""); + descr?descr:"", + denom); } diff --git a/apps/aqhome-nodes/devicesread.c b/apps/aqhome-nodes/devicesread.c index bad63d3..ba3b656 100644 --- a/apps/aqhome-nodes/devicesread.c +++ b/apps/aqhome-nodes/devicesread.c @@ -309,6 +309,7 @@ AQHNODE_VALUE *_readXmlValue(GWEN_XMLNODE *valueNode) AQHNODE_Value_SetValueType(value, AQH_ValueType_fromString(GWEN_XMLNode_GetProperty(valueNode, "type", NULL))); AQHNODE_Value_SetDataType(value, AQH_ValueDataType_fromString(GWEN_XMLNode_GetProperty(valueNode, "dataType", NULL))); AQHNODE_Value_SetModality(value, AQH_ValueModality_fromString(GWEN_XMLNode_GetProperty(valueNode, "modality", NULL))); + AQHNODE_Value_SetDenom(value, GWEN_XMLNode_GetIntProperty(valueNode, "denom", 1)); return value; } diff --git a/apps/aqhome-nodes/types/value.t2d b/apps/aqhome-nodes/types/value.t2d index c26ed60..024fe39 100644 --- a/apps/aqhome-nodes/types/value.t2d +++ b/apps/aqhome-nodes/types/value.t2d @@ -79,6 +79,13 @@ own + + 0 + 0 + public + + +