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

aqhome-tool: rewrote SETDATA command.

Browse Source
This commit is contained in:
Martin Preuss
2024-10-01 22:35:12 +02:00
parent d2ac801223
commit 1d08945ae5
1 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
apps/aqhome-tool/data/setdata.c
View File

@@ -33,7 +33,8 @@
static int _doSetData(GWEN_DB_NODE *dbArgs); static int _doSetData(GWEN_DB_NODE *dbArgs);
static void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits, const char *valueData); static uint32_t _sendRequest(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits, const char *valueData);
static int _awaitResponse(GWEN_MSG_ENDPOINT *epTcp, uint32_t msgId, int timeoutInSeconds);
@@ -191,7 +192,8 @@ int _doSetData(GWEN_DB_NODE *dbArgs)
const char *valueName; const char *valueName;
const char *valueUnits; const char *valueUnits;
const char *valueData; const char *valueData;
GWEN_MSG *msg; uint32_t msgId;
int rv;
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5); timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
valueName=GWEN_DB_GetCharValue(dbArgs, "valueName", 0, NULL); valueName=GWEN_DB_GetCharValue(dbArgs, "valueName", 0, NULL);
@@ -216,62 +218,75 @@ int _doSetData(GWEN_DB_NODE *dbArgs)
return 2; return 2;
} }
_sendCommand(epTcp, valueName, valueUnits, valueData); msgId=_sendRequest(epTcp, valueName, valueUnits, valueData);
rv=_awaitResponse(epTcp, msgId, timeoutInSeconds);
for (;;) { if (rv!=0) {
uint16_t code; DBG_ERROR(NULL, "here (%d)", rv);
}
msg=Utils_WaitForSpecificIpcMessage(epTcp, AQH_MSGTYPE_IPC_DATA_RESULT, timeoutInSeconds);
if (msg==NULL) {
DBG_ERROR(NULL, "No response received");
return 2;
}
code=GWEN_IpcMsg_GetCode(msg);
if (code==AQH_MSGTYPE_IPC_DATA_RESULT) {
uint32_t resultCode;
resultCode=AQH_ResultIpcMsg_GetResultCode(msg);
if (resultCode!=AQH_MSG_IPC_SUCCESS) {
fprintf(stderr, "ERROR: %d\n", resultCode);
GWEN_MsgEndpoint_free(epTcp);
return 3;
}
else {
fprintf(stdout, "Value set.\n");
break;
}
}
else {
DBG_INFO(NULL, "Unexpected message \"%d\"", code);
GWEN_MsgEndpoint_free(epTcp);
return 3;
}
} /* for */
GWEN_MsgEndpoint_free(epTcp); GWEN_MsgEndpoint_free(epTcp);
return 0; return rv;
} }
void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits, const char *valueData) uint32_t _sendRequest(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits, const char *valueData)
{ {
GWEN_MSG *msgOut; GWEN_MSG *msgOut;
AQH_VALUE *v; AQH_VALUE *v;
uint32_t msgId;
v=AQH_Value_new(); v=AQH_Value_new();
AQH_Value_SetNameForSystem(v, valueName); AQH_Value_SetNameForSystem(v, valueName);
AQH_Value_SetValueUnits(v, valueUnits); AQH_Value_SetValueUnits(v, valueUnits);
msgOut=AQH_SetDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA, msgId=GWEN_MsgEndpoint_GetNextMessageId(epTcp);
GWEN_MsgEndpoint_GetNextMessageId(epTcp), 0, msgOut=AQH_SetDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA, msgId, 0, v, valueData);
v, valueData);
AQH_Value_free(v); AQH_Value_free(v);
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut); GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
return msgId;
}
int _awaitResponse(GWEN_MSG_ENDPOINT *epTcp, uint32_t msgId, int timeoutInSeconds)
{
GWEN_MSG *msgResponse;
msgResponse=Utils_WaitForResponse(epTcp, msgId, timeoutInSeconds);
if (msgResponse) {
uint16_t code;
code=GWEN_IpcMsg_GetCode(msgResponse);
if (code==AQH_MSGTYPE_IPC_DATA_RESULT) {
uint32_t resultCode;
resultCode=AQH_ResultIpcMsg_GetResultCode(msgResponse);
if (resultCode!=AQH_MSG_IPC_SUCCESS) {
fprintf(stderr, "ERROR: %d\n", resultCode);
GWEN_Msg_free(msgResponse);
return 3;
}
else {
fprintf(stdout, "Value set.\n");
GWEN_Msg_free(msgResponse);
return 0;
}
}
else {
DBG_INFO(NULL, "Unexpected message \"%d\"", code);
GWEN_Msg_free(msgResponse);
return 3;
}
}
else {
DBG_ERROR(NULL, "Timeout");
return 3;
}
return 0;
} }