martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extended memstats message and handling.

Browse Source
This commit is contained in:
Martin Preuss
2026-03-17 00:00:38 +01:00
parent e6aeaabb32
commit 8085043ef6
6 changed files with 162 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
aqhome/msg/node/m_memstats.c
View File

@@ -20,11 +20,18 @@
#define AQH_MSG_OFFS_MEMSTATS_UID 0 /* 4 bytes */
#define AQH_MSG_OFFS_MEMSTATS_SECONDS 4 /* 4 bytes */
#define AQH_MSG_OFFS_MEMSTATS_UPHOURS 4 /* 1 byte */
#define AQH_MSG_OFFS_MEMSTATS_UPMINS 5 /* 1 byte */
#define AQH_MSG_OFFS_MEMSTATS_UPSECS 6 /* 1 byte */
#define AQH_MSG_OFFS_MEMSTATS_UPTICKS 7 /* 1 byte */
#define AQH_MSG_OFFS_MEMSTATS_STACKUSAGE 8 /* 2 bytes */
#define AQH_MSG_OFFS_MEMSTATS_BUFFERSUSED 10 /* 1 byte */
#define AQH_MSG_OFFS_MEMSTATS_MAXBUFFERSUSED 11 /* 1 byte */
#define AQH_MSG_OFFS_MEMSTATS_RECVNOBUFFER 12 /* 2 bytes */
#define AQH_MSG_OFFS_MEMSTATS_HEAPUSED 14 /* 2 bytes */
#define AQH_MSG_OFFS_MEMSTATS_HEAPFREE 16 /* 2 bytes */
#define AQH_MSG_OFFS_MEMSTATS_XRAMSIZE 18 /* 2 bytes */
@@ -35,12 +42,34 @@ uint32_t AQH_MemStatsMessage_GetUid(const AQH_MESSAGE *msg)
uint32_t AQH_MemStatsMessage_GetSeconds(const AQH_MESSAGE *msg)
uint8_t AQH_MemStatsMessage_GetUptimeHours(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint32At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_SECONDS, 0);
return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_UPHOURS, 0);
}
uint8_t AQH_MemStatsMessage_GetUptimeMinutes(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_UPMINS, 0);
}
uint8_t AQH_MemStatsMessage_GetUptimeSeconds(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_UPSECS, 0);
}
uint8_t AQH_MemStatsMessage_GetUptimeTicks(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_UPTICKS, 0);
}
uint16_t AQH_MemStatsMessage_GetStackUsage(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_STACKUSAGE, 0);
@@ -69,20 +98,49 @@ uint16_t AQH_MemStatsMessage_GetRecvNoBufferErrors(const AQH_MESSAGE *msg)
uint16_t AQH_MemStatsMessage_GetHeapUsed(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_HEAPUSED, 0);
}
uint16_t AQH_MemStatsMessage_GetHeapFree(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_HEAPFREE, 0);
}
uint16_t AQH_MemStatsMessage_GetXramSize(const AQH_MESSAGE *msg)
{
return AQH_Message_ReadUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_MEMSTATS_XRAMSIZE, 0);
}
void AQH_MemStatsMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText)
{
GWEN_Buffer_AppendArgs(dbuf,
"0x%02x->0x%02x: MEMSTATS(%s) %s (uid=0x%08x, uptime=%d, stack used=%d, buffers used=%d(max=%d), no recvbuf=%d)\n",
"0x%02x->0x%02x: MEMSTATS(%s) %s (uid=0x%08x, up=%dh:%dm:%ds:%dt, "
"stack used=%d, buffers used=%d(max=%d), no recvbuf=%d, "
"heap used=%d, heap free=%d, xram=%d)\n",
AQH_NodeMessage_GetSourceAddress(msg),
AQH_NodeMessage_GetDestAddress(msg),
AQH_NodeMessage_MsgTypeToChar(AQH_NodeMessage_GetMsgType(msg)),
sText,
(unsigned int) AQH_MemStatsMessage_GetUid(msg),
AQH_MemStatsMessage_GetSeconds(msg),
AQH_MemStatsMessage_GetUptimeHours(msg),
AQH_MemStatsMessage_GetUptimeMinutes(msg),
AQH_MemStatsMessage_GetUptimeSeconds(msg),
AQH_MemStatsMessage_GetUptimeTicks(msg),
AQH_MemStatsMessage_GetStackUsage(msg),
AQH_MemStatsMessage_GetBuffersUsed(msg),
AQH_MemStatsMessage_GetMaxBuffersUsed(msg),
AQH_MemStatsMessage_GetRecvNoBufferErrors(msg));
AQH_MemStatsMessage_GetRecvNoBufferErrors(msg),
AQH_MemStatsMessage_GetHeapUsed(msg),
AQH_MemStatsMessage_GetHeapFree(msg),
AQH_MemStatsMessage_GetXramSize(msg));
}

8
aqhome/msg/node/m_memstats.h
View File

@@ -17,11 +17,17 @@
AQHOME_API uint32_t AQH_MemStatsMessage_GetUid(const AQH_MESSAGE *msg);
AQHOME_API uint32_t AQH_MemStatsMessage_GetSeconds(const AQH_MESSAGE *msg);
AQHOME_API uint8_t AQH_MemStatsMessage_GetUptimeHours(const AQH_MESSAGE *msg);
AQHOME_API uint8_t AQH_MemStatsMessage_GetUptimeMinutes(const AQH_MESSAGE *msg);
AQHOME_API uint8_t AQH_MemStatsMessage_GetUptimeSeconds(const AQH_MESSAGE *msg);
AQHOME_API uint8_t AQH_MemStatsMessage_GetUptimeTicks(const AQH_MESSAGE *msg);
AQHOME_API uint16_t AQH_MemStatsMessage_GetStackUsage(const AQH_MESSAGE *msg);
AQHOME_API uint8_t AQH_MemStatsMessage_GetBuffersUsed(const AQH_MESSAGE *msg);
AQHOME_API uint8_t AQH_MemStatsMessage_GetMaxBuffersUsed(const AQH_MESSAGE *msg);
AQHOME_API uint16_t AQH_MemStatsMessage_GetRecvNoBufferErrors(const AQH_MESSAGE *msg);
AQHOME_API uint16_t AQH_MemStatsMessage_GetHeapUsed(const AQH_MESSAGE *msg);
AQHOME_API uint16_t AQH_MemStatsMessage_GetHeapFree(const AQH_MESSAGE *msg);
AQHOME_API uint16_t AQH_MemStatsMessage_GetXramSize(const AQH_MESSAGE *msg);
AQHOME_API void AQH_MemStatsMessage_DumpToBuffer(const AQH_MESSAGE *msg, GWEN_BUFFER *dbuf, const char *sText);

1
avr/devices/all/apps_include.asm
View File

@@ -79,6 +79,7 @@
.include "apps/network/stats.asm"
.include "modules/network/msg/sendstats-w.asm"
.include "modules/network/msg/recvstats-w.asm"
.include "modules/network/msg/memstats-d.asm"
.include "modules/network/msg/memstats-w.asm"
.include "modules/network/msg/device-w.asm"
#endif

1
avr/modules/network/msg/0BUILD
View File

@@ -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

27
avr/modules/network/msg/memstats-d.asm Normal file
View File

@@ -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

71
avr/modules/network/msg/memstats-w.asm
View File

@@ -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,25 +31,24 @@ 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
st X+, r20
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
@@ -55,8 +57,6 @@ NETMSG_MemStats_Write:
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