From 4bfa8bdd347123c61c4cedc0cfe414820e512a62 Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Wed, 23 Mar 2016 20:54:10 +0100 Subject: [PATCH] Release 1.6.1 --- common/history.txt | 4 +++- common/vscp_firmware.c | 4 ++-- common/vscp_firmware.h | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/history.txt b/common/history.txt index 58d0cc13..8fdaa880 100644 --- a/common/history.txt +++ b/common/history.txt @@ -1,2 +1,4 @@ -2016-03-23 AKHE - VSCP Firmware 1.6 released. +2016-03-23 AKHE - VSCP Frimware 1.6.1 released +2016-03-23 AKHE - vscp_sendLogEvent parameter error fixed +2016-03-23 AKHE - VSCP Firmware 1.6.0 released. diff --git a/common/vscp_firmware.c b/common/vscp_firmware.c index f4c9f373..9440f29e 100644 --- a/common/vscp_firmware.c +++ b/common/vscp_firmware.c @@ -1361,12 +1361,12 @@ uint8_t vscp_sendLogEvent( uint8_t type, uint8_t id, uint8_t level, uint8_t idx, - uint8_t data ) + uint8_t *pdata ) { vscp_omsg.data[ 0 ] = id; vscp_omsg.data[ 1 ] = level; vscp_omsg.data[ 2 ] = idx; - memcpy( vscp_omsg.data, data, 5 ); + memcpy( vscp_omsg.data, pdata, 5 ); vscp_omsg.priority = VSCP_PRIORITY_MEDIUM; vscp_omsg.flags = VSCP_VALID_MSG + 8; diff --git a/common/vscp_firmware.h b/common/vscp_firmware.h index be40b8b0..8af0a7dc 100644 --- a/common/vscp_firmware.h +++ b/common/vscp_firmware.h @@ -92,8 +92,9 @@ low end hardware device. // VSCP Constants // ****************************************************************************** -#define VSCP_MAJOR_VERSION 1 // VSCP Major version +#define VSCP_MAJOR_VERSION 1 // VSCP Major version #define VSCP_MINOR_VERSION 6 // VSCP Minor Version +#define VSCP_SUB_VERSION 1 // VSCP Sub version #define VSCP_ADDRESS_MASTER 0x00 #define VSCP_ADDRESS_FREE 0xff @@ -493,7 +494,7 @@ uint8_t vscp_sendLogEvent( uint8_t type, uint8_t id, uint8_t level, uint8_t idx, - uint8_t data ); + uint8_t *pdata ); #endif // --------------------------- External Functions -----------------------------