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

aqhome-react: consistently named function.

Browse Source
This commit is contained in:
Martin Preuss
2024-04-17 23:13:15 +02:00
parent 7ea260031e
commit 716c1c58df
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/aqhome-react/units/u_module.c
View File

@@ -62,7 +62,7 @@ static int _linkFromThisModulesInput(AQHOME_REACT *aqh,
const char *emittingPortName, const char *emittingPortName,
const char *receivingUnitName, const char *receivingUnitName,
const char *receivingPortName); const char *receivingPortName);
static int _linkToModulesOutput(AQHOME_REACT *aqh, static int _linkToThisModulesOutput(AQHOME_REACT *aqh,
AQHREACT_UNIT *unit, AQHREACT_UNIT *unit,
const char *emittingUnitName, const char *emittingUnitName,
const char *emittingPortName, const char *emittingPortName,
@@ -82,9 +82,9 @@ static int _linkBetweenUnits(AQHOME_REACT *aqh,
*/ */
/* ------------------------------------------------------------------------------------------------ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* ModuleProxyDescr * ModuleProxyDescr
* ------------------------------------------------------------------------------------------------ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*/ */
MODULE_PROXY_DESCR *ModuleProxyDescr_new(const char *name, const char *targetObject, const char *targetName) MODULE_PROXY_DESCR *ModuleProxyDescr_new(const char *name, const char *targetObject, const char *targetName)
@@ -135,9 +135,9 @@ MODULE_PROXY_DESCR *ModuleProxyDescr_List_FindByName(const MODULE_PROXY_DESCR_LI
/* ------------------------------------------------------------------------------------------------ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* AqHomeReact_UnitModule * AqHomeReact_UnitModule
* ------------------------------------------------------------------------------------------------ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*/ */
AQHREACT_UNIT *AqHomeReact_UnitModule_new(AQHOME_REACT *aqh) AQHREACT_UNIT *AqHomeReact_UnitModule_new(AQHOME_REACT *aqh)
@@ -177,19 +177,15 @@ void _freeData(GWEN_UNUSED void *bp, void *p)
AQHREACT_UNIT *AqHomeReact_UnitModule_fromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode) AQHREACT_UNIT *AqHomeReact_UnitModule_fromXml(AQHOME_REACT *aqh, GWEN_XMLNODE *xmlNode)
{ {
const char *t;
const char *id;
AQHREACT_UNIT *unit; AQHREACT_UNIT *unit;
AQHREACT_UNIT_MODULE *xunit; AQHREACT_UNIT_MODULE *xunit;
int rv; int rv;
t=GWEN_XMLNode_GetProperty(xmlNode, "type", NULL);
id=GWEN_XMLNode_GetProperty(xmlNode, "id", NULL);
unit=AqHomeReact_UnitModule_new(aqh); unit=AqHomeReact_UnitModule_new(aqh);
xunit=(AQHREACT_UNIT_MODULE*)GWEN_INHERIT_GETDATA(AQHREACT_UNIT, AQHREACT_UNIT_MODULE, unit); xunit=(AQHREACT_UNIT_MODULE*)GWEN_INHERIT_GETDATA(AQHREACT_UNIT, AQHREACT_UNIT_MODULE, unit);
AQHREACT_Unit_SetName(unit, t);
AQHREACT_Unit_SetId(unit, id); AQHREACT_Unit_SetName(unit, GWEN_XMLNode_GetProperty(xmlNode, "type", NULL));
AQHREACT_Unit_SetId(unit, GWEN_XMLNode_GetProperty(xmlNode, "id", NULL));
_readProxyFromXml(xmlNode, xunit->paramProxyList, "paramdefs", "param", "name", "targetModule", "targetParam"); _readProxyFromXml(xmlNode, xunit->paramProxyList, "paramdefs", "param", "name", "targetModule", "targetParam");
@@ -637,7 +633,7 @@ int _readLinkFromXml(AQHOME_REACT *aqh, AQHREACT_UNIT *unit, GWEN_XMLNODE *linkN
if (strcasecmp(emittingUnitName, ".")==0) if (strcasecmp(emittingUnitName, ".")==0)
rv=_linkFromThisModulesInput(aqh, unit, emittingPortName, receivingUnitName, receivingPortName); rv=_linkFromThisModulesInput(aqh, unit, emittingPortName, receivingUnitName, receivingPortName);
else if (strcasecmp(receivingUnitName, ".")==0) else if (strcasecmp(receivingUnitName, ".")==0)
rv=_linkToModulesOutput(aqh, unit, emittingUnitName, emittingPortName, receivingPortName); rv=_linkToThisModulesOutput(aqh, unit, emittingUnitName, emittingPortName, receivingPortName);
else else
rv=_linkBetweenUnits(aqh, unit, emittingUnitName, emittingPortName, receivingUnitName, receivingPortName); rv=_linkBetweenUnits(aqh, unit, emittingUnitName, emittingPortName, receivingUnitName, receivingPortName);
if (rv<0) { if (rv<0) {
@@ -694,7 +690,7 @@ int _linkFromThisModulesInput(AQHOME_REACT *aqh,
int _linkToModulesOutput(AQHOME_REACT *aqh, int _linkToThisModulesOutput(AQHOME_REACT *aqh,
AQHREACT_UNIT *unit, AQHREACT_UNIT *unit,
const char *emittingUnitName, const char *emittingUnitName,
const char *emittingPortName, const char *emittingPortName,