implemented ipc messages getdevices req/rsp

aqhome/ipc/0BUILD

@@ -53,7 +53,10 @@
       msg_ipc_forward.h
       msg_ipc_value.h
       msg_ipc_ping.h
+      msg_ipc_error.h
       msg_ipc_setaccmsggrps.h
+      msg_ipc_getdevices_req.h
+      msg_ipc_getdevices_rsp.h
     </headers>
 
 
@@ -71,7 +74,10 @@
       msg_ipc_forward.c
       msg_ipc_value.c
       msg_ipc_ping.c
+      msg_ipc_error.c
       msg_ipc_setaccmsggrps.c
+      msg_ipc_getdevices_req.c
+      msg_ipc_getdevices_rsp.c
     </sources>
 
 

aqhome/ipc/msg_ipc.h

@@ -24,6 +24,10 @@
 #define AQH_MSGTYPE_IPC_VALUE          0x200
 #define AQH_MSGTYPE_IPC_PING           0x300
 #define AQH_MSGTYPE_IPC_SETACCMSGGRPS  0x400
+#define AQH_MSGTYPE_IPC_GETDEVICES_REQ 0x500
+#define AQH_MSGTYPE_IPC_GETDEVICES_RSP 0x600
+#define AQH_MSGTYPE_IPC_ERROR          0x700
+
 
 
 

aqhome/ipc/msg_ipc_error.c

@@ -0,0 +1,74 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 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/ipc/msg_ipc_error.h>
+
+#include <gwenhywfar/msg.h>
+#include <gwenhywfar/buffer.h>
+
+#include <gwenhywfar/misc.h>
+#include <gwenhywfar/list.h>
+#include <gwenhywfar/error.h>
+#include <gwenhywfar/debug.h>
+#include <gwenhywfar/text.h>
+#include <gwenhywfar/msg_ipc.h>
+
+
+#define AQH_MSGIPC_ERROR_OFFS_ERRORCODE   0   /* 2 bytes */
+
+#define AQH_MSGIPC_ERROR_MINSIZE          (GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_ERROR_OFFS_ERRORCODE+2)
+
+
+
+
+GWEN_MSG *AQH_ErrorIpcMsg_new(uint16_t code, uint16_t errorCode)
+{
+  GWEN_MSG *msg;
+  uint8_t *ptr;
+
+  msg=GWEN_IpcMsg_new(AQH_IPC_PROTOCOL_ID, AQH_IPC_PROTOCOL_VERSION, code, AQH_MSGIPC_ERROR_MINSIZE, NULL);
+  ptr=GWEN_Msg_GetBuffer(msg);
+  ptr[GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_ERROR_OFFS_ERRORCODE+0]=errorCode & 0xff;
+  ptr[GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_ERROR_OFFS_ERRORCODE+1]=errorCode & 0xff;
+
+  return msg;
+}
+
+
+
+uint16_t AQH_ErrorIpcMsg_GetErrorCode(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint16At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_ERROR_OFFS_ERRORCODE, 0);
+}
+
+
+
+
+
+void AQH_ErrorIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
+{
+  if (GWEN_Msg_GetBytesInBuffer(msg)>=AQH_MSGIPC_ERROR_MINSIZE) {
+    GWEN_Buffer_AppendArgs(dbuf,
+                           "ERROR (code=%d, proto=%d, proto version=%d, error=%d)\n",
+                           GWEN_IpcMsg_GetCode(msg),
+                           GWEN_IpcMsg_GetProtoId(msg),
+                           GWEN_IpcMsg_GetProtoVersion(msg),
+                           AQH_ErrorIpcMsg_GetErrorCode(msg));
+  }
+}
+
+
+
+
+
+
+

aqhome/ipc/msg_ipc_error.h

@@ -0,0 +1,33 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 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.
+ ****************************************************************************/
+
+#ifndef AQH_MSG_IPC_ERROR_H
+#define AQH_MSG_IPC_ERROR_H
+
+
+#include <aqhome/api.h>
+#include <aqhome/ipc/msg_ipc.h>
+#include <aqhome/msg/msg_node.h>
+
+#include <gwenhywfar/msg.h>
+#include <gwenhywfar/buffer.h>
+
+
+#define AQH_MSG_IPC_ERROR_OK     0
+#define AQH_MSG_IPC_ERROR_NODATA 1
+
+
+AQHOME_API GWEN_MSG *AQH_ErrorIpcMsg_new(uint16_t code, uint16_t errorCode);
+AQHOME_API uint16_t AQH_ErrorIpcMsg_GetErrorCode(const GWEN_MSG *msg);
+AQHOME_API void AQH_ErrorIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
+
+
+#endif
+
+
+

aqhome/ipc/msg_ipc_getdevices_req.c

@@ -0,0 +1,52 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 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/ipc/msg_ipc_getdevices_req.h>
+
+#include <gwenhywfar/msg.h>
+#include <gwenhywfar/buffer.h>
+
+#include <gwenhywfar/misc.h>
+#include <gwenhywfar/list.h>
+#include <gwenhywfar/error.h>
+#include <gwenhywfar/debug.h>
+#include <gwenhywfar/text.h>
+#include <gwenhywfar/msg_ipc.h>
+
+
+#define AQH_MSGIPC_GETDEVICES_REQ_MINSIZE          (GWEN_MSGIPC_OFFS_PAYLOAD)
+
+
+
+
+GWEN_MSG *AQH_GetDevicesRequestIpcMsg_new(uint16_t code)
+{
+  return GWEN_IpcMsg_new(AQH_IPC_PROTOCOL_ID, AQH_IPC_PROTOCOL_VERSION, code, AQH_MSGIPC_GETDEVICES_REQ_MINSIZE, NULL);
+}
+
+
+
+void AQH_GetDevicesRequestIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
+{
+  if (GWEN_Msg_GetBytesInBuffer(msg)>=AQH_MSGIPC_GETDEVICES_REQ_MINSIZE) {
+    GWEN_Buffer_AppendArgs(dbuf,
+                           "GET_DEVICES REQ (code=%d, proto=%d, proto version=%d)\n",
+                           GWEN_IpcMsg_GetCode(msg),
+                           GWEN_IpcMsg_GetProtoId(msg),
+                           GWEN_IpcMsg_GetProtoVersion(msg));
+  }
+}
+
+
+
+
+

aqhome/ipc/msg_ipc_getdevices_req.h

@@ -0,0 +1,27 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 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.
+ ****************************************************************************/
+
+#ifndef AQH_MSGIPC_GETDEVICES_REQ_H
+#define AQH_MSGIPC_GETDEVICES_REQ_H
+
+
+#include <aqhome/api.h>
+#include <aqhome/ipc/msg_ipc.h>
+
+#include <gwenhywfar/msg.h>
+#include <gwenhywfar/buffer.h>
+
+
+AQHOME_API GWEN_MSG *AQH_GetDevicesRequestIpcMsg_new(uint16_t code);
+
+AQHOME_API void AQH_GetDevicesRequestIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
+
+
+
+#endif
+

aqhome/ipc/msg_ipc_getdevices_rsp.c

@@ -0,0 +1,162 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 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/ipc/msg_ipc_getdevices_rsp.h>
+
+#include <gwenhywfar/msg.h>
+#include <gwenhywfar/buffer.h>
+
+#include <gwenhywfar/misc.h>
+#include <gwenhywfar/list.h>
+#include <gwenhywfar/error.h>
+#include <gwenhywfar/debug.h>
+#include <gwenhywfar/text.h>
+#include <gwenhywfar/msg_ipc.h>
+
+
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_FLAGS     0   /* 1 bytes */
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_BUSADDR   1   /* 1 bytes */
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_UID       2   /* 4 bytes */
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_FWTYPE    6   /* 2 bytes */
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_FWVER     8   /* 2 bytes */
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_MODULES  10   /* 2 bytes */
+#define AQH_MSGIPC_GETDEVICES_RSP_OFFS_LASTCHG  12   /* 8 bytes */
+
+
+#define AQH_MSGIPC_GETDEVICES_RSP_MINSIZE          (GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_LASTCHG+8)
+
+
+
+
+GWEN_MSG *AQH_GetDevicesResponseIpcMsg_new(uint16_t code, uint8_t flags, const AQH_NODE_INFO *ni)
+{
+  GWEN_MSG *msg;
+  uint8_t *ptr;
+  uint32_t u32;
+  uint64_t u64=0;
+  const GWEN_TIMESTAMP *t;
+
+  msg=GWEN_IpcMsg_new(AQH_IPC_PROTOCOL_ID, AQH_IPC_PROTOCOL_VERSION, code, AQH_MSGIPC_GETDEVICES_RSP_MINSIZE, NULL);
+  ptr=GWEN_Msg_GetBuffer(msg)+GWEN_MSGIPC_OFFS_PAYLOAD;
+
+  *(ptr++)=flags & 0xff;
+
+  *(ptr++)=AQH_NodeInfo_GetBusAddress(ni);
+
+  u32=AQH_NodeInfo_GetUid(ni);
+  *(ptr++)=u32 & 0xff;
+  *(ptr++)=(u32>>8) & 0xff;
+  *(ptr++)=(u32>>16) & 0xff;
+  *(ptr++)=(u32>>24) & 0xff;
+
+  u32=AQH_NodeInfo_GetFirmwareType(ni);
+  *(ptr++)=u32 & 0xff;
+  *(ptr++)=(u32>>8) & 0xff;
+
+  u32=AQH_NodeInfo_GetFirmwareVersion(ni);
+  *(ptr++)=u32 & 0xff;
+  *(ptr++)=(u32>>8) & 0xff;
+
+  u32=AQH_NodeInfo_GetModules(ni);
+  *(ptr++)=u32 & 0xff;
+  *(ptr++)=(u32>>8) & 0xff;
+
+  t=AQH_NodeInfo_GetTimestampLastChange(ni);
+  if (t)
+    u64=(uint64_t)GWEN_Timestamp_toInt64(t);
+  *(ptr++)=u64 & 0xff;
+  *(ptr++)=(u64>>8) & 0xff;
+  *(ptr++)=(u64>>16) & 0xff;
+  *(ptr++)=(u64>>24) & 0xff;
+  *(ptr++)=(u64>>32) & 0xff;
+  *(ptr++)=(u64>>40) & 0xff;
+  *(ptr++)=(u64>>48) & 0xff;
+  *(ptr++)=(u64>>56) & 0xff;
+
+  return msg;
+}
+
+
+
+uint8_t AQH_GetDevicesResponseIpcMsg_GetFlags(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint8At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_FLAGS, 0);
+}
+
+
+
+uint8_t AQH_GetDevicesResponseIpcMsg_GetBusAddress(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint16At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_BUSADDR, 0);
+}
+
+
+
+uint32_t AQH_GetDevicesResponseIpcMsg_GetUid(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint32At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_UID, 0);
+}
+
+
+
+uint16_t AQH_GetDevicesResponseIpcMsg_GetFirmwareType(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint16At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_FWTYPE, 0);
+}
+
+
+
+uint16_t AQH_GetDevicesResponseIpcMsg_GetFirmwareVersion(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint16At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_FWVER, 0);
+}
+
+
+
+uint16_t AQH_GetDevicesResponseIpcMsg_GetModules(const GWEN_MSG *msg)
+{
+  return GWEN_Msg_GetUint16At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_MODULES, 0);
+}
+
+
+
+int64_t AQH_GetDevicesResponseIpcMsg_GetTimestamp(const GWEN_MSG *msg)
+{
+  uint64_t v;
+
+  v=(uint64_t) GWEN_Msg_GetUint32At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_LASTCHG, 0);
+  v|=((uint64_t)GWEN_Msg_GetUint32At(msg, GWEN_MSGIPC_OFFS_PAYLOAD+AQH_MSGIPC_GETDEVICES_RSP_OFFS_LASTCHG+4, 0))<<32;
+  return (int64_t) v;
+}
+
+
+
+void AQH_GetDevicesResponseIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
+{
+  if (GWEN_Msg_GetBytesInBuffer(msg)>=AQH_MSGIPC_GETDEVICES_RSP_MINSIZE) {
+    GWEN_Buffer_AppendArgs(dbuf,
+                           "GET_DEVICES_RSP (code=%d, proto=%d, proto version=%d, uid=0x%08x, bus addr=0x%02x, flags=0x%02x)\n",
+                           GWEN_IpcMsg_GetCode(msg),
+                           GWEN_IpcMsg_GetProtoId(msg),
+                           GWEN_IpcMsg_GetProtoVersion(msg),
+                           (unsigned int) AQH_GetDevicesResponseIpcMsg_GetUid(msg),
+                           AQH_GetDevicesResponseIpcMsg_GetBusAddress(msg),
+                           AQH_GetDevicesResponseIpcMsg_GetFlags(msg));
+  }
+}
+
+
+
+
+
+
+

aqhome/ipc/msg_ipc_getdevices_rsp.h

@@ -0,0 +1,40 @@
+/****************************************************************************
+ * This file is part of the project AqHome.
+ * AqHome (c) by 2023 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.
+ ****************************************************************************/
+
+#ifndef AQH_MSGIPC_GETDEVICES_RSP_H
+#define AQH_MSGIPC_GETDEVICES_RSP_H
+
+
+#include <aqhome/api.h>
+#include <aqhome/ipc/msg_ipc.h>
+#include <aqhome/nodes/nodeinfo.h>
+
+#include <gwenhywfar/msg.h>
+#include <gwenhywfar/buffer.h>
+
+
+#define AQH_MSGIPC_GETDEVICES_RSP_FLAGS_LAST 0x01
+
+
+AQHOME_API GWEN_MSG *AQH_GetDevicesResponseIpcMsg_new(uint16_t code, uint8_t flags, const AQH_NODE_INFO *ni);
+
+AQHOME_API uint8_t AQH_GetDevicesResponseIpcMsg_GetFlags(const GWEN_MSG *msg);
+AQHOME_API uint8_t AQH_GetDevicesResponseIpcMsg_GetBusAddress(const GWEN_MSG *msg);
+
+AQHOME_API uint32_t AQH_GetDevicesResponseIpcMsg_GetUid(const GWEN_MSG *msg);
+AQHOME_API uint16_t AQH_GetDevicesResponseIpcMsg_GetFirmwareType(const GWEN_MSG *msg);
+AQHOME_API uint16_t AQH_GetDevicesResponseIpcMsg_GetFirmwareVersion(const GWEN_MSG *msg);
+AQHOME_API uint16_t AQH_GetDevicesResponseIpcMsg_GetModules(const GWEN_MSG *msg);
+AQHOME_API int64_t AQH_GetDevicesResponseIpcMsg_GetTimestamp(const GWEN_MSG *msg);
+
+AQHOME_API void AQH_GetDevicesResponseIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
+
+
+
+#endif
+

aqhome/ipc/msg_ipc_value.h

@@ -32,6 +32,8 @@ AQHOME_API int16_t AQH_ValueIpcMsg_GetValueNom(const GWEN_MSG *msg);
 AQHOME_API int16_t AQH_ValueIpcMsg_GetValueDenom(const GWEN_MSG *msg);
 AQHOME_API double AQH_ValueIpcMsg_GetValueAsDouble(const GWEN_MSG *msg);
 
+AQHOME_API void AQH_ValueIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);
+
 
 #endif