avr: fully implemented router functionality in network and router app.

aqhome/msg/node/0BUILD

@@ -62,6 +62,7 @@
       m_flashend.h
       m_flashready.h
       m_flashresponse.h
+      m_range.h
     </headers>
 
 
@@ -89,6 +90,7 @@
       m_flashend.c
       m_flashready.c
       m_flashresponse.c
+      m_range.c
     </sources>
 
 

aqhome/msg/node/m_node.c

@@ -28,6 +28,7 @@
 #include "aqhome/msg/node/m_flashend.h"
 #include "aqhome/msg/node/m_flashready.h"
 #include "aqhome/msg/node/m_flashresponse.h"
+#include "aqhome/msg/node/m_range.h"
 
 #include <gwenhywfar/text.h>
 
@@ -212,6 +213,7 @@ const char *AQH_NodeMessage_MsgTypeToChar(uint8_t i)
   case AQH_MSG_TYPE_CLAIM_ADDRESS:  return "ClaimAddress";
   case AQH_MSG_TYPE_DENY_ADDRESS:   return "DenyAddress";
   case AQH_MSG_TYPE_ADDRESS_RANGE:  return "Range";
+  case AQH_MSG_TYPE_REENUM:         return "Reenum";
 
   case AQH_MSG_TYPE_FLASH_START:    return "FlashStart";
   case AQH_MSG_TYPE_FLASH_END:      return "FlashEnd";
@@ -246,6 +248,8 @@ void AQH_NodeMessage_DumpSpecificToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *d
     case AQH_MSG_TYPE_HAVE_ADDRESS:   AQH_AddrMessage_DumpToBuffer(msg, dbuf, sText); break;
     case AQH_MSG_TYPE_CLAIM_ADDRESS:  AQH_AddrMessage_DumpToBuffer(msg, dbuf, sText); break;
     case AQH_MSG_TYPE_DENY_ADDRESS:   AQH_AddrMessage_DumpToBuffer(msg, dbuf, sText); break;
+    case AQH_MSG_TYPE_ADDRESS_RANGE:  AQH_RangeMessage_DumpToBuffer(msg, dbuf, sText); break;
+    case AQH_MSG_TYPE_REENUM:         AQH_RangeMessage_DumpToBuffer(msg, dbuf, sText); break;
   
     case AQH_MSG_TYPE_FLASH_START:    AQH_FlashStartMessage_DumpToBuffer(msg, dbuf, sText); break;
     case AQH_MSG_TYPE_FLASH_END:      AQH_FlashEndMessage_DumpToBuffer(msg, dbuf, sText); break;
@@ -266,7 +270,6 @@ void AQH_NodeMessage_DumpSpecificToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *d
 
     case AQH_MSG_TYPE_DEBUG:         
     case AQH_MSG_TYPE_TWIBUSMEMBER:  
-    case AQH_MSG_TYPE_ADDRESS_RANGE: 
     default:                         AQH_NodeMessage_DumpToBuffer(msg, dbuf, sText); break;
     }
   }

aqhome/msg/node/m_node.h

@@ -40,6 +40,7 @@
 #define AQH_MSG_TYPE_CLAIM_ADDRESS  62
 #define AQH_MSG_TYPE_DENY_ADDRESS   63
 #define AQH_MSG_TYPE_ADDRESS_RANGE  64
+#define AQH_MSG_TYPE_REENUM         65
 
 #define AQH_MSG_TYPE_FLASH_START    70
 #define AQH_MSG_TYPE_FLASH_END      71

aqhome/msg/node/m_range.c

@@ -0,0 +1,61 @@
+/****************************************************************************
+ * 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/node/m_range.h"
+#include "aqhome/msg/node/m_node.h"
+
+#include <gwenhywfar/debug.h>
+
+
+#define AQH_MSG_OFFS_RANGE_UID         0   /* 4 bytes */
+#define AQH_MSG_OFFS_RANGE_BEGIN       4   /* 1 bytes */
+#define AQH_MSG_OFFS_RANGE_END         5   /* 1 bytes */
+
+
+
+uint32_t AQH_RangeMessage_GetUid(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint32At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RANGE_UID, 0);
+}
+
+
+
+uint8_t AQH_RangeMessage_GetRangeBegin(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RANGE_BEGIN, 0);
+}
+
+
+
+uint8_t AQH_RangeMessage_GetRangeEnd(const AQH_MESSAGE *msg)
+{
+  return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_RANGE_END, 0);
+}
+
+
+
+void AQH_RangeMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText)
+{
+  GWEN_Buffer_AppendArgs(dbuf,
+                         "0x%02x->0x%02x: RANGE(%s) %s (uid=0x%08x, begin=0x%x, end=0x%x)\n",
+                         AQH_NodeMessage_GetSourceAddress(msg),
+                         AQH_NodeMessage_GetDestAddress(msg),
+                         AQH_NodeMessage_MsgTypeToChar(AQH_NodeMessage_GetMsgType(msg)),
+                         sText,
+                         (unsigned int) AQH_RangeMessage_GetUid(msg),
+                         AQH_RangeMessage_GetRangeBegin(msg),
+                         AQH_RangeMessage_GetRangeEnd(msg));
+}
+
+

aqhome/msg/node/m_range.h

@@ -0,0 +1,30 @@
+/****************************************************************************
+ * 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.
+ ****************************************************************************/
+
+#ifndef AQH_M_RANGE_H
+#define AQH_M_RANGE_H
+
+
+#include <aqhome/api.h>
+#include <aqhome/ipc2/message.h>
+
+#include <gwenhywfar/debug.h>
+
+
+/* This message is used for message types ClaimAddr, DenyAddr, HaveAddr */
+
+AQHOME_API uint32_t AQH_RangeMessage_GetUid(const AQH_MESSAGE *msg);
+AQHOME_API uint8_t AQH_RangeMessage_GetAddr(const AQH_MESSAGE *msg);
+AQHOME_API uint8_t AQH_RangeMessage_GetRangeBegin(const AQH_MESSAGE *msg);
+AQHOME_API uint8_t AQH_RangeMessage_GetRangeEnd(const AQH_MESSAGE *msg);
+
+AQHOME_API void AQH_RangeMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText);
+
+
+
+#endif