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

removed unneeded IPC message types.

Browse Source
This commit is contained in:
Martin Preuss
2023-10-01 21:53:55 +02:00
parent 1e27223dfa
commit c57472d86e
10 changed files with 54 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
apps/aqhome-data/c_setdata.c
View File

@@ -15,7 +15,7 @@
#include "./aqhome_data_p.h"
#include "./loop.h"
#include "aqhome/ipc/data/ipc_data.h"
#include "aqhome/ipc/data/msg_data_singledata.h"
#include "aqhome/ipc/data/msg_data_multidata.h"
#include "aqhome/ipc/endpoint_ipc.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/msg_ipc_tag16.h"
@@ -46,45 +46,50 @@ static int _forwardDataToDriver(AQHOME_DATA *aqh, const AQH_VALUE *v, uint64_t t
* ------------------------------------------------------------------------------------------------
*/
void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc, const GWEN_MSG *recvdMsg)
void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc, GWEN_MSG *recvdMsg)
{
GWEN_MSG *outMsg;
int resultCode=AQH_MSG_IPC_SUCCESS;
GWEN_TAG16_LIST *tagList;
AQH_VALUE *value;
char *valueName=NULL;
uint64_t timestamp=0;
union {double f; uint64_t i;} u;
AQH_VALUE *recvdValue;
const char *valueName;
const GWEN_TAG16 *tag;
const uint64_t *dataPoints;
unsigned int numberOfPoints;
tagList=AQH_Tag16IpcMsg_ParseTags(recvdMsg, 0);
if (tagList) {
const GWEN_TAG16 *tag;
AQH_MultiDataDataIpcMsg_Parse(recvdMsg, 0);
recvdValue=AQH_MultiDataDataIpcMsg_ReadValue(recvdMsg);
valueName=recvdValue?AQH_Value_GetNameForDriver(recvdValue):NULL;
tag=AQH_Tag16IpcMsg_FindFirstTagByType(recvdMsg, AQH_MSGDATA_MULTIDATA_TAGS_DATA);
dataPoints=tag?((const uint64_t*)GWEN_Tag16_GetTagData(tag)):NULL;
numberOfPoints=(tag?GWEN_Tag16_GetTagLength(tag):0)/(2*sizeof(uint64_t));
tag=GWEN_Tag16_List_FindFirstByTagType(tagList, AQH_MSGDATA_SINGLEDATA_TAGS_NAME);
valueName=tag?GWEN_Tag16_GetTagDataAsNewString(tag, NULL):NULL;
if (numberOfPoints>0) {
AQH_VALUE *value;
tag=GWEN_Tag16_List_FindFirstByTagType(tagList, AQH_MSGDATA_SINGLEDATA_TAGS_TIME);
timestamp=tag?GWEN_Tag16_GetTagDataAsUint64(tag, 0):0;
value=AQH_Storage_GetValueByNameForSystem(aqh->storage, valueName);
if (value) {
if (AQH_Value_GetValueType(value)==AQH_ValueType_Actor) {
union {double f; uint64_t i;} u;
tag=GWEN_Tag16_List_FindFirstByTagType(tagList, AQH_MSGDATA_SINGLEDATA_TAGS_DATA);
u.i=tag?GWEN_Tag16_GetTagDataAsUint64(tag, 0):0;
}
value=AQH_Storage_GetValueByNameForSystem(aqh->storage, valueName);
if (value) {
if (AQH_Value_GetValueType(value)==AQH_ValueType_Actor) {
resultCode=_forwardDataToDriver(aqh, value, timestamp, u.f);
u.i=dataPoints[1];
resultCode=_forwardDataToDriver(aqh, value, dataPoints[0], u.f);
}
else {
DBG_INFO(NULL, "Value \"%s\" is not an actor", valueName);
resultCode=AQH_MSG_IPC_ERROR_INVALID;
}
}
else {
DBG_INFO(NULL, "Value \"%s\" is not an actor", valueName);
resultCode=AQH_MSG_IPC_ERROR_INVALID;
DBG_INFO(NULL, "No permissions to add datapoint for value \"%s\"", valueName);
resultCode=AQH_MSG_IPC_ERROR_PERMS;
}
}
else {
DBG_INFO(NULL, "Actor value \"%s\" does not exist", valueName);
resultCode=AQH_MSG_IPC_ERROR_NOTFOUND;
DBG_INFO(NULL, "No datapoints");
resultCode=AQH_MSG_IPC_ERROR_INVALID;
}
free(valueName);
AQH_Value_free(recvdValue);
outMsg=AQH_ResultIpcMsg_new(AQH_MSGTYPE_IPC_DATA_RESULT, resultCode);
GWEN_MsgEndpoint_AddSendMessage(epSrc, outMsg);
@@ -105,13 +110,7 @@ int _forwardDataToDriver(AQHOME_DATA *aqh, const AQH_VALUE *v, uint64_t timestam
GWEN_MSG *driverMsg;
DBG_INFO(AQH_LOGDOMAIN, "Sending SETDATA msg to driver endpoint (%s)", GWEN_MsgEndpoint_GetName(ep));
driverMsg=AQH_SingleDataDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA,
AQH_Value_GetNameForDriver(v),
AQH_Value_GetValueUnits(v),
AQH_Value_GetValueType(v),
NULL,
timestamp,
datapoint);
driverMsg=AQH_MultiDataDataIpcMsg_newForOne(AQH_MSGTYPE_IPC_DATA_SETDATA, v, timestamp, datapoint);
GWEN_MsgEndpoint_AddSendMessage(ep, driverMsg);
return AQH_MSG_IPC_SUCCESS;
}