aqhome: started rewriting message code, start using new event2 lib.

2025-02-25 01:13:07 +01:00
parent f1f24168e5
commit cf8edbbd5f
58 changed files with 5393 additions and 163 deletions
--- a/aqhome/msg/ipc/data/m_ipcd_values.c
+++ b/aqhome/msg/ipc/data/m_ipcd_values.c
@@ -0,0 +1,119 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2025 Martin Preuss, all rights reserved.
+ *
+ * The license for this file can be found in the file COPYING which you
+ * should have received along with this file.
+ ****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
+#include "aqhome/msg/ipc/data/m_ipcd_values.h"
+#include "aqhome/msg/ipc/m_ipc_tag16.h"
+#include "aqhome/msg/ipc/data/m_ipcd.h"
+#include "aqhome/msg/ipc/m_ipc.h"
+
+#include <gwenhywfar/text.h>
+#include <gwenhywfar/tag16.h>
+#include <gwenhywfar/buffer.h>
+#include <gwenhywfar/debug.h>
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * forward declarations
+ * ------------------------------------------------------------------------------------------------
+ */
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * implementation
+ * ------------------------------------------------------------------------------------------------
+ */
+
+AQH_MESSAGE *AQH_IpcdMessageValues_new(uint16_t code, uint32_t msgId, uint32_t refMsgId,
+                                       uint32_t flags, const AQH_VALUE_LIST *valueList)
+{
+  AQH_MESSAGE *msg;
+  GWEN_BUFFER *buf;
+  int rv;
+
+  buf=GWEN_Buffer_new(0, 256, 0, 1);
+  GWEN_Tag16_WriteUint32TagToBuffer(AQH_MSGDATA_VALUES_TAGS_FLAGS, flags, buf);
+  rv=AQH_Tag16_WriteValueListAsTagsToBuffer(AQH_MSGDATA_VALUES_TAGS_VALUE, valueList, buf);
+  if (rv<0) {
+    DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
+    GWEN_Buffer_free(buf);
+    return NULL;
+  }
+
+  msg=AQH_IpcMessage_new(AQH_IPC_PROTOCOL_DATA_ID, AQH_IPC_PROTOCOL_DATA_VERSION, code, msgId, refMsgId,
+                         GWEN_Buffer_GetUsedBytes(buf), (const uint8_t*) GWEN_Buffer_GetStart(buf));
+  GWEN_Buffer_free(buf);
+  return msg;
+}
+
+
+
+AQH_VALUE_LIST *AQH_IpcdMessageDevices_ReadValueList(const GWEN_TAG16_LIST *tagList)
+{
+  if (tagList) {
+    AQH_VALUE_LIST *valueList;
+
+    valueList=AQH_Tag16_ReadValuesFromTagList(tagList, AQH_MSGDATA_VALUES_TAGS_VALUE);
+    if (valueList==NULL) {
+      DBG_INFO(AQH_LOGDOMAIN, "No value list received");
+    }
+    return valueList;
+  }
+  return NULL;
+}
+
+
+
+AQH_VALUE *AQH_IpcdMessageValues_ReadFirstValue(const GWEN_TAG16_LIST *tagList)
+{
+  if (tagList) {
+    AQH_VALUE *value;
+
+    value=AQH_Tag16_ReadValueFromTagList(tagList, AQH_MSGDATA_VALUES_TAGS_VALUE);
+    if (value==NULL) {
+      DBG_INFO(AQH_LOGDOMAIN, "No value received");
+    }
+    return value;
+  }
+  return NULL;
+}
+
+
+
+uint32_t AQH_IpcdMessageValues_GetFlags(const GWEN_TAG16_LIST *tagList)
+{
+  return tagList?AQH_Tag16_GetTagDataAsUint32(tagList, AQH_MSGDATA_VALUES_TAGS_FLAGS, 0):0;
+}
+
+
+
+void AQH_IpcdMessageValues_DumpToBuffer(const AQH_MESSAGE *msg, const GWEN_TAG16_LIST *tagList,
+                                        GWEN_BUFFER *dbuf, const char *sText)
+{
+  uint32_t flags;
+
+  flags=AQH_IpcdMessageValues_GetFlags(tagList);
+  GWEN_Buffer_AppendArgs(dbuf,
+                         "VALUES(%s) %s (code=%d, proto=%d, proto version=%d, flags=0x%08x)\n",
+                         AQH_IpcdMessage_MsgTypeToChar(AQH_IpcMessage_GetCode(msg)),
+                         sText?sText:"",
+                         AQH_IpcMessage_GetCode(msg),
+                         AQH_IpcMessage_GetProtoId(msg),
+                         AQH_IpcMessage_GetProtoVersion(msg),
+                         (unsigned int) flags);
+}
+
+
+
+