martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome-nodes: introduced DENOM to value (not sure whether this is needed).

Browse Source
This commit is contained in:
Martin Preuss
2024-10-20 18:53:30 +02:00
parent a6af10a32d
commit fae5b55e82
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/aqhome-nodes/devicesdump.c
View File

@@ -97,6 +97,7 @@ void _dumpValue(const AQHNODE_VALUE *value, GWEN_BUFFER *dbuf, int indent)
int dataType; int dataType;
int modality; int modality;
const char *units; const char *units;
int denom;
id=AQHNODE_Value_GetId(value); id=AQHNODE_Value_GetId(value);
name=AQHNODE_Value_GetName(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); dataType=AQHNODE_Value_GetDataType(value);
modality=AQHNODE_Value_GetModality(value); modality=AQHNODE_Value_GetModality(value);
units=AQHNODE_Value_GetValueUnits(value); units=AQHNODE_Value_GetValueUnits(value);
denom=AQHNODE_Value_GetDenom(value);
GWEN_Buffer_FillWithBytes(dbuf, ' ', indent); 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, id, id,
name?name:"<empty name>", name?name:"<empty name>",
AQH_ValueType_toString(valueType), AQH_ValueType_toString(valueType),
AQH_ValueDataType_toString(dataType), AQH_ValueDataType_toString(dataType),
AQH_ValueModality_toString(modality), AQH_ValueModality_toString(modality),
units?units:"<empty units>", units?units:"<empty units>",
descr?descr:"<empty descr>"); descr?descr:"<empty descr>",
denom);
} }

1
apps/aqhome-nodes/devicesread.c
View File

@@ -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_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_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_SetModality(value, AQH_ValueModality_fromString(GWEN_XMLNode_GetProperty(valueNode, "modality", NULL)));
AQHNODE_Value_SetDenom(value, GWEN_XMLNode_GetIntProperty(valueNode, "denom", 1));
return value; return value;
} }

7
apps/aqhome-nodes/types/value.t2d
View File

@@ -79,6 +79,13 @@
<flags>own</flags> <flags>own</flags>
</member> </member>
<member name="denom" type="int" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
</members> </members>
</type> </type>