From 033b7cd4db821b021ae3790e7c31191574bbcf8a Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Wed, 25 Jun 2025 00:02:32 +0200 Subject: [PATCH] getvalues: allow for filtering value list on server. --- apps/aqhome-tool/data/getvalues.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/apps/aqhome-tool/data/getvalues.c b/apps/aqhome-tool/data/getvalues.c index c91d0ea..7af66a3 100644 --- a/apps/aqhome-tool/data/getvalues.c +++ b/apps/aqhome-tool/data/getvalues.c @@ -14,10 +14,12 @@ #include "../client.h" #include "../utils.h" +#include "aqhome/aqhome.h" #include "aqhome/msg/ipc/m_ipc.h" #include "aqhome/msg/ipc/m_ipc_result.h" #include "aqhome/msg/ipc/data/m_ipcd.h" #include "aqhome/msg/ipc/data/m_ipcd_values.h" +#include "aqhome/msg/ipc/data/m_ipcd_getvalues.h" #include #include @@ -67,6 +69,8 @@ int AQH_Tool_GetValues(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv) { A_ARG, A_INT, "timeout", 0, 1, "T", NULL, I18S("Specify timeout in seconds for response"), NULL}, { A_ARG, A_CHAR, "brokerClientId", 0, 1, "c", "clientid", I18S("Specify CLIENTID"), NULL}, { A_ARG, A_CHAR, "userId", 0, 1, "u", "userid", I18S("Specify user id"), NULL}, + { A_ARG, A_CHAR, "device", 0, 1, "d", "device", I18S("device name to match"), NULL}, + { A_ARG, A_CHAR, "modality", 0, 1, "m", NULL, I18S("Modality to match"), NULL}, { A_ARG, A_CHAR, "password", 0, 1, "p", "password", I18S("Specify service password"), NULL}, { 0, A_INT, "printHeader", 0, 1, "H", "printheader", I18S("Print header if given"), NULL}, { A_END, A_INT, "help", 0, 0, "h", "help", I18S("Show this help screen"), NULL} @@ -90,11 +94,23 @@ int AQH_Tool_GetValues(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv) AQH_MESSAGE *_createRequestMessage(GWEN_UNUSED AQH_OBJECT *o, uint32_t msgId) { - return AQH_IpcMessage_new(AQH_IPC_PROTOCOL_DATA_ID, - AQH_IPC_PROTOCOL_DATA_VERSION, - AQH_MSGTYPE_IPC_DATA_GETVALUES_REQ, - msgId, 0, - 0, NULL); + GWEN_DB_NODE *dbArgs; + const char *deviceName; + const char *s; + int modality; + + dbArgs=AQH_ToolClient_GetDbLocalArgs(o); + deviceName=GWEN_DB_GetCharValue(dbArgs, "device", 0, NULL); + s=GWEN_DB_GetCharValue(dbArgs, "modality", 0, NULL); + if (s && *s) { + modality=AQH_ValueModality_fromString(s); + if (modality==AQH_ValueModality_Unknown) { + } + } + else + modality=AQH_ValueModality_Unknown; + + return AQH_IpcdMessageGetValues_new(AQH_MSGTYPE_IPC_DATA_GETVALUES_REQ, msgId, 0, deviceName, modality); }