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

aqhome: adapted to latest changes in node firmware.

Browse Source
This commit is contained in:
Martin Preuss
2024-09-06 22:51:32 +02:00
parent 2fa3e9d4ab
commit 9b724d5a5f
16 changed files with 602 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
aqhome/nodes/nodedb.c
View File

@@ -116,29 +116,6 @@ AQH_NODE_INFO *AQH_NodeDb_GetNodeInfoByUid(AQH_NODE_DB *ndb, uint32_t uid)
AQH_NODE_INFO_LIST *AQH_NodeDb_GetNodeInfosByFirmwareType(AQH_NODE_DB *ndb, int t)
{
AQH_NODE_INFO_LIST *resultList;
AQH_NODE_INFO *ni;
resultList=AQH_NodeInfo_List_new();
ni=AQH_NodeInfo_List_First(ndb->nodeList);
while(ni) {
if (t==0 || t==AQH_NodeInfo_GetFirmwareType(ni))
AQH_NodeInfo_List_Add(AQH_NodeInfo_dup(ni), resultList);
ni=AQH_NodeInfo_List_Next(ni);
}
if (AQH_NodeInfo_List_GetCount(resultList)<1) {
AQH_NodeInfo_List_free(resultList);
return NULL;
}
return resultList;
}
void AQH_NodeDb_toDb(AQH_NODE_DB *ndb, GWEN_DB_NODE *dbDatabase)
{
if (ndb->nodeList) {

1
aqhome/nodes/nodedb.h
View File

@@ -29,7 +29,6 @@ AQHOME_API int AQH_NodeDb_AddNodeInfo(AQH_NODE_DB *ndb, AQH_NODE_INFO *ni);
AQHOME_API AQH_NODE_INFO *AQH_NodeDb_GetNodeInfoByBusAddr(AQH_NODE_DB *ndb, uint8_t busAddr);
AQHOME_API AQH_NODE_INFO *AQH_NodeDb_GetNodeInfoByUid(AQH_NODE_DB *ndb, uint32_t uid);
AQHOME_API AQH_NODE_INFO_LIST *AQH_NodeDb_GetNodeInfosByFirmwareType(AQH_NODE_DB *ndb, int t);
AQHOME_API void AQH_NodeDb_toDb(AQH_NODE_DB *ndb, GWEN_DB_NODE *dbDatabase);
AQHOME_API void AQH_NodeDb_fromDb(AQH_NODE_DB *ndb, GWEN_DB_NODE *dbDatabase);

49
aqhome/nodes/nodeinfo.t2d
View File

@@ -32,86 +32,95 @@
<members>
<member name="busAddress" type="uint8_t" maxlen="1">
<member name="busAddress" type="uint8_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<flags>sortByMember with_getbymember</flags>
<access>public</access>
</member>
<member name="uid" type="uint32_t" maxlen="4">
<member name="uid" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags>with_getbymember</flags>
</member>
<member name="firmwareType" type="uint32_t" maxlen="4">
<member name="manufacturer" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="firmwareVersion" type="uint32_t" maxlen="4">
<member name="deviceType" type="int" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="modules" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
<descr>
</descr>
</member>
<member name="statsPacketsOut" type="uint32_t" maxlen="4">
<member name="deviceVersion" type="uint16_t" maxlen="8">
<descr>15-8: version, 7-0:revision</descr>
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsPacketsIn" type="uint32_t" maxlen="4">
<member name="firmwareVersion" type="uint32_t" maxlen="8">
<descr>bits 31-24: variant, 23-16: vmajor, 15-8: vminor, 7-0:vpatchlevel</descr>
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsCollisions" type="uint32_t" maxlen="4">
<member name="statsPacketsOut" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsBusy" type="uint32_t" maxlen="4">
<member name="statsPacketsIn" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsCrcErrors" type="uint32_t" maxlen="4">
<member name="statsCollisions" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsIoErrors" type="uint32_t" maxlen="4">
<member name="statsBusy" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsHandled" type="uint32_t" maxlen="4">
<member name="statsCrcErrors" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsIoErrors" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsHandled" type="uint32_t" maxlen="8">
<default>0</default>
<preset>0</preset>
<access>public</access>