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

aqhome: adapted to latest changes in node firmware.

Browse Source
This commit is contained in:
Martin Preuss
2024-09-06 22:51:32 +02:00
parent 2fa3e9d4ab
commit 9b724d5a5f
16 changed files with 602 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
aqhome/msg/msg_flashready.c
View File

@@ -18,10 +18,16 @@
#include <gwenhywfar/debug.h>
#define AQH_MSG_OFFS_FLASHREADY_UID 0 /* 4 bytes */
#define AQH_MSG_OFFS_FLASHREADY_FWTYPE 4 /* 2 bytes */
#define AQH_MSG_OFFS_FLASHREADY_FWVER 6 /* 2 bytes */
#define AQH_MSG_OFFS_FLASHREADY_PAGESIZE 8 /* 2 bytes */
#define AQH_MSG_OFFS_FLASHREADY_UID 0 /* 4 bytes */
#define AQH_MSG_OFFS_FLASHREADY_MANUF 4 /* 4 bytes */
#define AQH_MSG_OFFS_FLASHREADY_DEVTYPE 8 /* 2 bytes */
#define AQH_MSG_OFFS_FLASHREADY_DEVVERSION 10 /* 1 byte */
#define AQH_MSG_OFFS_FLASHREADY_DEVREVISION 11 /* 1 byte */
#define AQH_MSG_OFFS_FLASHREADY_FWVARIANT 12 /* 1 byte */
#define AQH_MSG_OFFS_FLASHREADY_FWVMAJOR 13 /* 1 byte */
#define AQH_MSG_OFFS_FLASHREADY_FWVMINOR 14 /* 1 byte */
#define AQH_MSG_OFFS_FLASHREADY_FWVPATCH 15 /* 1 byte */
#define AQH_MSG_OFFS_FLASHREADY_PAGESIZE 16 /* 2 bytes */
#define AQH_MSG_FLASHREADY_MINSIZE (AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_PAGESIZE+2)
@@ -34,16 +40,57 @@ uint32_t AQH_FlashReadyMsg_GetUid(const GWEN_MSG *msg)
uint16_t AQH_FlashReadyMsg_GetFirmwareType(const GWEN_MSG *msg)
uint32_t AQH_FlashReadyMsg_GetManufacturer(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_FWTYPE, 0);
return GWEN_Msg_GetUint32At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_MANUF, 0);
}
uint16_t AQH_FlashReadyMsg_GetFirmwareVersion(const GWEN_MSG *msg)
uint16_t AQH_FlashReadyMsg_GetDeviceType(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_FWVER, 0);
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_DEVTYPE, 0);
}
uint8_t AQH_FlashReadyMsg_GetDeviceVersion(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_DEVVERSION, 0);
}
uint8_t AQH_FlashReadyMsg_GetDeviceRevision(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_DEVREVISION, 0);
}
uint8_t AQH_FlashReadyMsg_GetFirmwareVariant(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_FWVARIANT, 0);
}
uint8_t AQH_FlashReadyMsg_GetFirmwareVersionMajor(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_FWVMAJOR, 0);
}
uint8_t AQH_FlashReadyMsg_GetFirmwareVersionMinor(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_FWVMINOR, 0);
}
uint8_t AQH_FlashReadyMsg_GetFirmwareVersionPatchlevel(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHREADY_FWVPATCH, 0);
}
@@ -62,17 +109,21 @@ void AQH_FlashReadyMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, cons
{
if ((AQH_NodeMsg_GetMsgType(msg)==AQH_MSG_TYPE_FLASH_READY) &&
(GWEN_Msg_GetBytesInBuffer(msg)>=AQH_MSG_FLASHREADY_MINSIZE)) {
uint16_t fwVersion;
fwVersion=AQH_FlashReadyMsg_GetFirmwareVersion(msg);
GWEN_Buffer_AppendArgs(dbuf, "0x%02x->0x%02x: FLASHREADY %s (uid=0x%08x, fw type=%d, fw ver=%d.%d, pagesize=%d)\n",
GWEN_Buffer_AppendArgs(dbuf,
"0x%02x->0x%02x: FLASHREADY %s (uid=0x%08x, dev=%08x:%04x v%d.%d, fw=%d.%d.%d (%d) pagesize=%d)\n",
AQH_NodeMsg_GetSourceAddress(msg),
AQH_NodeMsg_GetDestAddress(msg),
sText,
(unsigned int) AQH_FlashReadyMsg_GetUid(msg),
AQH_FlashReadyMsg_GetFirmwareType(msg),
(fwVersion>>8) & 0xff,
fwVersion & 0xff,
AQH_FlashReadyMsg_GetManufacturer(msg),
AQH_FlashReadyMsg_GetDeviceType(msg),
AQH_FlashReadyMsg_GetDeviceVersion(msg),
AQH_FlashReadyMsg_GetDeviceRevision(msg),
AQH_FlashReadyMsg_GetFirmwareVersionMajor(msg),
AQH_FlashReadyMsg_GetFirmwareVersionMinor(msg),
AQH_FlashReadyMsg_GetFirmwareVersionPatchlevel(msg),
AQH_FlashReadyMsg_GetFirmwareVariant(msg),
AQH_FlashReadyMsg_GetPagesize(msg));
}
}