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

aqhome: started parsing messages and extract info for node db.

Browse Source
This commit is contained in:
Martin Preuss
2023-03-24 21:16:25 +01:00
parent 58e5816c56
commit 0aaa5969ab
6 changed files with 410 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
aqhome/nodes/nodedb.c
View File

@@ -39,6 +39,27 @@ void AQH_NodeDb_free(AQH_NODE_DB *ndb)
void AQH_NodeDb_SetModified(AQH_NODE_DB *ndb)
{
ndb->modified=1;
}
void AQH_NodeDb_ClearModified(AQH_NODE_DB *ndb)
{
ndb->modified=0;
}
int AQH_NodeDb_IsModified(const AQH_NODE_DB *ndb)
{
return ndb->modified;
}
AQH_NODE_INFO_LIST *AQH_NodeDb_GetAllNodeInfos(AQH_NODE_DB *ndb)
{
return ndb->nodeList;
@@ -62,6 +83,7 @@ int AQH_NodeDb_AddNodeInfo(AQH_NODE_DB *ndb, AQH_NODE_INFO *ni)
}
busAddr=AQH_NodeInfo_GetBusAddress(ni);
#if 0
if (busAddr==0) {
DBG_ERROR(AQH_LOGDOMAIN, "Not adding node without BUSADDR");
return GWEN_ERROR_INVALID;
@@ -70,9 +92,11 @@ int AQH_NodeDb_AddNodeInfo(AQH_NODE_DB *ndb, AQH_NODE_INFO *ni)
DBG_ERROR(AQH_LOGDOMAIN, "A node with the given BUSADDR \"%02x\" already exists", busAddr);
return GWEN_ERROR_INVALID;
}
#endif
DBG_INFO(AQH_LOGDOMAIN, "Adding node UID=%08x BUSADDR=%02x", (unsigned int) uid, busAddr);
AQH_NodeInfo_List_Add(ni, ndb->nodeList);
AQH_NodeDb_SetModified(ndb);
return 0;
}
@@ -92,7 +116,7 @@ AQH_NODE_INFO *AQH_NodeDb_GetNodeInfoByUid(AQH_NODE_DB *ndb, uint32_t uid)
AQH_NODE_INFO_LIST *AQH_NodeDb_GetNodeInfosByNodeType(AQH_NODE_DB *ndb, int t)
AQH_NODE_INFO_LIST *AQH_NodeDb_GetNodeInfosByFirmwareType(AQH_NODE_DB *ndb, int t)
{
AQH_NODE_INFO_LIST *resultList;
AQH_NODE_INFO *ni;
@@ -100,7 +124,7 @@ AQH_NODE_INFO_LIST *AQH_NodeDb_GetNodeInfosByNodeType(AQH_NODE_DB *ndb, int t)
resultList=AQH_NodeInfo_List_new();
ni=AQH_NodeInfo_List_First(ndb->nodeList);
while(ni) {
if (t==0 || t==AQH_NodeInfo_GetNodeType(ni))
if (t==0 || t==AQH_NodeInfo_GetFirmwareType(ni))
AQH_NodeInfo_List_Add(AQH_NodeInfo_dup(ni), resultList);
ni=AQH_NodeInfo_List_Next(ni);
}
@@ -115,5 +139,43 @@ AQH_NODE_INFO_LIST *AQH_NodeDb_GetNodeInfosByNodeType(AQH_NODE_DB *ndb, int t)
void AQH_NodeDb_toDb(AQH_NODE_DB *ndb, GWEN_DB_NODE *dbDatabase)
{
if (ndb->nodeList) {
AQH_NODE_INFO *ni;
ni=AQH_NodeInfo_List_First(ndb->nodeList);
while(ni) {
GWEN_DB_NODE *dbNodeInfo;
dbNodeInfo=GWEN_DB_Group_new("nodeInfo");
AQH_NodeInfo_toDb(ni, dbNodeInfo);
GWEN_DB_AddGroup(dbDatabase, dbNodeInfo);
ni=AQH_NodeInfo_List_Next(ni);
}
}
}
void AQH_NodeDb_fromDb(AQH_NODE_DB *ndb, GWEN_DB_NODE *dbDatabase)
{
GWEN_DB_NODE *dbNodeInfo;
AQH_NodeInfo_List_Clear(ndb->nodeList);
dbNodeInfo=GWEN_DB_FindFirstGroup(dbDatabase, "nodeinfo");
while(dbNodeInfo) {
AQH_NODE_INFO *ni;
ni=AQH_NodeInfo_fromDb(dbNodeInfo);
if (ni)
AQH_NodeInfo_List_Add(ni, ndb->nodeList);
dbNodeInfo=GWEN_DB_FindNextGroup(dbNodeInfo, "nodeinfo");
}
AQH_NodeDb_ClearModified(ndb);
}

9
aqhome/nodes/nodedb.h
View File

@@ -13,6 +13,8 @@
#include <aqhome/api.h>
#include <aqhome/nodes/nodeinfo.h>
#include <gwenhywfar/db.h>
#include <inttypes.h>
@@ -27,9 +29,14 @@ 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_GetNodeInfosByNodeType(AQH_NODE_DB *ndb, int t);
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);
AQHOME_API void AQH_NodeDb_SetModified(AQH_NODE_DB *ndb);
AQHOME_API void AQH_NodeDb_ClearModified(AQH_NODE_DB *ndb);
AQHOME_API int AQH_NodeDb_IsModified(const AQH_NODE_DB *ndb);
#endif

2
aqhome/nodes/nodedb_p.h
View File

@@ -15,7 +15,7 @@
struct AQH_NODE_DB {
AQH_NODE_INFO_LIST *nodeList;
int modified;
};

158
aqhome/nodes/nodeinfo.t2d
View File

@@ -22,106 +22,6 @@
</headers>
<inlines>
<inline loc="end" access="public">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
$(api) int $(struct_prefix)_AddModule($(struct_type) *t, uint8_t v);
</content>
</inline>
<inline loc="code">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
int $(struct_prefix)_AddModule($(struct_type) *t, uint8_t v) {
int i;
assert(t);
for(i=0; i &lt; $(modules.maxlen); i++) {
if (t->modules[i]==0) {
t->modules[i]=v;
return 0;
}
}
DBG_ERROR(AQH_LOGDOMAIN, "Too many module entries");
return GWEN_ERROR_BUFFER_OVERFLOW;
}
</content>
</inline>
<inline loc="end" access="public">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
$(api) int $(struct_prefix)_HasModule(const $(struct_type) *t, uint8_t v);
</content>
</inline>
<inline loc="code">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
int $(struct_prefix)_HasModule(const $(struct_type) *t, uint8_t v) {
int i;
assert(t);
for (i=0; i&lt;$(modules.maxlen); i++) {
if (t->modules[i]==v)
return 1;
}
return 0;
}
</content>
</inline>
<inline loc="end" access="public">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
$(api) int $(struct_prefix)_GetMaxModuleCount(void);
</content>
</inline>
<inline loc="code">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
int $(struct_prefix)_GetMaxModuleCount(void) {
return $(modules.maxlen);
}
</content>
</inline>
<inline loc="end" access="public">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
$(api) void $(struct_prefix)_ClearModules($(struct_type) *t);
</content>
</inline>
<inline loc="code">
<typeFlagsMask></typeFlagsMask>
<typeFlagsValue></typeFlagsValue>
<content>
void $(struct_prefix)_ClearModules($(struct_type) *t) {
int i;
assert(t);
for (i=0; i&lt;$(modules.maxlen); i++) {
t->modules[i]=0;
}
}
</content>
</inline>
</inlines>
@@ -145,39 +45,71 @@
<flags>with_getbymember</flags>
</member>
<member name="nodeType" type="uint32_t" maxlen="4">
<member name="firmwareType" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="baseSystemVersion" type="uint32_t" maxlen="4">
<member name="firmwareVersion" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="mainSystemVersion" type="uint32_t" maxlen="4">
<member name="modules" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="modules" type="uint8_t_array" maxlen="64">
<!-- <setflags>const dup</setflags> -->
<setflags>omit</setflags>
<getflags>const</getflags>
<dupflags>const</dupflags>
<access>public</access>
<descr>
This array contains one entry for every module the node contains (0 for empty entries).
Call $(struct_prefix)_GetMaxModuleCount() to get the size of this array.
</descr>
</member>
<member name="statsPacketsOut" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsPacketsIn" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsCollisions" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsAborted" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsErrors" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
<member name="statsHandled" type="uint32_t" maxlen="4">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags></flags>
</member>
</members>
</type>