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

96
aqhome/msg/msg_device.c
View File

@@ -18,13 +18,18 @@
#include <gwenhywfar/debug.h>
#define AQH_MSG_OFFS_DEVICE_UID 0 /* 4 bytes */
#define AQH_MSG_OFFS_DEVICE_FWTYPE 4 /* 2 bytes */
#define AQH_MSG_OFFS_DEVICE_FWLOW 6 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_FWHIGH 7 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_MODULES 8 /* 2 byte */
#define AQH_MSG_OFFS_DEVICE_UID 0 /* 4 bytes */
#define AQH_MSG_OFFS_DEVICE_MANUF 4 /* 4 bytes */
#define AQH_MSG_OFFS_DEVICE_DEVTYPE 8 /* 2 bytes */
#define AQH_MSG_OFFS_DEVICE_DEVVERSION 10 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_DEVREVISION 11 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_FWVARIANT 12 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_FWVMAJOR 13 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_FWVMINOR 14 /* 1 byte */
#define AQH_MSG_OFFS_DEVICE_FWVPATCH 15 /* 1 byte */
#define AQH_MSG_DEVICE_MINSIZE (AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_MODULES+2)
#define AQH_MSG_DEVICE_MINSIZE (AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWVPATCH+1)
@@ -35,30 +40,57 @@ uint32_t AQH_DeviceMsg_GetUid(const GWEN_MSG *msg)
uint16_t AQH_DeviceMsg_GetFirmwareType(const GWEN_MSG *msg)
uint32_t AQH_DeviceMsg_GetManufacturer(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWTYPE, 0);
return GWEN_Msg_GetUint32At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_MANUF, 0);
}
uint8_t AQH_DeviceMsg_GetFirmwareLow(const GWEN_MSG *msg)
uint16_t AQH_DeviceMsg_GetDeviceType(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWLOW, 0);
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_DEVTYPE, 0);
}
uint8_t AQH_DeviceMsg_GetFirmwareHigh(const GWEN_MSG *msg)
uint8_t AQH_DeviceMsg_GetDeviceVersion(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWHIGH, 0);
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_DEVVERSION, 0);
}
uint16_t AQH_DeviceMsg_GetModuleMask(const GWEN_MSG *msg)
uint8_t AQH_DeviceMsg_GetDeviceRevision(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_MODULES, 0);
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_DEVREVISION, 0);
}
uint8_t AQH_DeviceMsg_GetFirmwareVariant(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWVARIANT, 0);
}
uint8_t AQH_DeviceMsg_GetFirmwareVersionMajor(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWVMAJOR, 0);
}
uint8_t AQH_DeviceMsg_GetFirmwareVersionMinor(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWVMINOR, 0);
}
uint8_t AQH_DeviceMsg_GetFirmwareVersionPatchlevel(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint8At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_DEVICE_FWVPATCH, 0);
}
@@ -66,36 +98,20 @@ uint16_t AQH_DeviceMsg_GetModuleMask(const GWEN_MSG *msg)
void AQH_DeviceMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
{
if (GWEN_Msg_GetBytesInBuffer(msg)>=AQH_MSG_DEVICE_MINSIZE) {
uint16_t modules;
modules=AQH_DeviceMsg_GetModuleMask(msg);
GWEN_Buffer_AppendArgs(dbuf, "0x%02x->0x%02x: DEVICE %s (uid=0x%08x, fw type=%d, fw ver=%d.%d, mods=0x%04x",
GWEN_Buffer_AppendArgs(dbuf,
"0x%02x->0x%02x: DEVICE %s (uid=0x%08x, dev=%08x:%04x v%d.%d, fw=%d.%d.%d (%d))\n",
AQH_NodeMsg_GetSourceAddress(msg),
AQH_NodeMsg_GetDestAddress(msg),
sText,
(unsigned int) AQH_DeviceMsg_GetUid(msg),
AQH_DeviceMsg_GetFirmwareType(msg),
AQH_DeviceMsg_GetFirmwareHigh(msg),
AQH_DeviceMsg_GetFirmwareLow(msg),
modules);
if (modules) {
GWEN_Buffer_AppendString(dbuf, "[");
if (modules & AQH_MSG_MODULES_MASK_TIMER)
GWEN_Buffer_AppendString(dbuf, " TIMER");
if (modules & AQH_MSG_MODULES_MASK_COM)
GWEN_Buffer_AppendString(dbuf, " COM");
if (modules & AQH_MSG_MODULES_MASK_LED)
GWEN_Buffer_AppendString(dbuf, " LED");
if (modules & AQH_MSG_MODULES_MASK_TWIMASTER)
GWEN_Buffer_AppendString(dbuf, " TWIMASTER");
if (modules & AQH_MSG_MODULES_MASK_LCD)
GWEN_Buffer_AppendString(dbuf, " LCD");
if (modules & AQH_MSG_MODULES_MASK_SI7021)
GWEN_Buffer_AppendString(dbuf, " SI7021");
if (modules & AQH_MSG_MODULES_MASK_STATS)
GWEN_Buffer_AppendString(dbuf, " STATS");
GWEN_Buffer_AppendString(dbuf, " ]");
}
AQH_DeviceMsg_GetManufacturer(msg),
AQH_DeviceMsg_GetDeviceType(msg),
AQH_DeviceMsg_GetDeviceVersion(msg),
AQH_DeviceMsg_GetDeviceRevision(msg),
AQH_DeviceMsg_GetFirmwareVersionMajor(msg),
AQH_DeviceMsg_GetFirmwareVersionMinor(msg),
AQH_DeviceMsg_GetFirmwareVersionPatchlevel(msg),
AQH_DeviceMsg_GetFirmwareVariant(msg));
GWEN_Buffer_AppendString(dbuf, ")\n");
}
}