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

aqhome: adapted to latest changes.

Browse Source
This commit is contained in:
Martin Preuss
2024-09-07 14:57:40 +02:00
parent 9b724d5a5f
commit 5f2da242c5
5 changed files with 50 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
aqhome/msg/msg_flashstart.c
View File

@@ -19,15 +19,12 @@
#define AQH_MSG_OFFS_FLASHSTART_UID 0 /* 4 bytes */
#define AQH_MSG_OFFS_FLASHSTART_FWTYPE 4 /* 2 bytes */
#define AQH_MSG_OFFS_FLASHSTART_FWVER 6 /* 2 bytes */
#define AQH_MSG_FLASHSTART_MINSIZE (AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHSTART_FWVER+2)
#define AQH_MSG_FLASHSTART_MINSIZE (AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHSTART_UID+4)
GWEN_MSG *AQH_FlashStartMsg_new(uint8_t srcAddr, uint8_t destAddr, uint8_t code,
uint32_t uid, uint16_t firmwareType, uint16_t firmwareVersion)
GWEN_MSG *AQH_FlashStartMsg_new(uint8_t srcAddr, uint8_t destAddr, uint8_t code, uint32_t uid)
{
GWEN_MSG *msg;
uint8_t *ptr;
@@ -41,12 +38,6 @@ GWEN_MSG *AQH_FlashStartMsg_new(uint8_t srcAddr, uint8_t destAddr, uint8_t code,
*(ptr++)=(uid>>16) & 0xff;
*(ptr++)=(uid>>24) & 0xff;
*(ptr++)=firmwareType & 0xff; /* fw type */
*(ptr++)=(firmwareType>>8) & 0xff;
*(ptr++)=firmwareVersion & 0xff; /* fw ver */
*(ptr++)=(firmwareVersion>>8) & 0xff;
rv=AQH_NodeMsg_AddChecksum(msg);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
@@ -67,35 +58,14 @@ uint32_t AQH_FlashStartMsg_GetUid(const GWEN_MSG *msg)
uint16_t AQH_FlashStartMsg_GetFirmwareType(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHSTART_FWTYPE, 0);
}
uint16_t AQH_FlashStartMsg_GetFirmwareVersion(const GWEN_MSG *msg)
{
return GWEN_Msg_GetUint16At(msg, AQH_MSG_OFFS_ALL_DATA_BEGIN+AQH_MSG_OFFS_FLASHSTART_FWVER, 0);
}
void AQH_FlashStartMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
{
if (GWEN_Msg_GetBytesInBuffer(msg)>=AQH_MSG_FLASHSTART_MINSIZE) {
uint16_t fwVersion;
fwVersion=AQH_FlashStartMsg_GetFirmwareVersion(msg);
GWEN_Buffer_AppendArgs(dbuf, "0x%02x->0x%02x: FLASHSTART %s (uid=0x%08x, fw type=%d, fw ver=%d.%d)\n",
GWEN_Buffer_AppendArgs(dbuf, "0x%02x->0x%02x: FLASHSTART %s (uid=0x%08x)\n",
AQH_NodeMsg_GetSourceAddress(msg),
AQH_NodeMsg_GetDestAddress(msg),
sText,
(unsigned int) AQH_FlashStartMsg_GetUid(msg),
AQH_FlashStartMsg_GetFirmwareType(msg),
(fwVersion>>8) & 0xff,
fwVersion & 0xff);
(unsigned int) AQH_FlashStartMsg_GetUid(msg));
}
}