extended memstats message and handling.

avr/modules/network/msg/0BUILD

@@ -12,6 +12,7 @@
     debug-w.asm
     device-w.asm
     memstats-w.asm
+    memstats-d.asm
     pong-w.asm
     range-d.asm
     range-r.asm

avr/modules/network/msg/memstats-d.asm

@@ -0,0 +1,27 @@
+; ***************************************************************************
+; copyright   : (C) 2026 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_MODULES_NETWORK_MSG_MEMSTATS_D_ASM
+#define AQH_AVR_MODULES_NETWORK_MSG_MEMSTATS_D_ASM
+
+
+.equ NETMSG_MEMSTATS_OFFS_UID         = NETMSG_OFFS_PAYLOAD
+.equ NETMSG_MEMSTATS_OFFS_TIMESTAMP   = NETMSG_OFFS_PAYLOAD+4
+.equ NETMSG_MEMSTATS_OFFS_STACKUSED   = NETMSG_OFFS_PAYLOAD+8
+.equ NETMSG_MEMSTATS_OFFS_CURRBUFUSED = NETMSG_OFFS_PAYLOAD+10
+.equ NETMSG_MEMSTATS_OFFS_MAXBUFUSED  = NETMSG_OFFS_PAYLOAD+11
+.equ NETMSG_MEMSTATS_OFFS_NOBUFERRORS = NETMSG_OFFS_PAYLOAD+12
+.equ NETMSG_MEMSTATS_OFFS_HEAPUSED    = NETMSG_OFFS_PAYLOAD+14
+.equ NETMSG_MEMSTATS_OFFS_HEAPFREE    = NETMSG_OFFS_PAYLOAD+16
+.equ NETMSG_MEMSTATS_OFFS_XRAMSIZE    = NETMSG_OFFS_PAYLOAD+18
+.equ NETMSG_MEMSTATS_SIZE             = NETMSG_OFFS_PAYLOAD+20
+
+
+#endif
+

avr/modules/network/msg/memstats-w.asm

@@ -7,6 +7,9 @@
 ; * Please see toplevel file COPYING of that project for license details.   *
 ; ***************************************************************************
 
+#ifndef AQH_AVR_MODULES_NETWORK_MSG_MEMSTATS_W_ASM
+#define AQH_AVR_MODULES_NETWORK_MSG_MEMSTATS_W_ASM
+
 
 
 ; ---------------------------------------------------------------------------
@@ -19,7 +22,7 @@
 NETMSG_MemStats_Write:
   ldi r16, 0xff
   st X+, r16                          ; dest address
-  ldi r16, 16                         ; msg code+src address+14 payload bytes
+  ldi r16, (NETMSG_MEMSTATS_SIZE-2)
   st X+, r16                          ; msg len
   ldi r16, NETMSG_CMD_MEMSTATS
   st X+, r16                          ; msg code
@@ -28,35 +31,32 @@ NETMSG_MemStats_Write:
 
   ; uid
   bigcall NETMSG_Common_AddUidToBuffer  ; (R16, R18, R19, R20, R21)
-  ; timestamp (0 for now)
+  ; timestamp
+#ifdef MODULES_CLOCK
+  lds r16, clockModuleCounterHours
+  st X+, r16
+  lds r16, clockModuleCounterMins
+  st X+, r16
+  lds r16, clockModuleCounterSecs
+  st X+, r16
+  lds r16, clockModuleTickCounter
+  st X+, r16
+#else
   clr r16
   st X+, r16
   st X+, r16
   st X+, r16
   st X+, r16
+#endif
   ; stack used
-.ifdef MODULES_XRAM
-  lds r20, xramLastAddress
-  lds r21, xramLastAddress+1
+  ldi r20, LOW(RAMEND)
+  ldi r21, HIGH(RAMEND)
+  in r17, SPL
+  sub r20, r17
   st X+, r20
+  in r17, SPH
+  sbc r21, r17
   st X+, r21
-.else
-  .ifdef MODULES_HEAP
-    lds r20, heapFree
-    lds r21, heapFree+1
-    st X+, r20
-    st X+, r21
-  .else
-    ldi r20, LOW(RAMEND)
-    ldi r21, HIGH(RAMEND)
-    in r17, SPL
-    sub r20, r17
-    st X+, r20
-    in r17, SPH
-    sbc r21, r17
-    st X+, r21
-  .endif
-.endif
   ; current buffers used
   lds r16, netBuffersUsed
   st X+, r16
@@ -69,11 +69,46 @@ NETMSG_MemStats_Write:
   ldd r16, Y+NET_IFACE_OFFS_ERR_NOBUF_HIGH
   st X+, r16
 
-  sbiw xh:xl, 18 ; go back to beginning of message (1 byte dst addr, 1 byte length, 16 bytes payload)
+; heap
+#ifdef MODULES_HEAP
+    ; heap used
+    lds r20, heapUsed
+    lds r21, heapUsed+1
+    st X+, r20
+    st X+, r21
+    ; heap free
+    lds r20, heapFree
+    lds r21, heapFree+1
+    st X+, r20
+    st X+, r21
+#else
+  clr r16
+  st X+, r16
+  st X+, r16
+  st X+, r16
+  st X+, r16
+#endif
+
+; XRAM
+#ifdef MODULES_XRAM
+  lds r20, xramLastAddress
+  lds r21, xramLastAddress+1
+  st X+, r20
+  st X+, r21
+#else
+  clr r16
+  st X+, r16
+  st X+, r16
+#endif
+
+  sbiw xh:xl, NETMSG_MEMSTATS_SIZE      ; go back to beginning of message
   bigcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
-  sbiw xh:xl, 19 ; go back to beginning of message (1 byte dst addr, 1 byte length, 16 bytes payload, 1 byte crc)
+  sbiw xh:xl, (NETMSG_MEMSTATS_SIZE+1)  ; go back to beginning of message
   ret
 ; @end
 
 
 
+#endif
+
+