diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f692db..0f44726 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ +## 2.0.0 + +- Update to VSCP framework v2.0.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.0.0) there. + ## 1.3.0 - Update to VSCP framework v1.3.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v1.3.0) there. - ## 1.2.0 - Update to VSCP framework v1.2.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v1.2.0) there. diff --git a/library.json b/library.json index 2d29f54..e710a9a 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "vscp-arduino", - "version": "1.3.0", + "version": "2.0.0", "keywords": "vscp, arduino-library, vscp-arduino, automation, home automation", "description": "Very Simple Control Procotol (VSCP) Level 1 Library for the arduino IDE.", "repository": { @@ -12,6 +12,7 @@ "email": "vscp@blue-andi.de", "maintainer": true }], + "license": "MIT", "frameworks": "arduino", "platforms": "*" } diff --git a/library.properties b/library.properties index 2c75ba3..8966351 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=VSCP -version=1.3.0 +version=2.0.0 author=Andreas Merkle maintainer=Andreas Merkle sentence=Very Simple Control Protocol L1 framework for all Arduino boards. diff --git a/src/framework/core/vscp_core.c b/src/framework/core/vscp_core.c index 46e8150..c1d9993 100644 --- a/src/framework/core/vscp_core.c +++ b/src/framework/core/vscp_core.c @@ -136,7 +136,7 @@ static void vscp_core_stateInit(void); static void vscp_core_changeToStatePreActive(void); static void vscp_core_statePreActive(void); static void vscp_core_changeToStateActive(void); -static void vscp_core_stateActive(void); +static BOOL vscp_core_stateActive(void); static void vscp_core_changeToStateIdle(void); static void vscp_core_stateIdle(void); static void vscp_core_changeToStateReset(uint8_t timeout); @@ -458,9 +458,9 @@ extern void vscp_core_restoreFactoryDefaultSettings(void) * cyclic period. * * Note, for a fast handling of received events, this function returns TRUE in - * case a event was handled, otherwise FALSE. Call it e.g. in a loop until no - * event is handled anymore. If its not necessary in your application, just - * skip the return value. + * case a event was handled partly or completely, otherwise FALSE. + * Call it e.g. in a loop until no event is handled anymore. If its not + * necessary in your application, just skip the return value. * * @return If a received event was handled, it will return TRUE otherwise FALSE. */ @@ -513,7 +513,11 @@ extern BOOL vscp_core_process(void) /* Node is active and awaits something to do. */ case STATE_ACTIVE: - vscp_core_stateActive(); + if (TRUE == vscp_core_stateActive()) + { + /* An extended page read may need more cycles to complete. */ + isEventHandled = TRUE; + } break; /* Node goes offline */ @@ -650,7 +654,7 @@ extern void vscp_core_prepareTxMessage(vscp_TxMessage * const txMessage, uint16_ txMessage->priority = priority; txMessage->oAddr = vscp_core_nickname; txMessage->hardCoded = VSCP_CORE_HARD_CODED; - txMessage->dataNum = 0; + txMessage->dataSize = 0; } return; @@ -851,7 +855,7 @@ static inline void vscp_core_stateInit(void) txMessage.priority = VSCP_PRIORITY_7_LOW; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 1; + txMessage.dataSize = 1; txMessage.data[0] = VSCP_NICKNAME_SEGMENT_MASTER; if (FALSE == vscp_transport_writeMessage(&txMessage)) @@ -917,7 +921,7 @@ static inline void vscp_core_stateInit(void) txMessage.priority = VSCP_PRIORITY_7_LOW; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 1; + txMessage.dataSize = 1; txMessage.data[0] = vscp_core_nickname_probe; if (FALSE == vscp_transport_writeMessage(&txMessage)) @@ -1044,7 +1048,7 @@ static inline void vscp_core_statePreActive(void) txMessage.priority = VSCP_PRIORITY_7_LOW; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 0; + txMessage.dataSize = 0; (void)vscp_transport_writeMessage(&txMessage); @@ -1084,7 +1088,7 @@ static inline void vscp_core_changeToStateActive(void) txMessage.priority = VSCP_PRIORITY_0_HIGH; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 1; + txMessage.dataSize = 1; txMessage.data[0] = vscp_core_nickname; (void)vscp_transport_writeMessage(&txMessage); @@ -1106,9 +1110,13 @@ static inline void vscp_core_changeToStateActive(void) /** * Handles the active state. + * + * @return If a event is handled partly or completely, it will return TRUE oterhwise FALSE. */ -static inline void vscp_core_stateActive(void) +static inline BOOL vscp_core_stateActive(void) { + BOOL isEventHandled = FALSE; + /* Valid message? */ if (TRUE == vscp_core_rxMessageValid) { @@ -1150,6 +1158,8 @@ static inline void vscp_core_stateActive(void) vscp_dm_ng_executeActions(&vscp_core_rxMessage); #endif /* VSCP_CONFIG_BASE_IS_ENABLED( VSCP_CONFIG_ENABLE_DM_NEXT_GENERATION ) */ + + isEventHandled = TRUE; } #if VSCP_CONFIG_BASE_IS_ENABLED( VSCP_CONFIG_HEARTBEAT_NODE ) @@ -1176,9 +1186,10 @@ static inline void vscp_core_stateActive(void) if (0 < vscp_core_extPageReadData.count) { vscp_core_extendedPageReadRegister(&vscp_core_extPageReadData); + isEventHandled = TRUE; } - return; + return isEventHandled; } /** @@ -1556,7 +1567,7 @@ static inline void vscp_core_handleProtocolClassType(void) static inline void vscp_core_handleProtocolHeartbeat(void) { /* Check number of parameters. */ - if (0 < vscp_core_rxMessage.dataNum) + if (0 < vscp_core_rxMessage.dataSize) { /* If the received segment controller CRC is different than the stored one, * it seems the node was moved to a new segment. @@ -1576,7 +1587,7 @@ static inline void vscp_core_handleProtocolHeartbeat(void) } /* If available, store time since epoch 00:00:00 UTC, January 1, 1970 */ - if (5 <= vscp_core_rxMessage.dataNum) + if (5 <= vscp_core_rxMessage.dataSize) { vscp_core_timeSinceEpoch = ((uint32_t)vscp_core_rxMessage.data[1]) << 24; vscp_core_timeSinceEpoch |= ((uint32_t)vscp_core_rxMessage.data[2]) << 16; @@ -1603,7 +1614,7 @@ static inline void vscp_core_handleProtocolHeartbeat(void) static inline void vscp_core_handleProtocolNewNodeOnline(void) { /* Check number of parameters. */ - if (1 == vscp_core_rxMessage.dataNum) + if (1 == vscp_core_rxMessage.dataSize) { /* Does this belongs to a node with the same nickname id? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -1616,7 +1627,7 @@ static inline void vscp_core_handleProtocolNewNodeOnline(void) txMessage.priority = VSCP_PRIORITY_0_HIGH; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 0; + txMessage.dataSize = 0; (void)vscp_transport_writeMessage(&txMessage); } @@ -1631,7 +1642,7 @@ static inline void vscp_core_handleProtocolNewNodeOnline(void) static inline void vscp_core_handleProtocolProbeAck(void) { /* Check number of parameters. */ - if (0 == vscp_core_rxMessage.dataNum) + if (0 == vscp_core_rxMessage.dataSize) { /* Response from a node with the same nickname id? */ if (vscp_core_nickname == vscp_core_rxMessage.oAddr) @@ -1650,7 +1661,7 @@ static inline void vscp_core_handleProtocolProbeAck(void) static inline void vscp_core_handleProtocolSetNicknameId(void) { /* Check number of parameters. */ - if (2 == vscp_core_rxMessage.dataNum) + if (2 == vscp_core_rxMessage.dataSize) { /* Change the node nickname id? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -1668,7 +1679,7 @@ static inline void vscp_core_handleProtocolSetNicknameId(void) txMessage.priority = VSCP_PRIORITY_7_LOW; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 0; + txMessage.dataSize = 0; (void)vscp_transport_writeMessage(&txMessage); } @@ -1684,25 +1695,25 @@ static inline void vscp_core_handleProtocolSetNicknameId(void) static inline void vscp_core_handleProtocolDropNicknameId(void) { /* Check number of parameters. */ - if (0 < vscp_core_rxMessage.dataNum) + if (0 < vscp_core_rxMessage.dataSize) { /* Drop the node nickname id? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) { /* Drop nickname and restart? */ - if (1 == vscp_core_rxMessage.dataNum) + if (1 == vscp_core_rxMessage.dataSize) { vscp_core_writeNicknameId(VSCP_NICKNAME_NOT_INIT); vscp_core_changeToStateReset(0); } /* Additional flags received? */ - else if ((2 == vscp_core_rxMessage.dataNum) || - (3 == vscp_core_rxMessage.dataNum)) + else if ((2 == vscp_core_rxMessage.dataSize) || + (3 == vscp_core_rxMessage.dataSize)) { uint8_t waitTime = 0; /* Wait time received? */ - if (3 == vscp_core_rxMessage.dataNum) + if (3 == vscp_core_rxMessage.dataSize) { waitTime = vscp_core_rxMessage.data[2]; } @@ -1762,7 +1773,7 @@ static inline void vscp_core_handleProtocolDropNicknameId(void) static inline void vscp_core_handleProtocolReadRegister(void) { /* Check number of parameters. */ - if (2 == vscp_core_rxMessage.dataNum) + if (2 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -1793,7 +1804,7 @@ static void vscp_core_sendRegisterReadWriteRsp(uint8_t addr, uint8_t value) txMessage.priority = VSCP_PRIORITY_3_NORMAL; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 2; + txMessage.dataSize = 2; txMessage.data[0] = addr; txMessage.data[1] = value; @@ -1935,6 +1946,14 @@ static uint8_t vscp_core_readRegister(uint16_t page, uint8_t addr) /* Write only */ break; + case VSCP_REG_FIRMWARE_DEVICE_CODE_MSB: + ret = VSCP_UTIL_WORD_MSB(vscp_dev_data_getFirmwareDeviceCode()); + break; + + case VSCP_REG_FIRMWARE_DEVICE_CODE_LSB: + ret = VSCP_UTIL_WORD_LSB(vscp_dev_data_getFirmwareDeviceCode()); + break; + case VSCP_REG_GUID_15: /*@fallthrough@*/ case VSCP_REG_GUID_14: @@ -2141,6 +2160,14 @@ static uint8_t vscp_core_writeRegister(uint16_t page, uint8_t addr, uint8_t val /* Read only */ break; + case VSCP_REG_FIRMWARE_DEVICE_CODE_MSB: + /* Read only */ + break; + + case VSCP_REG_FIRMWARE_DEVICE_CODE_LSB: + /* Read only */ + break; + case VSCP_REG_RESTORE_STD_CFG: /* 0x55 has to be written first, multi-frame timer is disabled. */ @@ -2252,7 +2279,7 @@ static uint8_t vscp_core_writeRegister(uint16_t page, uint8_t addr, uint8_t val static inline void vscp_core_handleProtocolWriteRegister(void) { /* Check number of parameters. */ - if (3 == vscp_core_rxMessage.dataNum) + if (3 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2282,7 +2309,7 @@ static inline void vscp_core_handleProtocolWriteRegister(void) static inline void vscp_core_handleProtocolEnterBootLoaderMode(void) { /* Check number of parameters. */ - if (8 == vscp_core_rxMessage.dataNum) + if (8 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2311,7 +2338,7 @@ static inline void vscp_core_handleProtocolEnterBootLoaderMode(void) txMessage.priority = VSCP_PRIORITY_3_NORMAL; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 1; + txMessage.dataSize = 1; txMessage.data[0] = 0; /* User defined error code - not used */ (void)vscp_transport_writeMessage(&txMessage); @@ -2337,7 +2364,7 @@ static inline void vscp_core_handleProtocolEnterBootLoaderMode(void) txMessage.priority = VSCP_PRIORITY_3_NORMAL; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 1; + txMessage.dataSize = 1; txMessage.data[0] = 0; /* User defined error code - not used */ (void)vscp_transport_writeMessage(&txMessage); @@ -2355,7 +2382,7 @@ static inline void vscp_core_handleProtocolEnterBootLoaderMode(void) static inline void vscp_core_handleProtocolGuidDropNickname(void) { /* Check number of parameters. */ - if ((5 == vscp_core_rxMessage.dataNum) && + if ((5 == vscp_core_rxMessage.dataSize) && (4 > vscp_core_rxMessage.data[0])) { static uint8_t status = 0; @@ -2441,7 +2468,7 @@ static inline void vscp_core_handleProtocolGuidDropNickname(void) static inline void vscp_core_handleProtocolPageRead(void) { /* Check number of parameters. */ - if (3 == vscp_core_rxMessage.dataNum) + if (3 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2466,7 +2493,7 @@ static inline void vscp_core_handleProtocolPageRead(void) txMessage.priority = VSCP_PRIORITY_3_NORMAL; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = VSCP_L1_DATA_SIZE; + txMessage.dataSize = VSCP_L1_DATA_SIZE; /* Sequence number */ txMessage.data[dataIndex] = 0; @@ -2490,7 +2517,7 @@ static inline void vscp_core_handleProtocolPageRead(void) if (1 < dataIndex) { - txMessage.dataNum = dataIndex; + txMessage.dataSize = dataIndex; (void)vscp_transport_writeMessage(&txMessage); } @@ -2506,7 +2533,7 @@ static inline void vscp_core_handleProtocolPageRead(void) static inline void vscp_core_handleProtocolPageWrite(void) { /* Check number of parameters. */ - if (3 <= vscp_core_rxMessage.dataNum) + if (3 <= vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2514,7 +2541,7 @@ static inline void vscp_core_handleProtocolPageWrite(void) vscp_TxMessage txMessage; uint8_t addr = vscp_core_rxMessage.data[1]; uint8_t index = 0; - uint8_t num = vscp_core_rxMessage.dataNum - 2; + uint8_t num = vscp_core_rxMessage.dataSize - 2; uint8_t dataIndex = 0; /* If the number of bytes to read overflows the page, it will be @@ -2545,7 +2572,7 @@ static inline void vscp_core_handleProtocolPageWrite(void) ++dataIndex; } - txMessage.dataNum = dataIndex; + txMessage.dataSize = dataIndex; (void)vscp_transport_writeMessage(&txMessage); } @@ -2560,7 +2587,7 @@ static inline void vscp_core_handleProtocolPageWrite(void) static inline void vscp_core_handleProtocolIncrementRegister(void) { /* Check number of parameters. */ - if (2 == vscp_core_rxMessage.dataNum) + if (2 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2592,7 +2619,7 @@ static inline void vscp_core_handleProtocolIncrementRegister(void) static inline void vscp_core_handleProtocolDecrementRegister(void) { /* Check number of parameters. */ - if (2 == vscp_core_rxMessage.dataNum) + if (2 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2624,7 +2651,7 @@ static inline void vscp_core_handleProtocolDecrementRegister(void) static inline void vscp_core_handleProtocolWhoIsThere(void) { /* Check number of parameters. */ - if (1 == vscp_core_rxMessage.dataNum) + if (1 == vscp_core_rxMessage.dataSize) { /* This node? */ if ((vscp_core_nickname == vscp_core_rxMessage.data[0]) || @@ -2641,7 +2668,7 @@ static inline void vscp_core_handleProtocolWhoIsThere(void) txMessage.priority = VSCP_PRIORITY_3_NORMAL; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 8; + txMessage.dataSize = 8; /* Row index */ txMessage.data[dataIndex] = rowIndex; @@ -2706,7 +2733,7 @@ static inline void vscp_core_handleProtocolWhoIsThere(void) static inline void vscp_core_handleProtocolGetDecisionMatrixInfo(void) { /* Check number of parameters. */ - if (1 == vscp_core_rxMessage.dataNum) + if (1 == vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2729,7 +2756,7 @@ static inline void vscp_core_handleProtocolGetDecisionMatrixInfo(void) txMessage.priority = VSCP_PRIORITY_3_NORMAL; txMessage.oAddr = vscp_core_nickname; txMessage.hardCoded = VSCP_CORE_HARD_CODED; - txMessage.dataNum = 4; + txMessage.dataSize = 4; txMessage.data[0] = matrixSize; txMessage.data[1] = matrixOffset; txMessage.data[2] = VSCP_UTIL_WORD_MSB(pageStart); @@ -2749,7 +2776,7 @@ static inline void vscp_core_handleProtocolGetDecisionMatrixInfo(void) static inline void vscp_core_handleProtocolExtendedPageReadRegister(void) { /* Check number of parameters. */ - if (4 <= vscp_core_rxMessage.dataNum) + if (4 <= vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2759,7 +2786,7 @@ static inline void vscp_core_handleProtocolExtendedPageReadRegister(void) vscp_core_extPageReadData.seq = 0; /* Read more than one register? */ - if (5 == vscp_core_rxMessage.dataNum) + if (5 == vscp_core_rxMessage.dataSize) { vscp_core_extPageReadData.count = vscp_core_rxMessage.data[4]; @@ -2841,7 +2868,7 @@ static void vscp_core_extendedPageReadRegister(ExtPageRead * const data) while((VSCP_L1_DATA_SIZE > index) && (0 < count) && (FALSE == nextPage)); /* Set event data size */ - txMessage.dataNum = index; + txMessage.dataSize = index; if (TRUE == vscp_transport_writeMessage(&txMessage)) { @@ -2871,7 +2898,7 @@ static void vscp_core_extendedPageReadRegister(ExtPageRead * const data) static inline void vscp_core_handleProtocolExtendedPageWriteRegister(void) { /* Check number of parameters. */ - if (5 <= vscp_core_rxMessage.dataNum) + if (5 <= vscp_core_rxMessage.dataSize) { /* This node? */ if (vscp_core_nickname == vscp_core_rxMessage.data[0]) @@ -2879,7 +2906,7 @@ static inline void vscp_core_handleProtocolExtendedPageWriteRegister(void) vscp_TxMessage txMessage; uint16_t page = (((uint16_t)vscp_core_rxMessage.data[1]) << 8) | (vscp_core_rxMessage.data[2]); uint8_t addr = vscp_core_rxMessage.data[3]; - uint8_t num = vscp_core_rxMessage.dataNum - 4; + uint8_t num = vscp_core_rxMessage.dataSize - 4; uint8_t index = 0; uint8_t dataIndex = 0; @@ -2915,7 +2942,7 @@ static inline void vscp_core_handleProtocolExtendedPageWriteRegister(void) ++dataIndex; } - txMessage.dataNum = dataIndex; + txMessage.dataSize = dataIndex; (void)vscp_transport_writeMessage(&txMessage); } diff --git a/src/framework/core/vscp_core.h b/src/framework/core/vscp_core.h index ad68422..d89e4c2 100644 --- a/src/framework/core/vscp_core.h +++ b/src/framework/core/vscp_core.h @@ -93,16 +93,16 @@ extern "C" #define VSCP_CORE_VERSION_MAJOR (1) /** VSCP specification minor version number, the framework is compliant to. */ -#define VSCP_CORE_VERSION_MINOR (12) +#define VSCP_CORE_VERSION_MINOR (13) /** VSCP specification sub-minor version number, the framework is compliant to. */ -#define VSCP_CORE_VERSION_SUB_MINOR (2) +#define VSCP_CORE_VERSION_SUB_MINOR (0) /** VSCP specification version string, the framework is compliant to. */ -#define VSCP_CORE_VERSION_STR "v1.12.2" +#define VSCP_CORE_VERSION_STR "v1.13.0" /** VSCP framework version string */ -#define VSCP_CORE_FRAMEWORK_VERSION "v1.3.0" +#define VSCP_CORE_FRAMEWORK_VERSION "v2.0.0" /******************************************************************************* MACROS @@ -149,9 +149,9 @@ extern void vscp_core_restoreFactoryDefaultSettings(void); * cyclic period. * * Note, for a fast handling of received events, this function returns TRUE in - * case a event was handled, otherwise FALSE. Call it e.g. in a loop until no - * event is handled anymore. If its not necessary in your application, just - * skip the return value. + * case a event was handled partly or completely, otherwise FALSE. + * Call it e.g. in a loop until no event is handled anymore. If its not + * necessary in your application, just skip the return value. * * @return If a received event was handled, it will return TRUE otherwise FALSE. */ diff --git a/src/framework/core/vscp_dev_data.c b/src/framework/core/vscp_dev_data.c index cc8443c..6a83d6a 100644 --- a/src/framework/core/vscp_dev_data.c +++ b/src/framework/core/vscp_dev_data.c @@ -513,6 +513,22 @@ extern uint8_t vscp_dev_data_getStdDevType(uint8_t index) #endif /* VSCP_CONFIG_BASE_IS_DISABLED( VSCP_DEV_DATA_CONFIG_ENABLE_FAMILY_CODE ) */ } +/** + * Get the firmware device code. + * The firmware code is used to distinguish a device type of a module from one + * another so that the correct firmware can be loaded to a module. Typically a + * board have different firmware codes here for different microprocessors used + * as reversions of the board is shipped over time. + * + * Return 0 if not used. + * + * @return Firmware device code + */ +extern uint32_t vscp_dev_data_getFirmwareDeviceCode(void) +{ + return VSCP_DEV_DATA_CONFIG_FIRMWARE_DEVICE_CODE; +} + /******************************************************************************* LOCAL FUNCTIONS *******************************************************************************/ diff --git a/src/framework/core/vscp_dev_data.h b/src/framework/core/vscp_dev_data.h index 0b950c2..bdea550 100644 --- a/src/framework/core/vscp_dev_data.h +++ b/src/framework/core/vscp_dev_data.h @@ -216,6 +216,19 @@ extern uint8_t vscp_dev_data_getStdDevFamilyCode(uint8_t index); */ extern uint8_t vscp_dev_data_getStdDevType(uint8_t index); +/** + * Get the firmware device code. + * The firmware code is used to distinguish a device type of a module from one + * another so that the correct firmware can be loaded to a module. Typically a + * board have different firmware codes here for different microprocessors used + * as reversions of the board is shipped over time. + * + * Return 0 if not used. + * + * @return Firmware device code + */ +extern uint32_t vscp_dev_data_getFirmwareDeviceCode(void); + #ifdef __cplusplus } #endif diff --git a/src/framework/core/vscp_dev_data_config.h b/src/framework/core/vscp_dev_data_config.h index 9908ada..21f02ba 100644 --- a/src/framework/core/vscp_dev_data_config.h +++ b/src/framework/core/vscp_dev_data_config.h @@ -258,6 +258,13 @@ extern "C" #endif /* VSCP_CONFIG_BASE_IS_ENABLED( VSCP_DEV_DATA_CONFIG_ENABLE_FAMILY_CODE ) */ +#ifndef VSCP_DEV_DATA_CONFIG_FIRMWARE_DEVICE_CODE + +/** Firmware device code. */ +#define VSCP_DEV_DATA_CONFIG_FIRMWARE_DEVICE_CODE ((uint16_t)0x0000) + +#endif /* VSCP_DEV_DATA_CONFIG_FIRMWARE_DEVICE_CODE */ + /******************************************************************************* MACROS *******************************************************************************/ diff --git a/src/framework/core/vscp_dm.c b/src/framework/core/vscp_dm.c index cbca1a5..1e7a659 100644 --- a/src/framework/core/vscp_dm.c +++ b/src/framework/core/vscp_dm.c @@ -505,7 +505,7 @@ extern void vscp_dm_executeActions(vscp_RxMessage const * const msg) /* Compare to event parameter byte 0? */ if (0 != (extFlags & VSCP_DM_EXTFLAG_MATCH_PAR_0)) { - if (0 == msg->dataNum) + if (0 == msg->dataSize) { /* Next row */ continue; @@ -520,7 +520,7 @@ extern void vscp_dm_executeActions(vscp_RxMessage const * const msg) /* Compare to event parameter byte 3? */ if (0 != (extFlags & VSCP_DM_EXTFLAG_MATCH_PAR_3)) { - if (3 >= msg->dataNum) + if (3 >= msg->dataSize) { /* Next row */ continue; @@ -535,7 +535,7 @@ extern void vscp_dm_executeActions(vscp_RxMessage const * const msg) /* Compare to event parameter byte 4? */ if (0 != (extFlags & VSCP_DM_EXTFLAG_MATCH_PAR_4)) { - if (4 >= msg->dataNum) + if (4 >= msg->dataSize) { /* Next row */ continue; @@ -550,7 +550,7 @@ extern void vscp_dm_executeActions(vscp_RxMessage const * const msg) /* Compare to event parameter byte 5? */ if (0 != (extFlags & VSCP_DM_EXTFLAG_MATCH_PAR_5)) { - if (5 >= msg->dataNum) + if (5 >= msg->dataSize) { /* Next row */ continue; diff --git a/src/framework/core/vscp_dm_ng.c b/src/framework/core/vscp_dm_ng.c index 7b02c3a..6766f56 100644 --- a/src/framework/core/vscp_dm_ng.c +++ b/src/framework/core/vscp_dm_ng.c @@ -644,7 +644,7 @@ static uint16_t vscp_dm_ng_getEventParValue(vscp_RxMessage const * const rxMsg, break; case VSCP_DM_NG_EVENT_PAR_ID_DATA_NUM: - value = rxMsg->dataNum; + value = rxMsg->dataSize; break; case VSCP_DM_NG_EVENT_PAR_ID_DATA0: @@ -663,7 +663,7 @@ static uint16_t vscp_dm_ng_getEventParValue(vscp_RxMessage const * const rxMsg, dataIndex = eventParId - VSCP_DM_NG_EVENT_PAR_ID_DATA0; /*@fallthrough@*/ case VSCP_DM_NG_EVENT_PAR_ID_DATA: - if (rxMsg->dataNum > dataIndex) + if (rxMsg->dataSize > dataIndex) { value = rxMsg->data[dataIndex]; } diff --git a/src/framework/core/vscp_logger.c b/src/framework/core/vscp_logger.c index fe940d0..28d3229 100644 --- a/src/framework/core/vscp_logger.c +++ b/src/framework/core/vscp_logger.c @@ -184,7 +184,7 @@ extern void vscp_logger_handleEvent(vscp_RxMessage const * const msg) /* Start logging? */ if (VSCP_TYPE_LOG_START == msg->vscpType) { - if (1 == msg->dataNum) + if (1 == msg->dataSize) { if (vscp_ps_readLogId() == msg->data[0]) { @@ -195,7 +195,7 @@ extern void vscp_logger_handleEvent(vscp_RxMessage const * const msg) /* Stop logging? */ else if (VSCP_TYPE_LOG_STOP == msg->vscpType) { - if (1 == msg->dataNum) + if (1 == msg->dataSize) { if (vscp_ps_readLogId() == msg->data[0]) { @@ -206,7 +206,7 @@ extern void vscp_logger_handleEvent(vscp_RxMessage const * const msg) /* Set log level? */ else if (VSCP_TYPE_LOG_LEVEL == msg->vscpType) { - if (1 == msg->dataNum) + if (1 == msg->dataSize) { vscp_logger_logLevel = msg->data[0]; } @@ -246,9 +246,9 @@ extern BOOL vscp_logger_sendLogEvent(uint8_t id, uint8_t level, uint8_t const * vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_LOG, VSCP_TYPE_LOG_MESSAGE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 8; - txMsg.data[0] = id; - txMsg.data[1] = level; + txMsg.dataSize = 8; + txMsg.data[0] = id; + txMsg.data[1] = level; /* If necessary, send several log events for a single log message. */ do diff --git a/src/framework/core/vscp_transport.c b/src/framework/core/vscp_transport.c index 832ced4..b5ec3eb 100644 --- a/src/framework/core/vscp_transport.c +++ b/src/framework/core/vscp_transport.c @@ -189,7 +189,7 @@ extern BOOL vscp_transport_writeMessage(vscp_TxMessage const * const msg) #if VSCP_CONFIG_BASE_IS_ENABLED( VSCP_CONFIG_ENABLE_LOOPBACK ) if ((NULL != msg) && /* Message shall exists */ - (VSCP_L1_DATA_SIZE >= msg->dataNum)) /* Number of data bytes is limited */ + (VSCP_L1_DATA_SIZE >= msg->dataSize)) /* Number of data bytes is limited */ { /* Write all messages to loopback, except: * - CLASS1.PROTOCOL: The core would interpret them. diff --git a/src/framework/core/vscp_type_measurement.h b/src/framework/core/vscp_type_measurement.h index a53659f..538a73b 100644 --- a/src/framework/core/vscp_type_measurement.h +++ b/src/framework/core/vscp_type_measurement.h @@ -478,7 +478,7 @@ extern "C" #define VSCP_TYPE_MEASUREMENT_POWER_FACTOR 63 /** - * Default unit: kVAr + * Default unit: VAr * In electric power transmission and distribution, volt-ampere reactive (VAr) is a unit of * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are * not in phase. diff --git a/src/framework/core/vscp_type_measurement32.h b/src/framework/core/vscp_type_measurement32.h index 3191b84..48f1852 100644 --- a/src/framework/core/vscp_type_measurement32.h +++ b/src/framework/core/vscp_type_measurement32.h @@ -454,6 +454,43 @@ extern "C" */ #define VSCP_TYPE_MEASUREMENT32_SOUND_LEVEL 60 +/** + * Default unit: sievert (Sv). + * Optional unit rem (1) + * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). + */ +#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EQ 61 + +/** + * Default unit: coulomb per kilogram (C/kg). + * Optional unit: Röntgen/R (1) + * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). + */ +#define VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EXPOSURE 62 + +/** + * Default unit: cos of phase angle. + * This is a measurment of a power factor. Power factor is an expression of energy efficiency. It is + * usually expressed as a percentage - and the lower the percentage, the less efficient power usage + * is. + */ +#define VSCP_TYPE_MEASUREMENT32_POWER_FACTOR 63 + +/** + * Default unit: VAr + * In electric power transmission and distribution, volt-ampere reactive (VAr) is a unit of + * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are + * not in phase. + */ +#define VSCP_TYPE_MEASUREMENT32_REACTIVE_POWER 64 + +/** + * Default unit: kVArh + * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit + * during a time interval, measured in units of kVArh or standard multiples thereof. + */ +#define VSCP_TYPE_MEASUREMENT32_REACTIVE_ENERGY 65 + /******************************************************************************* MACROS *******************************************************************************/ diff --git a/src/framework/core/vscp_type_measurement64.h b/src/framework/core/vscp_type_measurement64.h index 73782df..e6f2093 100644 --- a/src/framework/core/vscp_type_measurement64.h +++ b/src/framework/core/vscp_type_measurement64.h @@ -454,6 +454,43 @@ extern "C" */ #define VSCP_TYPE_MEASUREMENT64_SOUND_LEVEL 60 +/** + * Default unit: sievert (Sv). + * Optional unit rem (1) + * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). + */ +#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EQ 61 + +/** + * Default unit: coulomb per kilogram (C/kg). + * Optional unit: Röntgen/R (1) + * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). + */ +#define VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EXPOSURE 62 + +/** + * Default unit: cos of phase angle. + * This is a measurment of a power factor. Power factor is an expression of energy efficiency. It is + * usually expressed as a percentage - and the lower the percentage, the less efficient power usage + * is. + */ +#define VSCP_TYPE_MEASUREMENT64_POWER_FACTOR 63 + +/** + * Default unit: VAr + * In electric power transmission and distribution, volt-ampere reactive (VAr) is a unit of + * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are + * not in phase. + */ +#define VSCP_TYPE_MEASUREMENT64_REACTIVE_POWER 64 + +/** + * Default unit: kVArh + * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit + * during a time interval, measured in units of kVArh or standard multiples thereof. + */ +#define VSCP_TYPE_MEASUREMENT64_REACTIVE_ENERGY 65 + /******************************************************************************* MACROS *******************************************************************************/ diff --git a/src/framework/core/vscp_type_measurezone.h b/src/framework/core/vscp_type_measurezone.h index 4712fae..a1d8786 100644 --- a/src/framework/core/vscp_type_measurezone.h +++ b/src/framework/core/vscp_type_measurezone.h @@ -456,6 +456,43 @@ extern "C" */ #define VSCP_TYPE_MEASUREZONE_SOUND_LEVEL 60 +/** + * Default unit: sievert (Sv). + * Optional unit rem (1) + * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation). + */ +#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ 61 + +/** + * Default unit: coulomb per kilogram (C/kg). + * Optional unit: Röntgen/R (1) + * This is a measurement of a radiation dose (Exposed dose of ionizing radiation). + */ +#define VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EXPOSURE 62 + +/** + * Default unit: cos of phase angle. + * This is a measurment of a power factor. Power factor is an expression of energy efficiency. It is + * usually expressed as a percentage - and the lower the percentage, the less efficient power usage + * is. + */ +#define VSCP_TYPE_MEASUREZONE_POWER_FACTOR 63 + +/** + * Default unit: VAr + * In electric power transmission and distribution, volt-ampere reactive (VAr) is a unit of + * measurement of reactive power. Reactive power exists in AC circuit when the current and voltage are + * not in phase. + */ +#define VSCP_TYPE_MEASUREZONE_REACTIVE_POWER 64 + +/** + * Default unit: kVArh + * Reactive energy is the electrical energy produced, flowing or supplied by an electric circuit + * during a time interval, measured in units of kVArh or standard multiples thereof. + */ +#define VSCP_TYPE_MEASUREZONE_REACTIVE_ENERGY 65 + /******************************************************************************* MACROS *******************************************************************************/ diff --git a/src/framework/core/vscp_types.h b/src/framework/core/vscp_types.h index 1941255..53b16d7 100644 --- a/src/framework/core/vscp_types.h +++ b/src/framework/core/vscp_types.h @@ -218,6 +218,12 @@ extern "C" /** VSCP register: restore default configuration */ #define VSCP_REG_RESTORE_STD_CFG (VSCP_REGISTER_VSCP_START_ADDR + 34) +/** VSCP register: Firmware device code MSB */ +#define VSCP_REG_FIRMWARE_DEVICE_CODE_MSB (VSCP_REGISTER_VSCP_START_ADDR + 35) + +/** VSCP register: Firmware device code LSB */ +#define VSCP_REG_FIRMWARE_DEVICE_CODE_LSB (VSCP_REGISTER_VSCP_START_ADDR + 36) + /** VSCP register: GUID byte 15 (MSB) */ #define VSCP_REG_GUID_15 (VSCP_REGISTER_VSCP_START_ADDR + 80) @@ -302,7 +308,7 @@ typedef struct uint8_t vscpType; /**< VSCP type */ uint8_t oAddr; /**< Message originating address */ BOOL hardCoded; /**< Is hard coded node (TRUE) or dynamic node (FALSE) */ - uint8_t dataNum; /**< Number of data bytes */ + uint8_t dataSize; /**< Number used of data bytes */ /*@reldef@*/ uint8_t data[VSCP_L1_DATA_SIZE]; /**< Data */ diff --git a/src/framework/events/vscp_evt_alarm.c b/src/framework/events/vscp_evt_alarm.c index 2841fb3..71bba7e 100644 --- a/src/framework/events/vscp_evt_alarm.c +++ b/src/framework/events/vscp_evt_alarm.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_alarm_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_ALARM, VSCP_TYPE_ALARM_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_alarm_sendWarning(uint8_t onOff, uint8_t zone, uint8_t subZ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -120,20 +120,21 @@ extern BOOL vscp_evt_alarm_sendWarning(uint8_t onOff, uint8_t zone, uint8_t subZ /** * Alarm occurred * - * @param[in] onOff Alarm is on/off. + * @param[in] alarmRegister Alarm byte from standard register 128/0x80 or a code of choice describing + * the alarm. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_alarm_sendAlarmOccurred(uint8_t onOff, uint8_t zone, uint8_t subZone) +extern BOOL vscp_evt_alarm_sendAlarmOccurred(uint8_t alarmRegister, uint8_t zone, uint8_t subZone) { vscp_TxMessage txMsg; uint8_t size = 0; vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_ALARM, VSCP_TYPE_ALARM_ALARM, VSCP_PRIORITY_3_NORMAL); - txMsg.data[0] = onOff; + txMsg.data[0] = alarmRegister; size += 1; txMsg.data[1] = zone; @@ -142,7 +143,7 @@ extern BOOL vscp_evt_alarm_sendAlarmOccurred(uint8_t onOff, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -172,7 +173,7 @@ extern BOOL vscp_evt_alarm_sendAlarmSoundOnOff(uint8_t onOff, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -202,7 +203,7 @@ extern BOOL vscp_evt_alarm_sendAlarmLightOnOff(uint8_t onOff, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -232,7 +233,7 @@ extern BOOL vscp_evt_alarm_sendPowerOnOff(uint8_t onOff, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -262,7 +263,7 @@ extern BOOL vscp_evt_alarm_sendEmergencyStop(uint8_t onOff, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -292,7 +293,7 @@ extern BOOL vscp_evt_alarm_sendEmergencyPause(uint8_t onOff, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -322,7 +323,7 @@ extern BOOL vscp_evt_alarm_sendEmergencyReset(uint8_t onOff, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -352,7 +353,7 @@ extern BOOL vscp_evt_alarm_sendEmergencyResume(uint8_t onOff, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -382,7 +383,7 @@ extern BOOL vscp_evt_alarm_sendArm(uint8_t onOff, uint8_t zone, uint8_t subZone) txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -412,7 +413,7 @@ extern BOOL vscp_evt_alarm_sendDisarm(uint8_t onOff, uint8_t zone, uint8_t subZo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -442,7 +443,7 @@ extern BOOL vscp_evt_alarm_sendWatchdog(uint8_t index, uint8_t zone, uint8_t sub txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -450,7 +451,8 @@ extern BOOL vscp_evt_alarm_sendWatchdog(uint8_t index, uint8_t zone, uint8_t sub /** * Alarm reset * - * @param[in] alarmRegister Alarm byte from standard register 128/0x80. + * @param[in] alarmRegister Alarm byte from standard register 128/0x80 or a code of choice describing + * the alarm. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. * @@ -472,7 +474,7 @@ extern BOOL vscp_evt_alarm_sendAlarmReset(uint8_t alarmRegister, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_alarm.h b/src/framework/events/vscp_evt_alarm.h index 0863778..f4a7d4a 100644 --- a/src/framework/events/vscp_evt_alarm.h +++ b/src/framework/events/vscp_evt_alarm.h @@ -94,13 +94,14 @@ extern BOOL vscp_evt_alarm_sendWarning(uint8_t onOff, uint8_t zone, uint8_t subZ /** * Alarm occurred * - * @param[in] onOff Alarm is on/off. + * @param[in] alarmRegister Alarm byte from standard register 128/0x80 or a code of choice describing + * the alarm. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. * * @return If event is sent, it will return TRUE otherwise FALSE. */ -extern BOOL vscp_evt_alarm_sendAlarmOccurred(uint8_t onOff, uint8_t zone, uint8_t subZone); +extern BOOL vscp_evt_alarm_sendAlarmOccurred(uint8_t alarmRegister, uint8_t zone, uint8_t subZone); /** * Alarm sound on/off @@ -215,7 +216,8 @@ extern BOOL vscp_evt_alarm_sendWatchdog(uint8_t index, uint8_t zone, uint8_t sub /** * Alarm reset * - * @param[in] alarmRegister Alarm byte from standard register 128/0x80. + * @param[in] alarmRegister Alarm byte from standard register 128/0x80 or a code of choice describing + * the alarm. * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. * diff --git a/src/framework/events/vscp_evt_aol.c b/src/framework/events/vscp_evt_aol.c index 51673cf..e8a3cd4 100644 --- a/src/framework/events/vscp_evt_aol.c +++ b/src/framework/events/vscp_evt_aol.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_aol_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_AOL, VSCP_TYPE_AOL_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_aol_sendSystemUnpluggedFromPowerSource(uint8_t index, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -142,7 +142,7 @@ extern BOOL vscp_evt_aol_sendSystemUnpluggedFromNetwork(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -172,7 +172,7 @@ extern BOOL vscp_evt_aol_sendChassisIntrusion(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -202,7 +202,7 @@ extern BOOL vscp_evt_aol_sendProcessorRemoval(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -232,7 +232,7 @@ extern BOOL vscp_evt_aol_sendSystemEnvironmentalErrors(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -262,7 +262,7 @@ extern BOOL vscp_evt_aol_sendHighTemperature(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -292,7 +292,7 @@ extern BOOL vscp_evt_aol_sendFanSpeedProblem(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -322,7 +322,7 @@ extern BOOL vscp_evt_aol_sendVoltageFluctuations(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -352,7 +352,7 @@ extern BOOL vscp_evt_aol_sendOperatingSystemErrors(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -382,7 +382,7 @@ extern BOOL vscp_evt_aol_sendSystemPowerOnError(uint8_t index, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -412,7 +412,7 @@ extern BOOL vscp_evt_aol_sendSystemIsHung(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -442,7 +442,7 @@ extern BOOL vscp_evt_aol_sendComponentFailure(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -472,7 +472,7 @@ extern BOOL vscp_evt_aol_sendRemoteSystemRebootUponReportOfACriticalFailure(uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -502,7 +502,7 @@ extern BOOL vscp_evt_aol_sendRepairOperatingSystem(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -532,7 +532,7 @@ extern BOOL vscp_evt_aol_sendUpdateBiosImage(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -562,7 +562,7 @@ extern BOOL vscp_evt_aol_sendUpdatePerformOtherDiagnosticProcedures(uint8_t inde txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_configuration.c b/src/framework/events/vscp_evt_configuration.c index abfd975..3c0aa7e 100644 --- a/src/framework/events/vscp_evt_configuration.c +++ b/src/framework/events/vscp_evt_configuration.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_configuration_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_CONFIGURATION, VSCP_TYPE_CONFIGURATION_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -124,7 +124,7 @@ extern BOOL vscp_evt_configuration_sendLoadConfiguration(uint8_t index, uint8_t size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -147,7 +147,7 @@ extern BOOL vscp_evt_configuration_sendLoadConfigurationAcknowledge(uint16_t con txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -170,7 +170,7 @@ extern BOOL vscp_evt_configuration_sendLoadConfigurationNegativeAcknowledge(uint txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -212,7 +212,7 @@ extern BOOL vscp_evt_configuration_sendSaveConfiguration(uint8_t index, uint8_t size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -235,7 +235,7 @@ extern BOOL vscp_evt_configuration_sendSaveConfigurationAcknowledge(uint16_t con txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -258,7 +258,7 @@ extern BOOL vscp_evt_configuration_sendSaveConfigurationNegativeAcknowledge(uint txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -300,7 +300,7 @@ extern BOOL vscp_evt_configuration_sendCommitConfiguration(uint8_t index, uint8_ size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -323,7 +323,7 @@ extern BOOL vscp_evt_configuration_sendCommitConfigurationAcknowledge(uint16_t c txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -346,7 +346,7 @@ extern BOOL vscp_evt_configuration_sendCommitConfigurationNegativeAcknowledge(ui txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -388,7 +388,7 @@ extern BOOL vscp_evt_configuration_sendReloadConfiguration(uint8_t index, uint8_ size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -411,7 +411,7 @@ extern BOOL vscp_evt_configuration_sendReloadConfigurationAcknowledge(uint16_t c txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -434,7 +434,7 @@ extern BOOL vscp_evt_configuration_sendReloadConfigurationNegativeAcknowledge(ui txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -476,7 +476,7 @@ extern BOOL vscp_evt_configuration_sendRestoreConfiguration(uint8_t index, uint8 size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -499,7 +499,7 @@ extern BOOL vscp_evt_configuration_sendRestoreConfigurationAcknowledge(uint16_t txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -522,7 +522,7 @@ extern BOOL vscp_evt_configuration_sendRestoreConfigurationNegativeAcknowledge(u txMsg.data[1] = (uint8_t)((configurationid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -562,7 +562,7 @@ extern BOOL vscp_evt_configuration_sendSetParameter(uint8_t index, uint8_t zone, txMsg.data[6] = (uint8_t)((parametervalue >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -597,7 +597,7 @@ extern BOOL vscp_evt_configuration_sendSetParameterToDefault(uint8_t index, uint txMsg.data[4] = (uint8_t)((parameterid >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -625,7 +625,7 @@ extern BOOL vscp_evt_configuration_sendSetParameterAcknowledge(uint16_t paramete txMsg.data[3] = (uint8_t)((parametervalue >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -653,7 +653,7 @@ extern BOOL vscp_evt_configuration_sendSetParamterNegativeAcknowledge(uint16_t p txMsg.data[3] = (uint8_t)((parametervalue >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_control.c b/src/framework/events/vscp_evt_control.c index 1b44ed3..673d098 100644 --- a/src/framework/events/vscp_evt_control.c +++ b/src/framework/events/vscp_evt_control.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_control_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_CONTROL, VSCP_TYPE_CONTROL_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_control_sendMuteOnOff(uint8_t command, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -142,7 +142,7 @@ extern BOOL vscp_evt_control_sendAllLampSOnOff(uint8_t state, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -172,7 +172,7 @@ extern BOOL vscp_evt_control_sendOpen(uint8_t userSpecific, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -202,7 +202,7 @@ extern BOOL vscp_evt_control_sendClose(uint8_t userSpecific, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -232,7 +232,7 @@ extern BOOL vscp_evt_control_sendTurnon(uint8_t userSpecific, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -262,7 +262,7 @@ extern BOOL vscp_evt_control_sendTurnoff(uint8_t userSpecific, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -292,7 +292,7 @@ extern BOOL vscp_evt_control_sendStart(uint8_t userSpecific, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -322,7 +322,7 @@ extern BOOL vscp_evt_control_sendStop(uint8_t userSpecific, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -352,7 +352,7 @@ extern BOOL vscp_evt_control_sendReset(uint8_t userSpecific, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -382,7 +382,7 @@ extern BOOL vscp_evt_control_sendInterrupt(uint8_t interruptLevel, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -412,7 +412,7 @@ extern BOOL vscp_evt_control_sendSleep(uint8_t userSpecific, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -442,7 +442,7 @@ extern BOOL vscp_evt_control_sendWakeup(uint8_t userSpecific, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -472,7 +472,7 @@ extern BOOL vscp_evt_control_sendResume(uint8_t userSpecific, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -502,7 +502,7 @@ extern BOOL vscp_evt_control_sendPause(uint8_t userSpecific, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -532,7 +532,7 @@ extern BOOL vscp_evt_control_sendActivate(uint8_t userSpecific, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -562,7 +562,7 @@ extern BOOL vscp_evt_control_sendDeactivate(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -599,7 +599,7 @@ extern BOOL vscp_evt_control_sendDimLampS(uint8_t value, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -632,7 +632,7 @@ extern BOOL vscp_evt_control_sendChangeChannel(uint8_t channel, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -662,7 +662,7 @@ extern BOOL vscp_evt_control_sendChangeLevel(uint8_t level, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -692,7 +692,7 @@ extern BOOL vscp_evt_control_sendRelativeChangeLevel(uint8_t level, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -723,7 +723,7 @@ extern BOOL vscp_evt_control_sendMeasurementRequest(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -762,7 +762,7 @@ extern BOOL vscp_evt_control_sendStreamData(uint8_t index, uint8_t const * const } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -792,7 +792,7 @@ extern BOOL vscp_evt_control_sendSync(uint8_t index, uint8_t zone, uint8_t subZo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -839,7 +839,7 @@ extern BOOL vscp_evt_control_sendZonedStreamData(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -869,7 +869,7 @@ extern BOOL vscp_evt_control_sendSetPreSet(uint8_t presetCode, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -899,7 +899,7 @@ extern BOOL vscp_evt_control_sendToggleState(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -940,7 +940,7 @@ extern BOOL vscp_evt_control_sendTimedPulseOn(uint8_t userSpecific, uint8_t zone txMsg.data[7] = (uint8_t)((time >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -981,7 +981,7 @@ extern BOOL vscp_evt_control_sendTimedPulseOff(uint8_t userSpecific, uint8_t zon txMsg.data[7] = (uint8_t)((time >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1030,7 +1030,7 @@ extern BOOL vscp_evt_control_sendSetCountryLanguage(uint8_t code, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1064,7 +1064,7 @@ extern BOOL vscp_evt_control_sendBigChangeLevel(uint8_t index, uint8_t zone, uin /* level not supported! */ - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1094,7 +1094,7 @@ extern BOOL vscp_evt_control_sendMoveShutterUp(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1124,7 +1124,7 @@ extern BOOL vscp_evt_control_sendMoveShutterDown(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1154,7 +1154,7 @@ extern BOOL vscp_evt_control_sendMoveShutterLeft(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1184,7 +1184,7 @@ extern BOOL vscp_evt_control_sendMoveShutterRight(uint8_t index, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1214,7 +1214,7 @@ extern BOOL vscp_evt_control_sendMoveShutterToMiddlePosition(uint8_t index, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1244,7 +1244,7 @@ extern BOOL vscp_evt_control_sendMoveShutterToPresetPosition(uint8_t index, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1274,7 +1274,7 @@ extern BOOL vscp_evt_control_sendAllLampSOn(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1304,7 +1304,7 @@ extern BOOL vscp_evt_control_sendAllLampSOff(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1334,7 +1334,7 @@ extern BOOL vscp_evt_control_sendLock(uint8_t userSpecific, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1364,7 +1364,7 @@ extern BOOL vscp_evt_control_sendUnlock(uint8_t userSpecific, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1408,7 +1408,7 @@ extern BOOL vscp_evt_control_sendPwmSet(uint8_t repeats, uint8_t zone, uint8_t s txMsg.data[7] = (uint8_t)((timeOff >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1459,7 +1459,7 @@ extern BOOL vscp_evt_control_sendLockWithToken(uint8_t reserved, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1510,7 +1510,7 @@ extern BOOL vscp_evt_control_sendUnlockWithToken(uint8_t reserved, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1540,7 +1540,7 @@ extern BOOL vscp_evt_control_sendSetSecurityLevel(uint8_t securityLevel, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1591,7 +1591,7 @@ extern BOOL vscp_evt_control_sendSetSecurityPin(uint8_t reserved, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1642,7 +1642,7 @@ extern BOOL vscp_evt_control_sendSetSecurityPassword(uint8_t reserved, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1693,7 +1693,7 @@ extern BOOL vscp_evt_control_sendSetSecurityToken(uint8_t reserved, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1723,7 +1723,7 @@ extern BOOL vscp_evt_control_sendRequestNewSecurityToken(uint8_t reserved, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1772,7 +1772,7 @@ extern BOOL vscp_evt_control_sendIncrement(uint8_t userSpecific, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1821,7 +1821,7 @@ extern BOOL vscp_evt_control_sendDecrement(uint8_t userSpecific, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_data.c b/src/framework/events/vscp_evt_data.c index e72685b..f6581de 100644 --- a/src/framework/events/vscp_evt_data.c +++ b/src/framework/events/vscp_evt_data.c @@ -83,7 +83,7 @@ extern BOOL vscp_evt_data_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -104,10 +104,10 @@ extern BOOL vscp_evt_data_sendIOValue(uint8_t index, uint8_t unit, int32_t data, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_IO, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -128,10 +128,10 @@ extern BOOL vscp_evt_data_sendADValue(uint8_t index, uint8_t unit, int32_t data, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_AD, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -152,10 +152,10 @@ extern BOOL vscp_evt_data_sendDAValue(uint8_t index, uint8_t unit, int32_t data, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_DA, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -176,10 +176,10 @@ extern BOOL vscp_evt_data_sendRelativeStrength(uint8_t index, uint8_t unit, int3 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_RELATIVE_STRENGTH, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -200,10 +200,10 @@ extern BOOL vscp_evt_data_sendSignalLevel(uint8_t index, uint8_t unit, int32_t d vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_SIGNAL_LEVEL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -224,10 +224,10 @@ extern BOOL vscp_evt_data_sendSignalQuality(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DATA, VSCP_TYPE_DATA_SIGNAL_QUALITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_diagnostic.c b/src/framework/events/vscp_evt_diagnostic.c index 9d4a309..eb6c92a 100644 --- a/src/framework/events/vscp_evt_diagnostic.c +++ b/src/framework/events/vscp_evt_diagnostic.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_diagnostic_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DIAGNOSTIC, VSCP_TYPE_DIAGNOSTIC_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -130,7 +130,7 @@ extern BOOL vscp_evt_diagnostic_sendOvervoltage(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -178,7 +178,7 @@ extern BOOL vscp_evt_diagnostic_sendUndervoltage(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -226,7 +226,7 @@ extern BOOL vscp_evt_diagnostic_sendUsbVbusLow(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -274,7 +274,7 @@ extern BOOL vscp_evt_diagnostic_sendBatteryVoltageLow(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -322,7 +322,7 @@ extern BOOL vscp_evt_diagnostic_sendBatteryFullVoltage(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -370,7 +370,7 @@ extern BOOL vscp_evt_diagnostic_sendBatteryError(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -418,7 +418,7 @@ extern BOOL vscp_evt_diagnostic_sendBatteryOk(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -466,7 +466,7 @@ extern BOOL vscp_evt_diagnostic_sendOverCurrent(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -514,7 +514,7 @@ extern BOOL vscp_evt_diagnostic_sendCircuitError(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -562,7 +562,7 @@ extern BOOL vscp_evt_diagnostic_sendShortCircuit(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -610,7 +610,7 @@ extern BOOL vscp_evt_diagnostic_sendOpenCircuit(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -658,7 +658,7 @@ extern BOOL vscp_evt_diagnostic_sendMoist(uint8_t index, uint8_t zone, uint8_t s } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -706,7 +706,7 @@ extern BOOL vscp_evt_diagnostic_sendWireFailure(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -754,7 +754,7 @@ extern BOOL vscp_evt_diagnostic_sendWirelessFaliure(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -802,7 +802,7 @@ extern BOOL vscp_evt_diagnostic_sendIrFailure(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -850,7 +850,7 @@ extern BOOL vscp_evt_diagnostic_send1WireFailure(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -898,7 +898,7 @@ extern BOOL vscp_evt_diagnostic_sendRs222Failure(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -946,7 +946,7 @@ extern BOOL vscp_evt_diagnostic_sendRs232Failure(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -994,7 +994,7 @@ extern BOOL vscp_evt_diagnostic_sendRs423Failure(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1042,7 +1042,7 @@ extern BOOL vscp_evt_diagnostic_sendRs485Failure(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1090,7 +1090,7 @@ extern BOOL vscp_evt_diagnostic_sendCanFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1138,7 +1138,7 @@ extern BOOL vscp_evt_diagnostic_sendLanFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1186,7 +1186,7 @@ extern BOOL vscp_evt_diagnostic_sendUsbFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1234,7 +1234,7 @@ extern BOOL vscp_evt_diagnostic_sendWifiFailure(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1282,7 +1282,7 @@ extern BOOL vscp_evt_diagnostic_sendNfcRfidFailure(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1330,7 +1330,7 @@ extern BOOL vscp_evt_diagnostic_sendLowSignal(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1378,7 +1378,7 @@ extern BOOL vscp_evt_diagnostic_sendHighSignal(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1426,7 +1426,7 @@ extern BOOL vscp_evt_diagnostic_sendAdcFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1474,7 +1474,7 @@ extern BOOL vscp_evt_diagnostic_sendAluFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1522,7 +1522,7 @@ extern BOOL vscp_evt_diagnostic_sendAssert(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1570,7 +1570,7 @@ extern BOOL vscp_evt_diagnostic_sendDacFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1618,7 +1618,7 @@ extern BOOL vscp_evt_diagnostic_sendDmaFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1666,7 +1666,7 @@ extern BOOL vscp_evt_diagnostic_sendEthernetFailure(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1714,7 +1714,7 @@ extern BOOL vscp_evt_diagnostic_sendException(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1762,7 +1762,7 @@ extern BOOL vscp_evt_diagnostic_sendFpuFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1810,7 +1810,7 @@ extern BOOL vscp_evt_diagnostic_sendGpioFailure(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1858,7 +1858,7 @@ extern BOOL vscp_evt_diagnostic_sendI2cFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1906,7 +1906,7 @@ extern BOOL vscp_evt_diagnostic_sendI2sFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1954,7 +1954,7 @@ extern BOOL vscp_evt_diagnostic_sendInvalidConfiguration(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2002,7 +2002,7 @@ extern BOOL vscp_evt_diagnostic_sendMmuFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2050,7 +2050,7 @@ extern BOOL vscp_evt_diagnostic_sendNmiFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2098,7 +2098,7 @@ extern BOOL vscp_evt_diagnostic_sendOverheat(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2146,7 +2146,7 @@ extern BOOL vscp_evt_diagnostic_sendPllFail(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2194,7 +2194,7 @@ extern BOOL vscp_evt_diagnostic_sendPorFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2242,7 +2242,7 @@ extern BOOL vscp_evt_diagnostic_sendPwmFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2290,7 +2290,7 @@ extern BOOL vscp_evt_diagnostic_sendRamFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2338,7 +2338,7 @@ extern BOOL vscp_evt_diagnostic_sendRomFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2386,7 +2386,7 @@ extern BOOL vscp_evt_diagnostic_sendSpiFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2434,7 +2434,7 @@ extern BOOL vscp_evt_diagnostic_sendStackFailure(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2482,7 +2482,7 @@ extern BOOL vscp_evt_diagnostic_sendLinBusFailure(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2530,7 +2530,7 @@ extern BOOL vscp_evt_diagnostic_sendUartFailure(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2578,7 +2578,7 @@ extern BOOL vscp_evt_diagnostic_sendUnhandledInterrupt(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2626,7 +2626,7 @@ extern BOOL vscp_evt_diagnostic_sendMemoryFailure(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2674,7 +2674,7 @@ extern BOOL vscp_evt_diagnostic_sendVariableRangeFailure(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2722,7 +2722,7 @@ extern BOOL vscp_evt_diagnostic_sendWdtFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2770,7 +2770,7 @@ extern BOOL vscp_evt_diagnostic_sendEepromFailure(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2818,7 +2818,7 @@ extern BOOL vscp_evt_diagnostic_sendEncryptionFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2866,7 +2866,7 @@ extern BOOL vscp_evt_diagnostic_sendBadUserInputFailure(uint8_t index, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2914,7 +2914,7 @@ extern BOOL vscp_evt_diagnostic_sendDecryptionFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2962,7 +2962,7 @@ extern BOOL vscp_evt_diagnostic_sendNoise(uint8_t index, uint8_t zone, uint8_t s } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3010,7 +3010,7 @@ extern BOOL vscp_evt_diagnostic_sendBootLoaderFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3058,7 +3058,7 @@ extern BOOL vscp_evt_diagnostic_sendProgramFlowFailure(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3106,7 +3106,7 @@ extern BOOL vscp_evt_diagnostic_sendRtcFaiure(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3154,7 +3154,7 @@ extern BOOL vscp_evt_diagnostic_sendSystemTestFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3202,7 +3202,7 @@ extern BOOL vscp_evt_diagnostic_sendSensorFailure(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3250,7 +3250,7 @@ extern BOOL vscp_evt_diagnostic_sendSafeStateEntered(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3298,7 +3298,7 @@ extern BOOL vscp_evt_diagnostic_sendSignalImplausible(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3346,7 +3346,7 @@ extern BOOL vscp_evt_diagnostic_sendStorageFail(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3394,7 +3394,7 @@ extern BOOL vscp_evt_diagnostic_sendSelfTestOk(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3442,7 +3442,7 @@ extern BOOL vscp_evt_diagnostic_sendEsdEmcEmiFailure(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3490,7 +3490,7 @@ extern BOOL vscp_evt_diagnostic_sendTimeout(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3538,7 +3538,7 @@ extern BOOL vscp_evt_diagnostic_sendLcdFailure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3586,7 +3586,7 @@ extern BOOL vscp_evt_diagnostic_sendTouchPanelFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3634,7 +3634,7 @@ extern BOOL vscp_evt_diagnostic_sendNoLoad(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3682,7 +3682,7 @@ extern BOOL vscp_evt_diagnostic_sendCoolingFailure(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3730,7 +3730,7 @@ extern BOOL vscp_evt_diagnostic_sendHeatingFailure(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3778,7 +3778,7 @@ extern BOOL vscp_evt_diagnostic_sendTransmissionFailure(uint8_t index, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3826,7 +3826,7 @@ extern BOOL vscp_evt_diagnostic_sendReceiptionFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3874,7 +3874,7 @@ extern BOOL vscp_evt_diagnostic_sendExternalIcFailure(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3922,7 +3922,7 @@ extern BOOL vscp_evt_diagnostic_sendChargingOn(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3970,7 +3970,7 @@ extern BOOL vscp_evt_diagnostic_sendChargingOff(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_display.c b/src/framework/events/vscp_evt_display.c index c08f367..dce9e8d 100644 --- a/src/framework/events/vscp_evt_display.c +++ b/src/framework/events/vscp_evt_display.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_display_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_DISPLAY, VSCP_TYPE_DISPLAY_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_display_sendClearDisplay(uint8_t code, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -150,7 +150,7 @@ extern BOOL vscp_evt_display_sendPositionCursor(uint8_t index, uint8_t zone, uin txMsg.data[4] = column; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -199,7 +199,7 @@ extern BOOL vscp_evt_display_sendWriteDisplay(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -248,7 +248,7 @@ extern BOOL vscp_evt_display_sendWriteDisplayBuffer(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -278,7 +278,7 @@ extern BOOL vscp_evt_display_sendShowDisplayBuffer(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -323,7 +323,7 @@ extern BOOL vscp_evt_display_sendSetDisplayBufferParameter(uint8_t index, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -372,7 +372,7 @@ extern BOOL vscp_evt_display_sendShowText(uint8_t index, uint8_t zone, uint8_t s } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -416,7 +416,7 @@ extern BOOL vscp_evt_display_sendSetLed(uint8_t index, uint8_t zone, uint8_t sub txMsg.data[7] = (uint8_t)((blinkOffPeriod >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -458,7 +458,7 @@ extern BOOL vscp_evt_display_sendSetRgbColor(uint8_t index, uint8_t zone, uint8_ txMsg.data[5] = blue; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_error.c b/src/framework/events/vscp_evt_error.c index 0a4a1f5..277c2a0 100644 --- a/src/framework/events/vscp_evt_error.c +++ b/src/framework/events/vscp_evt_error.c @@ -114,7 +114,7 @@ extern BOOL vscp_evt_error_sendSuccess(uint8_t index, uint8_t zone, uint8_t subZ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -162,7 +162,7 @@ extern BOOL vscp_evt_error_sendError(uint8_t index, uint8_t zone, uint8_t subZon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -210,7 +210,7 @@ extern BOOL vscp_evt_error_sendChannelError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -258,7 +258,7 @@ extern BOOL vscp_evt_error_sendFifoEmptyError(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -306,7 +306,7 @@ extern BOOL vscp_evt_error_sendFifoFullError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -354,7 +354,7 @@ extern BOOL vscp_evt_error_sendFifoSizeError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -402,7 +402,7 @@ extern BOOL vscp_evt_error_sendFifoWaitError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -450,7 +450,7 @@ extern BOOL vscp_evt_error_sendGenericError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -498,7 +498,7 @@ extern BOOL vscp_evt_error_sendHardwareError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -546,7 +546,7 @@ extern BOOL vscp_evt_error_sendInitializationError(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -594,7 +594,7 @@ extern BOOL vscp_evt_error_sendMissingInitializationError(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -642,7 +642,7 @@ extern BOOL vscp_evt_error_sendInitializationReady(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -690,7 +690,7 @@ extern BOOL vscp_evt_error_sendNotSupported(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -738,7 +738,7 @@ extern BOOL vscp_evt_error_sendOverrunError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -786,7 +786,7 @@ extern BOOL vscp_evt_error_sendReceiverEmptyError(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -834,7 +834,7 @@ extern BOOL vscp_evt_error_sendRegisterError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -882,7 +882,7 @@ extern BOOL vscp_evt_error_sendTransmitterFullError(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -930,7 +930,7 @@ extern BOOL vscp_evt_error_sendLibraryError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -978,7 +978,7 @@ extern BOOL vscp_evt_error_sendProceduralAddressError(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1026,7 +1026,7 @@ extern BOOL vscp_evt_error_sendOnlyOneInstanceError(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1074,7 +1074,7 @@ extern BOOL vscp_evt_error_sendSubDriverError(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1122,7 +1122,7 @@ extern BOOL vscp_evt_error_sendTimeoutError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1170,7 +1170,7 @@ extern BOOL vscp_evt_error_sendNotOpenError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1218,7 +1218,7 @@ extern BOOL vscp_evt_error_sendParameterError(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1266,7 +1266,7 @@ extern BOOL vscp_evt_error_sendMemoryError(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1314,7 +1314,7 @@ extern BOOL vscp_evt_error_sendInternalError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1362,7 +1362,7 @@ extern BOOL vscp_evt_error_sendCommunicationError(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1410,7 +1410,7 @@ extern BOOL vscp_evt_error_sendUserError(uint8_t index, uint8_t zone, uint8_t su } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1458,7 +1458,7 @@ extern BOOL vscp_evt_error_sendPasswordError(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1506,7 +1506,7 @@ extern BOOL vscp_evt_error_sendConnectionError(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1554,7 +1554,7 @@ extern BOOL vscp_evt_error_sendInvalidHandleError(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1602,7 +1602,7 @@ extern BOOL vscp_evt_error_sendOperationFailedError(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1650,7 +1650,7 @@ extern BOOL vscp_evt_error_sendSuppliedBufferIsToSmallToFitContent(uint8_t index } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1698,7 +1698,7 @@ extern BOOL vscp_evt_error_sendRequestedItemIsUnknown(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1746,7 +1746,7 @@ extern BOOL vscp_evt_error_sendNameIsAlreadyInUse(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1794,7 +1794,7 @@ extern BOOL vscp_evt_error_sendErrorWhenWritingData(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1842,7 +1842,7 @@ extern BOOL vscp_evt_error_sendOperationStoppedOrAborted(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1890,7 +1890,7 @@ extern BOOL vscp_evt_error_sendPointerWithInvalidValue(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_gnss.c b/src/framework/events/vscp_evt_gnss.c index a7305be..bf50147 100644 --- a/src/framework/events/vscp_evt_gnss.c +++ b/src/framework/events/vscp_evt_gnss.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_gnss_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_GNSS, VSCP_TYPE_GNSS_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -114,7 +114,7 @@ extern BOOL vscp_evt_gnss_sendPosition(float_t latitude, float_t longitude) txMsg.data[7] = ((uint8_t*)&longitude)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -136,7 +136,7 @@ extern BOOL vscp_evt_gnss_sendSatellites(uint8_t count) txMsg.data[0] = count; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_information.c b/src/framework/events/vscp_evt_information.c index 5d0a4a1..1688c49 100644 --- a/src/framework/events/vscp_evt_information.c +++ b/src/framework/events/vscp_evt_information.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_information_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_INFORMATION, VSCP_TYPE_INFORMATION_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -125,7 +125,7 @@ extern BOOL vscp_evt_information_sendButton(uint8_t buttonState, uint8_t zone, u size += 2; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -166,7 +166,7 @@ extern BOOL vscp_evt_information_sendMouse(uint8_t kindOfCoordinates, uint8_t zo txMsg.data[6] = (uint8_t)((normalizedYCoordinate >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -196,7 +196,7 @@ extern BOOL vscp_evt_information_sendOn(uint8_t index, uint8_t zone, uint8_t sub txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -226,7 +226,7 @@ extern BOOL vscp_evt_information_sendOff(uint8_t index, uint8_t zone, uint8_t su txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -256,7 +256,7 @@ extern BOOL vscp_evt_information_sendAlive(uint8_t userSpecific, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -286,7 +286,7 @@ extern BOOL vscp_evt_information_sendTerminating(uint8_t userSpecific, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -316,7 +316,7 @@ extern BOOL vscp_evt_information_sendOpened(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -346,7 +346,7 @@ extern BOOL vscp_evt_information_sendClosed(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -393,7 +393,7 @@ extern BOOL vscp_evt_information_sendNodeHeartbeat(uint8_t userSpecific, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -423,7 +423,7 @@ extern BOOL vscp_evt_information_sendBelowLimit(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -453,7 +453,7 @@ extern BOOL vscp_evt_information_sendAboveLimit(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -483,7 +483,7 @@ extern BOOL vscp_evt_information_sendPulse(uint8_t reserved, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -513,7 +513,7 @@ extern BOOL vscp_evt_information_sendError(uint8_t reserved, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -543,7 +543,7 @@ extern BOOL vscp_evt_information_sendResumed(uint8_t reserved, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -573,7 +573,7 @@ extern BOOL vscp_evt_information_sendPaused(uint8_t reserved, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -603,7 +603,7 @@ extern BOOL vscp_evt_information_sendSleeping(uint8_t reserved, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -633,7 +633,7 @@ extern BOOL vscp_evt_information_sendGoodMorning(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -663,7 +663,7 @@ extern BOOL vscp_evt_information_sendGoodDay(uint8_t reserved, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -693,7 +693,7 @@ extern BOOL vscp_evt_information_sendGoodAfternoon(uint8_t reserved, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -723,7 +723,7 @@ extern BOOL vscp_evt_information_sendGoodEvening(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -753,7 +753,7 @@ extern BOOL vscp_evt_information_sendGoodNight(uint8_t reserved, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -783,7 +783,7 @@ extern BOOL vscp_evt_information_sendSeeYouSoon(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -813,7 +813,7 @@ extern BOOL vscp_evt_information_sendGoodbye(uint8_t reserved, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -843,7 +843,7 @@ extern BOOL vscp_evt_information_sendStop(uint8_t reserved, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -873,7 +873,7 @@ extern BOOL vscp_evt_information_sendStart(uint8_t reserved, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -903,7 +903,7 @@ extern BOOL vscp_evt_information_sendResetcompleted(uint8_t reserved, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -933,7 +933,7 @@ extern BOOL vscp_evt_information_sendInterrupted(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -963,7 +963,7 @@ extern BOOL vscp_evt_information_sendPreparingtosleep(uint8_t reserved, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -993,7 +993,7 @@ extern BOOL vscp_evt_information_sendWokenup(uint8_t reserved, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1023,7 +1023,7 @@ extern BOOL vscp_evt_information_sendDusk(uint8_t reserved, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1053,7 +1053,7 @@ extern BOOL vscp_evt_information_sendDawn(uint8_t reserved, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1083,7 +1083,7 @@ extern BOOL vscp_evt_information_sendActive(uint8_t reserved, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1113,7 +1113,7 @@ extern BOOL vscp_evt_information_sendInactive(uint8_t reserved, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1143,7 +1143,7 @@ extern BOOL vscp_evt_information_sendBusy(uint8_t reserved, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1173,7 +1173,7 @@ extern BOOL vscp_evt_information_sendIdle(uint8_t reserved, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1216,7 +1216,7 @@ extern BOOL vscp_evt_information_sendStreamData(uint8_t sequenceNumber, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1270,7 +1270,7 @@ extern BOOL vscp_evt_information_sendTokenActivity(uint8_t tokenType, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1321,7 +1321,7 @@ extern BOOL vscp_evt_information_sendStreamDataWithZone(uint8_t zone, uint8_t su } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1361,7 +1361,7 @@ extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint txMsg.data[6] = (uint8_t)((type >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1391,7 +1391,7 @@ extern BOOL vscp_evt_information_sendLevelChanged(uint8_t level, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1421,7 +1421,7 @@ extern BOOL vscp_evt_information_sendWarning(uint8_t level, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1459,7 +1459,7 @@ extern BOOL vscp_evt_information_sendState(uint8_t userSpecific, uint8_t zone, u txMsg.data[4] = to; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1489,7 +1489,7 @@ extern BOOL vscp_evt_information_sendActionTrigger(uint8_t actionId, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1519,7 +1519,7 @@ extern BOOL vscp_evt_information_sendSunrise(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1549,7 +1549,7 @@ extern BOOL vscp_evt_information_sendSunset(uint8_t userSpecific, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1583,7 +1583,7 @@ extern BOOL vscp_evt_information_sendStartOfRecord(uint8_t index, uint8_t zone, txMsg.data[3] = remainingFrames; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1613,7 +1613,7 @@ extern BOOL vscp_evt_information_sendEndOfRecord(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1647,7 +1647,7 @@ extern BOOL vscp_evt_information_sendPreSetActive(uint8_t user, uint8_t zone, ui txMsg.data[2] = preSetCode; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1677,7 +1677,7 @@ extern BOOL vscp_evt_information_sendDetect(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1707,7 +1707,7 @@ extern BOOL vscp_evt_information_sendOverflow(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1757,7 +1757,7 @@ extern BOOL vscp_evt_information_sendBigLevelChanged(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1787,7 +1787,7 @@ extern BOOL vscp_evt_information_sendCivilSunriseTwilightTime(uint8_t userSpecif txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1817,7 +1817,7 @@ extern BOOL vscp_evt_information_sendCivilSunsetTwilightTime(uint8_t userSpecifi txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1847,7 +1847,7 @@ extern BOOL vscp_evt_information_sendNauticalSunriseTwilightTime(uint8_t userSpe txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1877,7 +1877,7 @@ extern BOOL vscp_evt_information_sendNauticalSunsetTwilightTime(uint8_t userSpec txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1907,7 +1907,7 @@ extern BOOL vscp_evt_information_sendAstronomicalSunriseTwilightTime(uint8_t use txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1937,7 +1937,7 @@ extern BOOL vscp_evt_information_sendAstronomicalSunsetTwilightTime(uint8_t user txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1967,7 +1967,7 @@ extern BOOL vscp_evt_information_sendCalculatedNoon(uint8_t reserved, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1997,7 +1997,7 @@ extern BOOL vscp_evt_information_sendShutterUp(uint8_t reserved, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2027,7 +2027,7 @@ extern BOOL vscp_evt_information_sendShutterDown(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2057,7 +2057,7 @@ extern BOOL vscp_evt_information_sendShutterLeft(uint8_t reserved, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2087,7 +2087,7 @@ extern BOOL vscp_evt_information_sendShutterRight(uint8_t reserved, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2117,7 +2117,7 @@ extern BOOL vscp_evt_information_sendShutterReachedTopEnd(uint8_t reserved, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2147,7 +2147,7 @@ extern BOOL vscp_evt_information_sendShutterReachedBottomEnd(uint8_t reserved, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2177,7 +2177,7 @@ extern BOOL vscp_evt_information_sendShutterReachedMiddleEnd(uint8_t reserved, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2207,7 +2207,7 @@ extern BOOL vscp_evt_information_sendShutterReachedPresetEnd(uint8_t reserved, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2237,7 +2237,7 @@ extern BOOL vscp_evt_information_sendShutterReachedPresetLeft(uint8_t reserved, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2267,7 +2267,7 @@ extern BOOL vscp_evt_information_sendShutterReachedPresetRight(uint8_t reserved, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2297,7 +2297,7 @@ extern BOOL vscp_evt_information_sendLongClick(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2327,7 +2327,7 @@ extern BOOL vscp_evt_information_sendSingleClick(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2357,7 +2357,7 @@ extern BOOL vscp_evt_information_sendDoubleClick(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2403,7 +2403,7 @@ extern BOOL vscp_evt_information_sendDate(uint8_t index, uint8_t zone, uint8_t s txMsg.data[6] = day; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2450,7 +2450,7 @@ extern BOOL vscp_evt_information_sendTime(uint8_t index, uint8_t zone, uint8_t s txMsg.data[7] = (uint8_t)((milliseconds >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2484,7 +2484,7 @@ extern BOOL vscp_evt_information_sendWeekday(uint8_t index, uint8_t zone, uint8_ txMsg.data[3] = weekday; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2514,7 +2514,7 @@ extern BOOL vscp_evt_information_sendLock(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2544,7 +2544,7 @@ extern BOOL vscp_evt_information_sendUnlock(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2593,7 +2593,7 @@ extern BOOL vscp_evt_information_sendDatetime(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2623,7 +2623,7 @@ extern BOOL vscp_evt_information_sendRising(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2653,7 +2653,7 @@ extern BOOL vscp_evt_information_sendFalling(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2683,7 +2683,7 @@ extern BOOL vscp_evt_information_sendUpdated(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2713,7 +2713,7 @@ extern BOOL vscp_evt_information_sendConnect(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2743,7 +2743,7 @@ extern BOOL vscp_evt_information_sendDisconnect(uint8_t index, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2773,7 +2773,7 @@ extern BOOL vscp_evt_information_sendReconnect(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2803,7 +2803,7 @@ extern BOOL vscp_evt_information_sendEnter(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2833,7 +2833,7 @@ extern BOOL vscp_evt_information_sendExit(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2881,7 +2881,7 @@ extern BOOL vscp_evt_information_sendIncremented(uint8_t userSpecific, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2929,7 +2929,7 @@ extern BOOL vscp_evt_information_sendDecremented(uint8_t userSpecific, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2967,7 +2967,7 @@ extern BOOL vscp_evt_information_sendProximityDetected(uint8_t userSpecific, uin size += 2; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_ir.c b/src/framework/events/vscp_evt_ir.c index 8e957a9..3eeffaa 100644 --- a/src/framework/events/vscp_evt_ir.c +++ b/src/framework/events/vscp_evt_ir.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_ir_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_IR, VSCP_TYPE_REMOTE_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_ir_sendRc5SendReceive(uint8_t code, uint8_t adress, uint8_t txMsg.data[2] = repeat; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -142,7 +142,7 @@ extern BOOL vscp_evt_ir_sendSony12BitSendReceive(uint8_t code, uint8_t adress, u txMsg.data[2] = repeat; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -192,7 +192,7 @@ extern BOOL vscp_evt_ir_sendLircLinuxInfraredRemoteControl(uint8_t code6, uint8_ txMsg.data[7] = repeat; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -227,7 +227,7 @@ extern BOOL vscp_evt_ir_sendVscpAbstractRemoteFormat(uint16_t code, uint8_t zone txMsg.data[4] = repeat; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -268,7 +268,7 @@ extern BOOL vscp_evt_ir_sendMapitoRemoteFormat(uint8_t repeat, uint8_t zone, uin txMsg.data[7] = keyCode; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_log.c b/src/framework/events/vscp_evt_log.c index 4b37f99..53e3666 100644 --- a/src/framework/events/vscp_evt_log.c +++ b/src/framework/events/vscp_evt_log.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_log_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_LOG, VSCP_TYPE_LOG_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -131,7 +131,7 @@ extern BOOL vscp_evt_log_sendLogEvent(uint8_t id, uint8_t logLevel, uint8_t inde } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -153,7 +153,7 @@ extern BOOL vscp_evt_log_sendLogStart(uint8_t id) txMsg.data[0] = id; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -175,7 +175,7 @@ extern BOOL vscp_evt_log_sendLogStop(uint8_t id) txMsg.data[0] = id; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -197,7 +197,7 @@ extern BOOL vscp_evt_log_sendLogLevel(uint8_t level) txMsg.data[0] = level; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_measurement.c b/src/framework/events/vscp_evt_measurement.c index b3bbae2..0613cfc 100644 --- a/src/framework/events/vscp_evt_measurement.c +++ b/src/framework/events/vscp_evt_measurement.c @@ -83,7 +83,7 @@ extern BOOL vscp_evt_measurement_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -104,10 +104,10 @@ extern BOOL vscp_evt_measurement_sendCount(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_COUNT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -128,10 +128,10 @@ extern BOOL vscp_evt_measurement_sendLengthDistance(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_LENGTH, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -152,10 +152,10 @@ extern BOOL vscp_evt_measurement_sendMass(uint8_t index, uint8_t unit, int32_t d vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_MASS, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -176,10 +176,10 @@ extern BOOL vscp_evt_measurement_sendTime(uint8_t index, uint8_t unit, int32_t d vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_TIME, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -200,10 +200,10 @@ extern BOOL vscp_evt_measurement_sendElectricCurrent(uint8_t index, uint8_t unit vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRIC_CURRENT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -224,10 +224,10 @@ extern BOOL vscp_evt_measurement_sendTemperature(uint8_t index, uint8_t unit, in vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_TEMPERATURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -248,10 +248,10 @@ extern BOOL vscp_evt_measurement_sendAmountOfSubstance(uint8_t index, uint8_t un vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_AMOUNT_OF_SUBSTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -272,10 +272,10 @@ extern BOOL vscp_evt_measurement_sendLuminousIntensityIntensityOfLight(uint8_t i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_INTENSITY_OF_LIGHT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -296,10 +296,10 @@ extern BOOL vscp_evt_measurement_sendFrequency(uint8_t index, uint8_t unit, int3 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_FREQUENCY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -320,10 +320,10 @@ extern BOOL vscp_evt_measurement_sendRadioactivityAndOtherRandomEvents(uint8_t i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIOACTIVITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -344,10 +344,10 @@ extern BOOL vscp_evt_measurement_sendForce(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_FORCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -368,10 +368,10 @@ extern BOOL vscp_evt_measurement_sendPressure(uint8_t index, uint8_t unit, int32 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_PRESSURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -392,10 +392,10 @@ extern BOOL vscp_evt_measurement_sendEnergy(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ENERGY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -416,10 +416,10 @@ extern BOOL vscp_evt_measurement_sendPower(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_POWER, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -440,10 +440,10 @@ extern BOOL vscp_evt_measurement_sendElectricalCharge(uint8_t index, uint8_t uni vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRICAL_CHARGE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -464,10 +464,10 @@ extern BOOL vscp_evt_measurement_sendElectricalPotentialVoltage(uint8_t index, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRICAL_POTENTIAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -488,10 +488,10 @@ extern BOOL vscp_evt_measurement_sendElectricalCapacitance(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRICAL_CAPACITANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -512,10 +512,10 @@ extern BOOL vscp_evt_measurement_sendElectricalResistance(uint8_t index, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRICAL_RESISTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -536,10 +536,10 @@ extern BOOL vscp_evt_measurement_sendElectricalConductance(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRICAL_CONDUCTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -560,10 +560,10 @@ extern BOOL vscp_evt_measurement_sendMagneticFieldStrength(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_MAGNETIC_FIELD_STRENGTH, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -584,10 +584,10 @@ extern BOOL vscp_evt_measurement_sendMagneticFlux(uint8_t index, uint8_t unit, i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_MAGNETIC_FLUX, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -608,10 +608,10 @@ extern BOOL vscp_evt_measurement_sendMagneticFluxDensity(uint8_t index, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_MAGNETIC_FLUX_DENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -632,10 +632,10 @@ extern BOOL vscp_evt_measurement_sendInductance(uint8_t index, uint8_t unit, int vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_INDUCTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -656,10 +656,10 @@ extern BOOL vscp_evt_measurement_sendLuminousFlux(uint8_t index, uint8_t unit, i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_FLUX_OF_LIGHT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -680,10 +680,10 @@ extern BOOL vscp_evt_measurement_sendIlluminance(uint8_t index, uint8_t unit, in vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ILLUMINANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -704,10 +704,10 @@ extern BOOL vscp_evt_measurement_sendRadiationDose(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -728,10 +728,10 @@ extern BOOL vscp_evt_measurement_sendCatalyticActivity(uint8_t index, uint8_t un vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_CATALYTIC_ACITIVITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -752,10 +752,10 @@ extern BOOL vscp_evt_measurement_sendVolume(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_VOLUME, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -776,10 +776,10 @@ extern BOOL vscp_evt_measurement_sendSoundIntensity(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SOUND_INTENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -800,10 +800,10 @@ extern BOOL vscp_evt_measurement_sendAngleDirectionOrSimilar(uint8_t index, uint vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ANGLE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -824,10 +824,10 @@ extern BOOL vscp_evt_measurement_sendPositionWgs84(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_POSITION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -848,10 +848,10 @@ extern BOOL vscp_evt_measurement_sendSpeed(uint8_t index, uint8_t unit, int32_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SPEED, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -872,10 +872,10 @@ extern BOOL vscp_evt_measurement_sendAcceleration(uint8_t index, uint8_t unit, i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ACCELERATION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -896,10 +896,10 @@ extern BOOL vscp_evt_measurement_sendTension(uint8_t index, uint8_t unit, int32_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_TENSION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -920,10 +920,10 @@ extern BOOL vscp_evt_measurement_sendDampMoistHygrometerReading(uint8_t index, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_HUMIDITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -944,10 +944,10 @@ extern BOOL vscp_evt_measurement_sendFlow(uint8_t index, uint8_t unit, int32_t d vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_FLOW, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -968,10 +968,10 @@ extern BOOL vscp_evt_measurement_sendThermalResistance(uint8_t index, uint8_t un vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_THERMAL_RESISTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -992,10 +992,10 @@ extern BOOL vscp_evt_measurement_sendRefractiveOpticalPower(uint8_t index, uint8 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_REFRACTIVE_POWER, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1016,10 +1016,10 @@ extern BOOL vscp_evt_measurement_sendDynamicViscosity(uint8_t index, uint8_t uni vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_DYNAMIC_VISCOSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1040,10 +1040,10 @@ extern BOOL vscp_evt_measurement_sendSoundImpedance(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SOUND_IMPEDANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1064,10 +1064,10 @@ extern BOOL vscp_evt_measurement_sendSoundResistance(uint8_t index, uint8_t unit vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SOUND_RESISTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1088,10 +1088,10 @@ extern BOOL vscp_evt_measurement_sendElectricElastance(uint8_t index, uint8_t un vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ELECTRIC_ELASTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1112,10 +1112,10 @@ extern BOOL vscp_evt_measurement_sendLuminousEnergy(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_LUMINOUS_ENERGY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1136,10 +1136,10 @@ extern BOOL vscp_evt_measurement_sendLuminance(uint8_t index, uint8_t unit, int3 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_LUMINANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1160,10 +1160,10 @@ extern BOOL vscp_evt_measurement_sendChemicalConcentration(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1186,10 +1186,10 @@ extern BOOL vscp_evt_measurement_sendDoseEquivalent(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1212,10 +1212,10 @@ extern BOOL vscp_evt_measurement_sendDewPoint(uint8_t index, uint8_t unit, int32 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_DEWPOINT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1236,10 +1236,10 @@ extern BOOL vscp_evt_measurement_sendRelativeLevel(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RELATIVE_LEVEL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1260,10 +1260,10 @@ extern BOOL vscp_evt_measurement_sendAltitude(uint8_t index, uint8_t unit, int32 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_ALTITUDE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1284,10 +1284,10 @@ extern BOOL vscp_evt_measurement_sendArea(uint8_t index, uint8_t unit, int32_t d vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_AREA, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1308,10 +1308,10 @@ extern BOOL vscp_evt_measurement_sendRadiantIntensity(uint8_t index, uint8_t uni vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIANT_INTENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1332,10 +1332,10 @@ extern BOOL vscp_evt_measurement_sendRadiance(uint8_t index, uint8_t unit, int32 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1356,10 +1356,10 @@ extern BOOL vscp_evt_measurement_sendIrradianceExitanceRadiosity(uint8_t index, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_IRRADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1380,10 +1380,10 @@ extern BOOL vscp_evt_measurement_sendSpectralRadiance(uint8_t index, uint8_t uni vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SPECTRAL_RADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1404,10 +1404,10 @@ extern BOOL vscp_evt_measurement_sendSpectralIrradiance(uint8_t index, uint8_t u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SPECTRAL_IRRADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1428,10 +1428,10 @@ extern BOOL vscp_evt_measurement_sendSoundPressureAcousticPressure(uint8_t index vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SOUND_PRESSURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1452,10 +1452,10 @@ extern BOOL vscp_evt_measurement_sendSoundEnergyDensity(uint8_t index, uint8_t u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SOUND_DENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1476,10 +1476,10 @@ extern BOOL vscp_evt_measurement_sendSoundLevel(uint8_t index, uint8_t unit, int vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_SOUND_LEVEL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1500,10 +1500,10 @@ extern BOOL vscp_evt_measurement_sendRadiationDoseEquivalent(uint8_t index, uint vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1524,10 +1524,10 @@ extern BOOL vscp_evt_measurement_sendRadiationDoseExposure(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EXPOSURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1548,10 +1548,10 @@ extern BOOL vscp_evt_measurement_sendPowerFactor(uint8_t index, uint8_t unit, in vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_POWER_FACTOR, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1572,10 +1572,10 @@ extern BOOL vscp_evt_measurement_sendReactivePower(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_REACTIVE_POWER, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1596,10 +1596,10 @@ extern BOOL vscp_evt_measurement_sendReactiveEnergy(uint8_t index, uint8_t unit, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_REACTIVE_ENERGY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 1; + txMsg.dataSize = 1; txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index); - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[1], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_measurement32.c b/src/framework/events/vscp_evt_measurement32.c index 10b0a22..08ae67a 100644 --- a/src/framework/events/vscp_evt_measurement32.c +++ b/src/framework/events/vscp_evt_measurement32.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_measurement32_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -107,7 +107,7 @@ extern BOOL vscp_evt_measurement32_sendCount(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -132,7 +132,7 @@ extern BOOL vscp_evt_measurement32_sendLengthDistance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -157,7 +157,7 @@ extern BOOL vscp_evt_measurement32_sendMass(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -182,7 +182,7 @@ extern BOOL vscp_evt_measurement32_sendTime(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -207,7 +207,7 @@ extern BOOL vscp_evt_measurement32_sendElectricCurrent(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -232,7 +232,7 @@ extern BOOL vscp_evt_measurement32_sendTemperature(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -257,7 +257,7 @@ extern BOOL vscp_evt_measurement32_sendAmountOfSubstance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -282,7 +282,7 @@ extern BOOL vscp_evt_measurement32_sendLuminousIntensityIntensityOfLight(float_t txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -307,7 +307,7 @@ extern BOOL vscp_evt_measurement32_sendFrequency(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -332,7 +332,7 @@ extern BOOL vscp_evt_measurement32_sendRadioactivityAndOtherRandomEvents(float_t txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -357,7 +357,7 @@ extern BOOL vscp_evt_measurement32_sendForce(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -382,7 +382,7 @@ extern BOOL vscp_evt_measurement32_sendPressure(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -407,7 +407,7 @@ extern BOOL vscp_evt_measurement32_sendEnergy(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -432,7 +432,7 @@ extern BOOL vscp_evt_measurement32_sendPower(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -457,7 +457,7 @@ extern BOOL vscp_evt_measurement32_sendElectricalCharge(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -482,7 +482,7 @@ extern BOOL vscp_evt_measurement32_sendElectricalPotentialVoltage(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -507,7 +507,7 @@ extern BOOL vscp_evt_measurement32_sendElectricalCapacitance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -532,7 +532,7 @@ extern BOOL vscp_evt_measurement32_sendElectricalResistance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -557,7 +557,7 @@ extern BOOL vscp_evt_measurement32_sendElectricalConductance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -582,7 +582,7 @@ extern BOOL vscp_evt_measurement32_sendMagneticFieldStrength(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -607,7 +607,7 @@ extern BOOL vscp_evt_measurement32_sendMagneticFlux(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -632,7 +632,7 @@ extern BOOL vscp_evt_measurement32_sendMagneticFluxDensity(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -657,7 +657,7 @@ extern BOOL vscp_evt_measurement32_sendInductance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -682,7 +682,7 @@ extern BOOL vscp_evt_measurement32_sendLuminousFlux(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -707,7 +707,7 @@ extern BOOL vscp_evt_measurement32_sendIlluminance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -732,7 +732,7 @@ extern BOOL vscp_evt_measurement32_sendRadiationDose(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -757,7 +757,7 @@ extern BOOL vscp_evt_measurement32_sendCatalyticActivity(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -782,7 +782,7 @@ extern BOOL vscp_evt_measurement32_sendVolume(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -807,7 +807,7 @@ extern BOOL vscp_evt_measurement32_sendSoundIntensity(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -832,7 +832,7 @@ extern BOOL vscp_evt_measurement32_sendAngle(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -857,7 +857,7 @@ extern BOOL vscp_evt_measurement32_sendPositionWgs84(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -882,7 +882,7 @@ extern BOOL vscp_evt_measurement32_sendSpeed(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -907,7 +907,7 @@ extern BOOL vscp_evt_measurement32_sendAcceleration(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -932,7 +932,7 @@ extern BOOL vscp_evt_measurement32_sendTension(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -957,7 +957,7 @@ extern BOOL vscp_evt_measurement32_sendDampMoistHygrometerReading(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -982,7 +982,7 @@ extern BOOL vscp_evt_measurement32_sendFlow(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1007,7 +1007,7 @@ extern BOOL vscp_evt_measurement32_sendThermalResistance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1032,7 +1032,7 @@ extern BOOL vscp_evt_measurement32_sendRefractiveOpticalPower(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1057,7 +1057,7 @@ extern BOOL vscp_evt_measurement32_sendDynamicViscosity(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1082,7 +1082,7 @@ extern BOOL vscp_evt_measurement32_sendSoundImpedance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1107,7 +1107,7 @@ extern BOOL vscp_evt_measurement32_sendSoundResistance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1132,7 +1132,7 @@ extern BOOL vscp_evt_measurement32_sendElectricElastance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1157,7 +1157,7 @@ extern BOOL vscp_evt_measurement32_sendLuminousEnergy(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1182,7 +1182,7 @@ extern BOOL vscp_evt_measurement32_sendLuminance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1207,7 +1207,7 @@ extern BOOL vscp_evt_measurement32_sendChemicalConcentration(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1234,7 +1234,7 @@ extern BOOL vscp_evt_measurement32_sendDoseEquivalent(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1261,7 +1261,7 @@ extern BOOL vscp_evt_measurement32_sendDewPoint(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1286,7 +1286,7 @@ extern BOOL vscp_evt_measurement32_sendRelativeLevel(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1311,7 +1311,7 @@ extern BOOL vscp_evt_measurement32_sendAltitude(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1336,7 +1336,7 @@ extern BOOL vscp_evt_measurement32_sendArea(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1361,7 +1361,7 @@ extern BOOL vscp_evt_measurement32_sendRadiantIntensity(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1386,7 +1386,7 @@ extern BOOL vscp_evt_measurement32_sendRadiance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1411,7 +1411,7 @@ extern BOOL vscp_evt_measurement32_sendIrradianceExitanceRadiosity(float_t value txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1436,7 +1436,7 @@ extern BOOL vscp_evt_measurement32_sendSpectralRadiance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1461,7 +1461,7 @@ extern BOOL vscp_evt_measurement32_sendSpectralIrradiance(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1486,7 +1486,7 @@ extern BOOL vscp_evt_measurement32_sendSoundPressureAcousticPressure(float_t val txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1511,7 +1511,7 @@ extern BOOL vscp_evt_measurement32_sendSoundEnergyDensity(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1536,7 +1536,132 @@ extern BOOL vscp_evt_measurement32_sendSoundLevel(float_t value) txMsg.data[3] = ((uint8_t*)&value)[0]; size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Radiation dose (equivalent) + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendRadiationDoseEquivalent(float_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[3]; + txMsg.data[1] = ((uint8_t*)&value)[2]; + txMsg.data[2] = ((uint8_t*)&value)[1]; + txMsg.data[3] = ((uint8_t*)&value)[0]; + size += 4; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Radiation dose (exposure) + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendRadiationDoseExposure(float_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_RADIATION_DOSE_EXPOSURE, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[3]; + txMsg.data[1] = ((uint8_t*)&value)[2]; + txMsg.data[2] = ((uint8_t*)&value)[1]; + txMsg.data[3] = ((uint8_t*)&value)[0]; + size += 4; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Power factor + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendPowerFactor(float_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_POWER_FACTOR, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[3]; + txMsg.data[1] = ((uint8_t*)&value)[2]; + txMsg.data[2] = ((uint8_t*)&value)[1]; + txMsg.data[3] = ((uint8_t*)&value)[0]; + size += 4; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Reactive Power + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendReactivePower(float_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_REACTIVE_POWER, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[3]; + txMsg.data[1] = ((uint8_t*)&value)[2]; + txMsg.data[2] = ((uint8_t*)&value)[1]; + txMsg.data[3] = ((uint8_t*)&value)[0]; + size += 4; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Reactive Energy + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendReactiveEnergy(float_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_REACTIVE_ENERGY, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[3]; + txMsg.data[1] = ((uint8_t*)&value)[2]; + txMsg.data[2] = ((uint8_t*)&value)[1]; + txMsg.data[3] = ((uint8_t*)&value)[0]; + size += 4; + + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_measurement32.h b/src/framework/events/vscp_evt_measurement32.h index 4f13be8..4a87c1e 100644 --- a/src/framework/events/vscp_evt_measurement32.h +++ b/src/framework/events/vscp_evt_measurement32.h @@ -607,4 +607,49 @@ extern BOOL vscp_evt_measurement32_sendSoundEnergyDensity(float_t value); */ extern BOOL vscp_evt_measurement32_sendSoundLevel(float_t value); +/** + * Radiation dose (equivalent) + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendRadiationDoseEquivalent(float_t value); + +/** + * Radiation dose (exposure) + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendRadiationDoseExposure(float_t value); + +/** + * Power factor + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendPowerFactor(float_t value); + +/** + * Reactive Power + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendReactivePower(float_t value); + +/** + * Reactive Energy + * + * @param[in] value The value is a "float" - IEEE-754, 32 Bits, single precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement32_sendReactiveEnergy(float_t value); + #endif /* __VSCP_EVT_MEASUREMENT32_H__ */ diff --git a/src/framework/events/vscp_evt_measurement64.c b/src/framework/events/vscp_evt_measurement64.c index 70a2537..f0edf69 100644 --- a/src/framework/events/vscp_evt_measurement64.c +++ b/src/framework/events/vscp_evt_measurement64.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_measurement64_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -111,7 +111,7 @@ extern BOOL vscp_evt_measurement64_sendCount(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -140,7 +140,7 @@ extern BOOL vscp_evt_measurement64_sendLengthDistance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -169,7 +169,7 @@ extern BOOL vscp_evt_measurement64_sendMass(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -198,7 +198,7 @@ extern BOOL vscp_evt_measurement64_sendTime(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -227,7 +227,7 @@ extern BOOL vscp_evt_measurement64_sendElectricCurrent(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -256,7 +256,7 @@ extern BOOL vscp_evt_measurement64_sendTemperature(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -285,7 +285,7 @@ extern BOOL vscp_evt_measurement64_sendAmountOfSubstance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -314,7 +314,7 @@ extern BOOL vscp_evt_measurement64_sendLuminousIntensityIntensityOfLight(double_ txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -343,7 +343,7 @@ extern BOOL vscp_evt_measurement64_sendFrequency(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -372,7 +372,7 @@ extern BOOL vscp_evt_measurement64_sendRadioactivityAndOtherRandomEvents(double_ txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -401,7 +401,7 @@ extern BOOL vscp_evt_measurement64_sendForce(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -430,7 +430,7 @@ extern BOOL vscp_evt_measurement64_sendPressure(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -459,7 +459,7 @@ extern BOOL vscp_evt_measurement64_sendEnergy(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -488,7 +488,7 @@ extern BOOL vscp_evt_measurement64_sendPower(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -517,7 +517,7 @@ extern BOOL vscp_evt_measurement64_sendElectricalCharge(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -546,7 +546,7 @@ extern BOOL vscp_evt_measurement64_sendElectricalPotentialVoltage(double_t value txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -575,7 +575,7 @@ extern BOOL vscp_evt_measurement64_sendElectricalCapacitance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -604,7 +604,7 @@ extern BOOL vscp_evt_measurement64_sendElectricalResistance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -633,7 +633,7 @@ extern BOOL vscp_evt_measurement64_sendElectricalConductance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -662,7 +662,7 @@ extern BOOL vscp_evt_measurement64_sendMagneticFieldStrength(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -691,7 +691,7 @@ extern BOOL vscp_evt_measurement64_sendMagneticFlux(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -720,7 +720,7 @@ extern BOOL vscp_evt_measurement64_sendMagneticFluxDensity(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -749,7 +749,7 @@ extern BOOL vscp_evt_measurement64_sendInductance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -778,7 +778,7 @@ extern BOOL vscp_evt_measurement64_sendLuminousFlux(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -807,7 +807,7 @@ extern BOOL vscp_evt_measurement64_sendIlluminance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -836,7 +836,7 @@ extern BOOL vscp_evt_measurement64_sendRadiationDose(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -865,7 +865,7 @@ extern BOOL vscp_evt_measurement64_sendCatalyticActivity(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -894,7 +894,7 @@ extern BOOL vscp_evt_measurement64_sendVolume(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -923,7 +923,7 @@ extern BOOL vscp_evt_measurement64_sendSoundIntensity(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -952,7 +952,7 @@ extern BOOL vscp_evt_measurement64_sendAngle(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -981,7 +981,7 @@ extern BOOL vscp_evt_measurement64_sendPositionWgs84(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1010,7 +1010,7 @@ extern BOOL vscp_evt_measurement64_sendSpeed(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1039,7 +1039,7 @@ extern BOOL vscp_evt_measurement64_sendAcceleration(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1068,7 +1068,7 @@ extern BOOL vscp_evt_measurement64_sendTension(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1097,7 +1097,7 @@ extern BOOL vscp_evt_measurement64_sendDampMoistHygrometerReading(double_t value txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1126,7 +1126,7 @@ extern BOOL vscp_evt_measurement64_sendFlow(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1155,7 +1155,7 @@ extern BOOL vscp_evt_measurement64_sendThermalResistance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1184,7 +1184,7 @@ extern BOOL vscp_evt_measurement64_sendRefractiveOpticalPower(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1213,7 +1213,7 @@ extern BOOL vscp_evt_measurement64_sendDynamicViscosity(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1242,7 +1242,7 @@ extern BOOL vscp_evt_measurement64_sendSoundImpedance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1271,7 +1271,7 @@ extern BOOL vscp_evt_measurement64_sendSoundResistance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1300,7 +1300,7 @@ extern BOOL vscp_evt_measurement64_sendElectricElastance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1329,7 +1329,7 @@ extern BOOL vscp_evt_measurement64_sendLuminousEnergy(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1358,7 +1358,7 @@ extern BOOL vscp_evt_measurement64_sendLuminance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1387,7 +1387,7 @@ extern BOOL vscp_evt_measurement64_sendChemicalConcentration(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1418,7 +1418,7 @@ extern BOOL vscp_evt_measurement64_sendDoseEquivalent(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1449,7 +1449,7 @@ extern BOOL vscp_evt_measurement64_sendDewPoint(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1478,7 +1478,7 @@ extern BOOL vscp_evt_measurement64_sendRelativeLevel(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1507,7 +1507,7 @@ extern BOOL vscp_evt_measurement64_sendAltitude(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1536,7 +1536,7 @@ extern BOOL vscp_evt_measurement64_sendArea(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1565,7 +1565,7 @@ extern BOOL vscp_evt_measurement64_sendRadiantIntensity(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1594,7 +1594,7 @@ extern BOOL vscp_evt_measurement64_sendRadiance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1623,7 +1623,7 @@ extern BOOL vscp_evt_measurement64_sendIrradianceExitanceRadiosity(double_t valu txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1652,7 +1652,7 @@ extern BOOL vscp_evt_measurement64_sendSpectralRadiance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1681,7 +1681,7 @@ extern BOOL vscp_evt_measurement64_sendSpectralIrradiance(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1710,7 +1710,7 @@ extern BOOL vscp_evt_measurement64_sendSoundPressureAcousticPressure(double_t va txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1739,7 +1739,7 @@ extern BOOL vscp_evt_measurement64_sendSoundEnergyDensity(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1768,7 +1768,152 @@ extern BOOL vscp_evt_measurement64_sendSoundLevel(double_t value) txMsg.data[7] = ((uint8_t*)&value)[0]; size += 8; - txMsg.dataNum = size; + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Radiation dose (equivalent) + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendRadiationDoseEquivalent(double_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[7]; + txMsg.data[1] = ((uint8_t*)&value)[6]; + txMsg.data[2] = ((uint8_t*)&value)[5]; + txMsg.data[3] = ((uint8_t*)&value)[4]; + txMsg.data[4] = ((uint8_t*)&value)[3]; + txMsg.data[5] = ((uint8_t*)&value)[2]; + txMsg.data[6] = ((uint8_t*)&value)[1]; + txMsg.data[7] = ((uint8_t*)&value)[0]; + size += 8; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Radiation dose (exposure) + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendRadiationDoseExposure(double_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_RADIATION_DOSE_EXPOSURE, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[7]; + txMsg.data[1] = ((uint8_t*)&value)[6]; + txMsg.data[2] = ((uint8_t*)&value)[5]; + txMsg.data[3] = ((uint8_t*)&value)[4]; + txMsg.data[4] = ((uint8_t*)&value)[3]; + txMsg.data[5] = ((uint8_t*)&value)[2]; + txMsg.data[6] = ((uint8_t*)&value)[1]; + txMsg.data[7] = ((uint8_t*)&value)[0]; + size += 8; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Power factor + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendPowerFactor(double_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_POWER_FACTOR, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[7]; + txMsg.data[1] = ((uint8_t*)&value)[6]; + txMsg.data[2] = ((uint8_t*)&value)[5]; + txMsg.data[3] = ((uint8_t*)&value)[4]; + txMsg.data[4] = ((uint8_t*)&value)[3]; + txMsg.data[5] = ((uint8_t*)&value)[2]; + txMsg.data[6] = ((uint8_t*)&value)[1]; + txMsg.data[7] = ((uint8_t*)&value)[0]; + size += 8; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Reactive Power + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendReactivePower(double_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_REACTIVE_POWER, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[7]; + txMsg.data[1] = ((uint8_t*)&value)[6]; + txMsg.data[2] = ((uint8_t*)&value)[5]; + txMsg.data[3] = ((uint8_t*)&value)[4]; + txMsg.data[4] = ((uint8_t*)&value)[3]; + txMsg.data[5] = ((uint8_t*)&value)[2]; + txMsg.data[6] = ((uint8_t*)&value)[1]; + txMsg.data[7] = ((uint8_t*)&value)[0]; + size += 8; + + txMsg.dataSize = size; + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Reactive Energy + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendReactiveEnergy(double_t value) +{ + vscp_TxMessage txMsg; + uint8_t size = 0; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_REACTIVE_ENERGY, VSCP_PRIORITY_3_NORMAL); + + txMsg.data[0] = ((uint8_t*)&value)[7]; + txMsg.data[1] = ((uint8_t*)&value)[6]; + txMsg.data[2] = ((uint8_t*)&value)[5]; + txMsg.data[3] = ((uint8_t*)&value)[4]; + txMsg.data[4] = ((uint8_t*)&value)[3]; + txMsg.data[5] = ((uint8_t*)&value)[2]; + txMsg.data[6] = ((uint8_t*)&value)[1]; + txMsg.data[7] = ((uint8_t*)&value)[0]; + size += 8; + + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_measurement64.h b/src/framework/events/vscp_evt_measurement64.h index a4fc9c0..788d543 100644 --- a/src/framework/events/vscp_evt_measurement64.h +++ b/src/framework/events/vscp_evt_measurement64.h @@ -607,4 +607,49 @@ extern BOOL vscp_evt_measurement64_sendSoundEnergyDensity(double_t value); */ extern BOOL vscp_evt_measurement64_sendSoundLevel(double_t value); +/** + * Radiation dose (equivalent) + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendRadiationDoseEquivalent(double_t value); + +/** + * Radiation dose (exposure) + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendRadiationDoseExposure(double_t value); + +/** + * Power factor + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendPowerFactor(double_t value); + +/** + * Reactive Power + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendReactivePower(double_t value); + +/** + * Reactive Energy + * + * @param[in] value The value is a "double" - IEEE-754, 64 Bits, double precision. + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurement64_sendReactiveEnergy(double_t value); + #endif /* __VSCP_EVT_MEASUREMENT64_H__ */ diff --git a/src/framework/events/vscp_evt_measurezone.c b/src/framework/events/vscp_evt_measurezone.c index 05093e0..c37c12b 100644 --- a/src/framework/events/vscp_evt_measurezone.c +++ b/src/framework/events/vscp_evt_measurezone.c @@ -83,7 +83,7 @@ extern BOOL vscp_evt_measurezone_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -105,12 +105,12 @@ extern BOOL vscp_evt_measurezone_sendCount(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_COUNT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -132,12 +132,12 @@ extern BOOL vscp_evt_measurezone_sendLengthDistance(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_LENGTH, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -159,12 +159,12 @@ extern BOOL vscp_evt_measurezone_sendMass(uint8_t index, uint8_t zone, uint8_t s vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_MASS, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -186,12 +186,12 @@ extern BOOL vscp_evt_measurezone_sendTime(uint8_t index, uint8_t zone, uint8_t s vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_TIME, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -213,12 +213,12 @@ extern BOOL vscp_evt_measurezone_sendElectricCurrent(uint8_t index, uint8_t zone vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRIC_CURRENT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -240,12 +240,12 @@ extern BOOL vscp_evt_measurezone_sendTemperature(uint8_t index, uint8_t zone, ui vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_TEMPERATURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -267,12 +267,12 @@ extern BOOL vscp_evt_measurezone_sendAmountOfSubstance(uint8_t index, uint8_t zo vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_AMOUNT_OF_SUBSTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -294,12 +294,12 @@ extern BOOL vscp_evt_measurezone_sendLuminousIntensityIntensityOfLight(uint8_t i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_INTENSITY_OF_LIGHT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -321,12 +321,12 @@ extern BOOL vscp_evt_measurezone_sendFrequency(uint8_t index, uint8_t zone, uint vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_FREQUENCY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -348,12 +348,12 @@ extern BOOL vscp_evt_measurezone_sendRadioactivityAndOtherRandomEvents(uint8_t i vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIOACTIVITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -375,12 +375,12 @@ extern BOOL vscp_evt_measurezone_sendForce(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_FORCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -402,12 +402,12 @@ extern BOOL vscp_evt_measurezone_sendPressure(uint8_t index, uint8_t zone, uint8 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_PRESSURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -429,12 +429,12 @@ extern BOOL vscp_evt_measurezone_sendEnergy(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ENERGY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -456,12 +456,12 @@ extern BOOL vscp_evt_measurezone_sendPower(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_POWER, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -483,12 +483,12 @@ extern BOOL vscp_evt_measurezone_sendElectricalCharge(uint8_t index, uint8_t zon vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRICAL_CHARGE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -510,12 +510,12 @@ extern BOOL vscp_evt_measurezone_sendElectricalPotentialVoltage(uint8_t index, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRICAL_POTENTIAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -537,12 +537,12 @@ extern BOOL vscp_evt_measurezone_sendElectricalCapacitance(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRICAL_CAPACITANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -564,12 +564,12 @@ extern BOOL vscp_evt_measurezone_sendElectricalResistance(uint8_t index, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRICAL_RESISTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -591,12 +591,12 @@ extern BOOL vscp_evt_measurezone_sendElectricalConductance(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRICAL_CONDUCTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -618,12 +618,12 @@ extern BOOL vscp_evt_measurezone_sendMagneticFieldStrength(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_MAGNETIC_FIELD_STRENGTH, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -645,12 +645,12 @@ extern BOOL vscp_evt_measurezone_sendMagneticFlux(uint8_t index, uint8_t zone, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_MAGNETIC_FLUX, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -672,12 +672,12 @@ extern BOOL vscp_evt_measurezone_sendMagneticFluxDensity(uint8_t index, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_MAGNETIC_FLUX_DENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -699,12 +699,12 @@ extern BOOL vscp_evt_measurezone_sendInductance(uint8_t index, uint8_t zone, uin vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_INDUCTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -726,12 +726,12 @@ extern BOOL vscp_evt_measurezone_sendLuminousFlux(uint8_t index, uint8_t zone, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_FLUX_OF_LIGHT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -753,12 +753,12 @@ extern BOOL vscp_evt_measurezone_sendIlluminance(uint8_t index, uint8_t zone, ui vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ILLUMINANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -780,12 +780,12 @@ extern BOOL vscp_evt_measurezone_sendRadiationDose(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -807,12 +807,12 @@ extern BOOL vscp_evt_measurezone_sendCatalyticActivity(uint8_t index, uint8_t zo vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_CATALYTIC_ACITIVITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -834,12 +834,12 @@ extern BOOL vscp_evt_measurezone_sendVolume(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_VOLUME, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -861,12 +861,12 @@ extern BOOL vscp_evt_measurezone_sendSoundIntensity(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SOUND_INTENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -888,12 +888,12 @@ extern BOOL vscp_evt_measurezone_sendAngle(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ANGLE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -915,12 +915,12 @@ extern BOOL vscp_evt_measurezone_sendPositionWgs84(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_POSITION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -942,12 +942,12 @@ extern BOOL vscp_evt_measurezone_sendSpeed(uint8_t index, uint8_t zone, uint8_t vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SPEED, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -969,12 +969,12 @@ extern BOOL vscp_evt_measurezone_sendAcceleration(uint8_t index, uint8_t zone, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ACCELERATION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -996,12 +996,12 @@ extern BOOL vscp_evt_measurezone_sendTension(uint8_t index, uint8_t zone, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_TENSION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1023,12 +1023,12 @@ extern BOOL vscp_evt_measurezone_sendDampMoistHygrometerReading(uint8_t index, u vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_HUMIDITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1050,12 +1050,12 @@ extern BOOL vscp_evt_measurezone_sendFlow(uint8_t index, uint8_t zone, uint8_t s vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_FLOW, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1077,12 +1077,12 @@ extern BOOL vscp_evt_measurezone_sendThermalResistance(uint8_t index, uint8_t zo vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_THERMAL_RESISTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1104,12 +1104,12 @@ extern BOOL vscp_evt_measurezone_sendRefractiveOpticalPower(uint8_t index, uint8 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_REFRACTIVE_POWER, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1131,12 +1131,12 @@ extern BOOL vscp_evt_measurezone_sendDynamicViscosity(uint8_t index, uint8_t zon vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_DYNAMIC_VISCOSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1158,12 +1158,12 @@ extern BOOL vscp_evt_measurezone_sendSoundImpedance(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SOUND_IMPEDANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1185,12 +1185,12 @@ extern BOOL vscp_evt_measurezone_sendSoundResistance(uint8_t index, uint8_t zone vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SOUND_RESISTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1212,12 +1212,12 @@ extern BOOL vscp_evt_measurezone_sendElectricElastance(uint8_t index, uint8_t zo vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ELECTRIC_ELASTANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1239,12 +1239,12 @@ extern BOOL vscp_evt_measurezone_sendLuminousEnergy(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_LUMINOUS_ENERGY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1266,12 +1266,12 @@ extern BOOL vscp_evt_measurezone_sendLuminance(uint8_t index, uint8_t zone, uint vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_LUMINANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1293,12 +1293,12 @@ extern BOOL vscp_evt_measurezone_sendChemicalConcentration(uint8_t index, uint8_ vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_CHEMICAL_CONCENTRATION, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1322,12 +1322,12 @@ extern BOOL vscp_evt_measurezone_sendDoseEquivalent(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_DOSE_EQVIVALENT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1351,12 +1351,12 @@ extern BOOL vscp_evt_measurezone_sendDewPoint(uint8_t index, uint8_t zone, uint8 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_DEWPOINT, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1378,12 +1378,12 @@ extern BOOL vscp_evt_measurezone_sendRelativeLevel(uint8_t index, uint8_t zone, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RELATIVE_LEVEL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1405,12 +1405,12 @@ extern BOOL vscp_evt_measurezone_sendAltitude(uint8_t index, uint8_t zone, uint8 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_ALTITUDE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1432,12 +1432,12 @@ extern BOOL vscp_evt_measurezone_sendArea(uint8_t index, uint8_t zone, uint8_t s vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_AREA, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1459,12 +1459,12 @@ extern BOOL vscp_evt_measurezone_sendRadiantIntensity(uint8_t index, uint8_t zon vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIANT_INTENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1486,12 +1486,12 @@ extern BOOL vscp_evt_measurezone_sendRadiance(uint8_t index, uint8_t zone, uint8 vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1513,12 +1513,12 @@ extern BOOL vscp_evt_measurezone_sendIrradianceExitanceRadiosity(uint8_t index, vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_IRRADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1540,12 +1540,12 @@ extern BOOL vscp_evt_measurezone_sendSpectralRadiance(uint8_t index, uint8_t zon vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SPECTRAL_RADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1567,12 +1567,12 @@ extern BOOL vscp_evt_measurezone_sendSpectralIrradiance(uint8_t index, uint8_t z vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SPECTRAL_IRRADIANCE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1594,12 +1594,12 @@ extern BOOL vscp_evt_measurezone_sendSoundPressureAcousticPressure(uint8_t index vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SOUND_PRESSURE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1621,12 +1621,12 @@ extern BOOL vscp_evt_measurezone_sendSoundEnergyDensity(uint8_t index, uint8_t z vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SOUND_DENSITY, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } @@ -1648,12 +1648,147 @@ extern BOOL vscp_evt_measurezone_sendSoundLevel(uint8_t index, uint8_t zone, uin vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_SOUND_LEVEL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 3; + txMsg.dataSize = 3; txMsg.data[0] = index; txMsg.data[1] = zone; txMsg.data[2] = subZone; - txMsg.dataNum += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataNum); + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Radiation dose (equivalent) + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendRadiationDoseEquivalent(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 3; + txMsg.data[0] = index; + txMsg.data[1] = zone; + txMsg.data[2] = subZone; + + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Radiation dose (exposure) + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendRadiationDoseExposure(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EXPOSURE, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 3; + txMsg.data[0] = index; + txMsg.data[1] = zone; + txMsg.data[2] = subZone; + + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Power factor + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendPowerFactor(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_POWER_FACTOR, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 3; + txMsg.data[0] = index; + txMsg.data[1] = zone; + txMsg.data[2] = subZone; + + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Reactive Power + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendReactivePower(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_REACTIVE_POWER, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 3; + txMsg.data[0] = index; + txMsg.data[1] = zone; + txMsg.data[2] = subZone; + + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); + + return vscp_core_sendEvent(&txMsg); +} + +/** + * Reactive Energy + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendReactiveEnergy(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp) +{ + vscp_TxMessage txMsg; + + vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_REACTIVE_ENERGY, VSCP_PRIORITY_3_NORMAL); + + txMsg.dataSize = 3; + txMsg.data[0] = index; + txMsg.data[1] = zone; + txMsg.data[2] = subZone; + + txMsg.dataSize += vscp_data_coding_int32ToNormalizedInteger(data, exp, &txMsg.data[3], VSCP_L1_DATA_SIZE - txMsg.dataSize); return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_measurezone.h b/src/framework/events/vscp_evt_measurezone.h index 6aecaad..2120daa 100644 --- a/src/framework/events/vscp_evt_measurezone.h +++ b/src/framework/events/vscp_evt_measurezone.h @@ -840,4 +840,69 @@ extern BOOL vscp_evt_measurezone_sendSoundEnergyDensity(uint8_t index, uint8_t z */ extern BOOL vscp_evt_measurezone_sendSoundLevel(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); +/** + * Radiation dose (equivalent) + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendRadiationDoseEquivalent(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); + +/** + * Radiation dose (exposure) + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendRadiationDoseExposure(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); + +/** + * Power factor + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendPowerFactor(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); + +/** + * Reactive Power + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendReactivePower(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); + +/** + * Reactive Energy + * + * @param[in] index Index for sensor. + * @param[in] zone Zone for which event applies to (0-255). 255 is all zones. + * @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones. + * @param[in] data The data as signed integer. + * @param[in] exp The exponent of the data (10^exponent). + * + * @return If event is sent, it will return TRUE otherwise FALSE. + */ +extern BOOL vscp_evt_measurezone_sendReactiveEnergy(uint8_t index, uint8_t zone, uint8_t subZone, int32_t data, int8_t exp); + #endif /* __VSCP_EVT_MEASUREZONE_H__ */ diff --git a/src/framework/events/vscp_evt_multimedia.c b/src/framework/events/vscp_evt_multimedia.c index c29ee21..850a26b 100644 --- a/src/framework/events/vscp_evt_multimedia.c +++ b/src/framework/events/vscp_evt_multimedia.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_multimedia_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MULTIMEDIA, VSCP_TYPE_MULTIMEDIA_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_multimedia_sendPlayback(uint8_t function, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -142,7 +142,7 @@ extern BOOL vscp_evt_multimedia_sendNavigatorkeyEnglish(uint8_t function, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -175,7 +175,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustContrast(uint8_t contrast, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -208,7 +208,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustFocus(uint8_t focus, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -241,7 +241,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustTint(uint8_t tint, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -271,7 +271,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustColorBalance(uint8_t reserved, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -304,7 +304,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustBrightness(uint8_t brightness, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -337,7 +337,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustHue(uint8_t hue, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -370,7 +370,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustBass(uint8_t bass, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -403,7 +403,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustTreble(uint8_t treble, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -436,7 +436,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustMasterVolume(uint8_t volume, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -469,7 +469,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustFrontVolume(uint8_t volume, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -502,7 +502,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustCenterVolume(uint8_t volume, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -535,7 +535,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustRearVolume(uint8_t volume, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -568,7 +568,7 @@ extern BOOL vscp_evt_multimedia_sendAdjustSideVolume(uint8_t volume, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -609,7 +609,7 @@ extern BOOL vscp_evt_multimedia_sendSelectDisk(uint8_t discNo, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -642,7 +642,7 @@ extern BOOL vscp_evt_multimedia_sendSelectTrack(uint8_t track, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -676,7 +676,7 @@ extern BOOL vscp_evt_multimedia_sendSelectAlbumPlayList(uint8_t album, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -709,7 +709,7 @@ extern BOOL vscp_evt_multimedia_sendSelectChannel(uint8_t channel, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -742,7 +742,7 @@ extern BOOL vscp_evt_multimedia_sendSelectPage(uint8_t page, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -775,7 +775,7 @@ extern BOOL vscp_evt_multimedia_sendSelectChapter(uint8_t chapter, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -805,7 +805,7 @@ extern BOOL vscp_evt_multimedia_sendSelectScreenFormat(uint8_t format, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -835,7 +835,7 @@ extern BOOL vscp_evt_multimedia_sendSelectInputSource(uint8_t source, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -865,7 +865,7 @@ extern BOOL vscp_evt_multimedia_sendSelectOutput(uint8_t output, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -895,7 +895,7 @@ extern BOOL vscp_evt_multimedia_sendRecord(uint8_t function, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -928,7 +928,7 @@ extern BOOL vscp_evt_multimedia_sendSetRecordingVolume(uint8_t volume, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -958,7 +958,7 @@ extern BOOL vscp_evt_multimedia_sendTivoFunction(uint8_t tivoCode, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -988,7 +988,7 @@ extern BOOL vscp_evt_multimedia_sendGetCurrentTitle(uint8_t reserved, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1039,7 +1039,7 @@ extern BOOL vscp_evt_multimedia_sendSetMediaPositionInMilliseconds(uint8_t reser } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1070,7 +1070,7 @@ extern BOOL vscp_evt_multimedia_sendGetMediaInformation(uint8_t type, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1101,7 +1101,7 @@ extern BOOL vscp_evt_multimedia_sendRemoveItemFromAlbum(uint8_t item, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1131,7 +1131,7 @@ extern BOOL vscp_evt_multimedia_sendRemoveAllItemsFromAlbum(uint8_t reserved, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1161,7 +1161,7 @@ extern BOOL vscp_evt_multimedia_sendSaveAlbumPlayList(uint8_t function, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1214,7 +1214,7 @@ extern BOOL vscp_evt_multimedia_sendMultimediaControl(uint8_t control, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_phone.c b/src/framework/events/vscp_evt_phone.c index 388cd3f..35c9655 100644 --- a/src/framework/events/vscp_evt_phone.c +++ b/src/framework/events/vscp_evt_phone.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_phone_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PHONE, VSCP_TYPE_PHONE_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -132,7 +132,7 @@ extern BOOL vscp_evt_phone_sendIncomingCall(uint8_t id, uint8_t index, uint8_t t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -182,7 +182,7 @@ extern BOOL vscp_evt_phone_sendOutgoingCall(uint8_t id, uint8_t index, uint8_t t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -204,7 +204,7 @@ extern BOOL vscp_evt_phone_sendRing(uint8_t id) txMsg.data[0] = id; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -254,7 +254,7 @@ extern BOOL vscp_evt_phone_sendAnswer(uint8_t id, uint8_t index, uint8_t total, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -276,7 +276,7 @@ extern BOOL vscp_evt_phone_sendHangup(uint8_t id) txMsg.data[0] = id; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -298,7 +298,7 @@ extern BOOL vscp_evt_phone_sendGiveup(uint8_t id) txMsg.data[0] = id; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -320,7 +320,7 @@ extern BOOL vscp_evt_phone_sendTransfer(uint8_t id) txMsg.data[0] = id; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -370,7 +370,7 @@ extern BOOL vscp_evt_phone_sendDatabaseInfo(uint8_t id, uint8_t index, uint8_t t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_protocol.c b/src/framework/events/vscp_evt_protocol.c index 939565b..7968e81 100644 --- a/src/framework/events/vscp_evt_protocol.c +++ b/src/framework/events/vscp_evt_protocol.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_protocol_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -114,7 +114,7 @@ extern BOOL vscp_evt_protocol_sendSegmentControllerHeartbeat(uint8_t crc, uint32 size += 4; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -139,7 +139,7 @@ extern BOOL vscp_evt_protocol_sendNewNodeOnLineProbe(uint8_t targetAddress) txMsg.data[0] = targetAddress; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -155,7 +155,7 @@ extern BOOL vscp_evt_protocol_sendProbeAck(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_PROBE_ACK, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -185,7 +185,7 @@ extern BOOL vscp_evt_protocol_sendSetNicknameIdForNode(uint8_t oldNickname, uint txMsg.data[1] = newNickname; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -201,7 +201,7 @@ extern BOOL vscp_evt_protocol_sendNicknameIdAccepted(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_NICKNAME_ACCEPTED, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -238,7 +238,7 @@ extern BOOL vscp_evt_protocol_sendDropNicknameIdResetDevice(uint8_t nickname, ui size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -264,7 +264,7 @@ extern BOOL vscp_evt_protocol_sendReadRegister(uint8_t nodeAddress, uint8_t regi txMsg.data[1] = registerAddress; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -290,7 +290,7 @@ extern BOOL vscp_evt_protocol_sendReadWriteResponse(uint8_t registerAddress, uin txMsg.data[1] = registerValue; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -320,7 +320,7 @@ extern BOOL vscp_evt_protocol_sendWriteRegister(uint8_t nodeAddress, uint8_t reg txMsg.data[2] = registerValue; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -367,7 +367,7 @@ extern BOOL vscp_evt_protocol_sendEnterBootLoaderMode(uint8_t nodeAddress, uint8 txMsg.data[7] = (uint8_t)((pageSelect >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -399,7 +399,7 @@ extern BOOL vscp_evt_protocol_sendAckBootLoaderMode(uint32_t flashBlockSize, uin txMsg.data[7] = (uint8_t)((numberOfBlocks >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -427,7 +427,7 @@ extern BOOL vscp_evt_protocol_sendNackBootLoaderMode(uint32_t const * const erro size += 4; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -459,7 +459,7 @@ extern BOOL vscp_evt_protocol_sendStartBlockDataTransfer(uint32_t blockNumber, u size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -496,7 +496,7 @@ extern BOOL vscp_evt_protocol_sendBlockData(uint8_t const * const data, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -526,7 +526,7 @@ extern BOOL vscp_evt_protocol_sendAckDataBlock(uint16_t blockCrc, uint32_t write txMsg.data[5] = (uint8_t)((writePointer >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -555,7 +555,7 @@ extern BOOL vscp_evt_protocol_sendNackDataBlock(uint8_t errorCode, uint32_t writ txMsg.data[4] = (uint8_t)((writePointer >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -580,7 +580,7 @@ extern BOOL vscp_evt_protocol_sendProgramDataBlock(uint32_t blockNumber) txMsg.data[3] = (uint8_t)((blockNumber >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -605,7 +605,7 @@ extern BOOL vscp_evt_protocol_sendAckProgramDataBlock(uint32_t blockNumber) txMsg.data[3] = (uint8_t)((blockNumber >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -634,7 +634,7 @@ extern BOOL vscp_evt_protocol_sendNackProgramDataBlock(uint8_t errorCode, uint32 txMsg.data[4] = (uint8_t)((blockNumber >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -657,7 +657,7 @@ extern BOOL vscp_evt_protocol_sendActivateNewImage(uint16_t crc) txMsg.data[1] = (uint8_t)((crc >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -689,7 +689,7 @@ extern BOOL vscp_evt_protocol_sendPageRead(uint8_t nodeId, uint8_t index, uint8_ txMsg.data[2] = numberOfBytes; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -734,7 +734,7 @@ extern BOOL vscp_evt_protocol_sendPageWrite(uint8_t nodeId, uint8_t registerStar } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -775,7 +775,7 @@ extern BOOL vscp_evt_protocol_sendReadWritePageResponse(uint8_t sequenceNumber, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -791,7 +791,7 @@ extern BOOL vscp_evt_protocol_sendHighEndServerServiceProbe(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_HIGH_END_SERVER_PROBE, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -838,7 +838,7 @@ extern BOOL vscp_evt_protocol_sendHighEndServerServiceResponse(uint16_t capabili txMsg.data[7] = (uint8_t)((serverPort >> 0) & 0xff); size += 2; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -879,7 +879,7 @@ extern BOOL vscp_evt_protocol_sendIncrementRegister(uint8_t nodeId, uint8_t cons } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -920,7 +920,7 @@ extern BOOL vscp_evt_protocol_sendDecrementRegister(uint8_t nodeId, uint8_t cons } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -942,7 +942,7 @@ extern BOOL vscp_evt_protocol_sendWhoIsThere(uint8_t nodeId) txMsg.data[0] = nodeId; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -966,7 +966,7 @@ extern BOOL vscp_evt_protocol_sendGetDecisionMatrixInfo(uint8_t nodeAddress) txMsg.data[0] = nodeAddress; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1000,7 +1000,7 @@ extern BOOL vscp_evt_protocol_sendDecisionMatrixInfoResponse(uint8_t matrixSize, size += 2; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1022,7 +1022,7 @@ extern BOOL vscp_evt_protocol_sendGetEmbeddedMdf(uint8_t nodeAddress) txMsg.data[0] = nodeAddress; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1049,7 +1049,7 @@ extern BOOL vscp_evt_protocol_sendEmbeddedMdfResponse(uint16_t mdfDescriptionInd txMsg.data[2] = mdfData; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1087,7 +1087,7 @@ extern BOOL vscp_evt_protocol_sendExtendedPageReadRegister(uint8_t nodeAddress, size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1137,7 +1137,7 @@ extern BOOL vscp_evt_protocol_sendExtendedPageWriteRegister(uint8_t nodeAddress, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1187,7 +1187,7 @@ extern BOOL vscp_evt_protocol_sendExtendedPageReadWriteResponse(uint8_t index, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1203,7 +1203,7 @@ extern BOOL vscp_evt_protocol_sendGetEventInterest(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_GET_EVENT_INTEREST, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -1297,7 +1297,7 @@ extern BOOL vscp_evt_protocol_sendGetEventInterestResponse(uint8_t index, uint16 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1313,7 +1313,7 @@ extern BOOL vscp_evt_protocol_sendActivateNewImageAck(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_ACTIVATE_NEW_IMAGE_ACK, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -1329,7 +1329,7 @@ extern BOOL vscp_evt_protocol_sendActivateNewImageNack(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_ACTIVATE_NEW_IMAGE_NACK, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -1345,7 +1345,7 @@ extern BOOL vscp_evt_protocol_sendBlockDataTransferAck(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_START_BLOCK_ACK, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -1361,7 +1361,7 @@ extern BOOL vscp_evt_protocol_sendBlockDataTransferNack(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_PROTOCOL, VSCP_TYPE_PROTOCOL_START_BLOCK_NACK, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_security.c b/src/framework/events/vscp_evt_security.c index 224cd38..de93f82 100644 --- a/src/framework/events/vscp_evt_security.c +++ b/src/framework/events/vscp_evt_security.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_security_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_SECURITY, VSCP_TYPE_SECURITY_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -119,7 +119,7 @@ extern BOOL vscp_evt_security_sendMotionDetect(uint8_t userData, uint8_t zone, u size += 1; } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -149,7 +149,7 @@ extern BOOL vscp_evt_security_sendGlassBreak(uint8_t userData, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -179,7 +179,7 @@ extern BOOL vscp_evt_security_sendBeamBreak(uint8_t userData, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -209,7 +209,7 @@ extern BOOL vscp_evt_security_sendSensorTamper(uint8_t userData, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -239,7 +239,7 @@ extern BOOL vscp_evt_security_sendShockSensor(uint8_t userData, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -269,7 +269,7 @@ extern BOOL vscp_evt_security_sendSmokeSensor(uint8_t userData, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -299,7 +299,7 @@ extern BOOL vscp_evt_security_sendHeatSensor(uint8_t userData, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -329,7 +329,7 @@ extern BOOL vscp_evt_security_sendPanicSwitch(uint8_t userData, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -359,7 +359,7 @@ extern BOOL vscp_evt_security_sendDoorContact(uint8_t userData, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -389,7 +389,7 @@ extern BOOL vscp_evt_security_sendWindowContact(uint8_t userData, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -419,7 +419,7 @@ extern BOOL vscp_evt_security_sendCoSensor(uint8_t userData, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -449,7 +449,7 @@ extern BOOL vscp_evt_security_sendFrostDetected(uint8_t userData, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -479,7 +479,7 @@ extern BOOL vscp_evt_security_sendFlameDetected(uint8_t userData, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -509,7 +509,7 @@ extern BOOL vscp_evt_security_sendOxygenLow(uint8_t userData, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -539,7 +539,7 @@ extern BOOL vscp_evt_security_sendWeightDetected(uint8_t userData, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -569,7 +569,7 @@ extern BOOL vscp_evt_security_sendWaterDetected(uint8_t userData, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -599,7 +599,7 @@ extern BOOL vscp_evt_security_sendCondensationDetected(uint8_t userData, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -629,7 +629,7 @@ extern BOOL vscp_evt_security_sendNoiseSoundDetected(uint8_t userData, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -659,7 +659,7 @@ extern BOOL vscp_evt_security_sendHarmfulSoundLevelsDetected(uint8_t userData, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -689,7 +689,7 @@ extern BOOL vscp_evt_security_sendTamperDetected(uint8_t userData, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -719,7 +719,7 @@ extern BOOL vscp_evt_security_sendAuthenticated(uint8_t data0, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -749,7 +749,7 @@ extern BOOL vscp_evt_security_sendUnauthenticated(uint8_t data0, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -779,7 +779,7 @@ extern BOOL vscp_evt_security_sendAuthorized(uint8_t data0, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -809,7 +809,7 @@ extern BOOL vscp_evt_security_sendUnauthorized(uint8_t data0, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -839,7 +839,7 @@ extern BOOL vscp_evt_security_sendIdCheck(uint8_t data0, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -869,7 +869,7 @@ extern BOOL vscp_evt_security_sendValidPin(uint8_t data0, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -899,7 +899,7 @@ extern BOOL vscp_evt_security_sendInvalidPin(uint8_t data0, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -929,7 +929,7 @@ extern BOOL vscp_evt_security_sendPinWarning(uint8_t data0, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -959,7 +959,7 @@ extern BOOL vscp_evt_security_sendPinError(uint8_t data0, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -989,7 +989,7 @@ extern BOOL vscp_evt_security_sendValidPassword(uint8_t data0, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1019,7 +1019,7 @@ extern BOOL vscp_evt_security_sendInvalidPassword(uint8_t data0, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1049,7 +1049,7 @@ extern BOOL vscp_evt_security_sendPasswordWarning(uint8_t data0, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1079,7 +1079,7 @@ extern BOOL vscp_evt_security_sendPasswordError(uint8_t data0, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1109,7 +1109,7 @@ extern BOOL vscp_evt_security_sendGas(uint8_t data0, uint8_t zone, uint8_t subZo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1139,7 +1139,7 @@ extern BOOL vscp_evt_security_sendInMotion(uint8_t data0, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1169,7 +1169,7 @@ extern BOOL vscp_evt_security_sendNotInMotion(uint8_t data0, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1199,7 +1199,7 @@ extern BOOL vscp_evt_security_sendVibration(uint8_t data0, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_setvaluezone.c b/src/framework/events/vscp_evt_setvaluezone.c index a8a49c7..56cdbd8 100644 --- a/src/framework/events/vscp_evt_setvaluezone.c +++ b/src/framework/events/vscp_evt_setvaluezone.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_setvaluezone_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_SETVALUEZONE, VSCP_TYPE_SETVALUEZONE_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -135,7 +135,7 @@ extern BOOL vscp_evt_setvaluezone_sendCount(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -188,7 +188,7 @@ extern BOOL vscp_evt_setvaluezone_sendLengthDistance(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -241,7 +241,7 @@ extern BOOL vscp_evt_setvaluezone_sendMass(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -294,7 +294,7 @@ extern BOOL vscp_evt_setvaluezone_sendTime(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -347,7 +347,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricCurrent(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -400,7 +400,7 @@ extern BOOL vscp_evt_setvaluezone_sendTemperature(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -453,7 +453,7 @@ extern BOOL vscp_evt_setvaluezone_sendAmountOfSubstance(uint8_t index, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -506,7 +506,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminousIntensityIntensityOfLight(uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -559,7 +559,7 @@ extern BOOL vscp_evt_setvaluezone_sendFrequency(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -612,7 +612,7 @@ extern BOOL vscp_evt_setvaluezone_sendRadioactivityAndOtherRandomEvents(uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -665,7 +665,7 @@ extern BOOL vscp_evt_setvaluezone_sendForce(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -718,7 +718,7 @@ extern BOOL vscp_evt_setvaluezone_sendPressure(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -771,7 +771,7 @@ extern BOOL vscp_evt_setvaluezone_sendEnergy(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -824,7 +824,7 @@ extern BOOL vscp_evt_setvaluezone_sendPower(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -877,7 +877,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricalCharge(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -930,7 +930,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricalPotentialVoltage(uint8_t index, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -983,7 +983,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricalCapacitance(uint8_t index, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1036,7 +1036,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricalResistance(uint8_t index, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1089,7 +1089,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricalConductance(uint8_t index, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1142,7 +1142,7 @@ extern BOOL vscp_evt_setvaluezone_sendMagneticFieldStrength(uint8_t index, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1195,7 +1195,7 @@ extern BOOL vscp_evt_setvaluezone_sendMagneticFlux(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1248,7 +1248,7 @@ extern BOOL vscp_evt_setvaluezone_sendMagneticFluxDensity(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1301,7 +1301,7 @@ extern BOOL vscp_evt_setvaluezone_sendInductance(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1354,7 +1354,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminousFlux(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1407,7 +1407,7 @@ extern BOOL vscp_evt_setvaluezone_sendIlluminance(uint8_t index, uint8_t zone, u } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1460,7 +1460,7 @@ extern BOOL vscp_evt_setvaluezone_sendRadiationDose(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1513,7 +1513,7 @@ extern BOOL vscp_evt_setvaluezone_sendCatalyticActivity(uint8_t index, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1566,7 +1566,7 @@ extern BOOL vscp_evt_setvaluezone_sendVolume(uint8_t index, uint8_t zone, uint8_ } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1619,7 +1619,7 @@ extern BOOL vscp_evt_setvaluezone_sendSoundIntensity(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1672,7 +1672,7 @@ extern BOOL vscp_evt_setvaluezone_sendAngle(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1725,7 +1725,7 @@ extern BOOL vscp_evt_setvaluezone_sendPositionWgs84(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1778,7 +1778,7 @@ extern BOOL vscp_evt_setvaluezone_sendSpeed(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1831,7 +1831,7 @@ extern BOOL vscp_evt_setvaluezone_sendAcceleration(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1884,7 +1884,7 @@ extern BOOL vscp_evt_setvaluezone_sendTension(uint8_t index, uint8_t zone, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1937,7 +1937,7 @@ extern BOOL vscp_evt_setvaluezone_sendDampMoistHygrometerReading(uint8_t index, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1990,7 +1990,7 @@ extern BOOL vscp_evt_setvaluezone_sendFlow(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2043,7 +2043,7 @@ extern BOOL vscp_evt_setvaluezone_sendThermalResistance(uint8_t index, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2096,7 +2096,7 @@ extern BOOL vscp_evt_setvaluezone_sendRefractiveOpticalPower(uint8_t index, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2149,7 +2149,7 @@ extern BOOL vscp_evt_setvaluezone_sendDynamicViscosity(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2202,7 +2202,7 @@ extern BOOL vscp_evt_setvaluezone_sendSoundImpedance(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2255,7 +2255,7 @@ extern BOOL vscp_evt_setvaluezone_sendSoundResistance(uint8_t index, uint8_t zon } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2308,7 +2308,7 @@ extern BOOL vscp_evt_setvaluezone_sendElectricElastance(uint8_t index, uint8_t z } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2361,7 +2361,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminousEnergy(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2414,7 +2414,7 @@ extern BOOL vscp_evt_setvaluezone_sendLuminance(uint8_t index, uint8_t zone, uin } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2467,7 +2467,7 @@ extern BOOL vscp_evt_setvaluezone_sendChemicalConcentration(uint8_t index, uint8 } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2522,7 +2522,7 @@ extern BOOL vscp_evt_setvaluezone_sendDoseEquivalent(uint8_t index, uint8_t zone } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2577,7 +2577,7 @@ extern BOOL vscp_evt_setvaluezone_sendDewPoint(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2630,7 +2630,7 @@ extern BOOL vscp_evt_setvaluezone_sendRelativeLevel(uint8_t index, uint8_t zone, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2683,7 +2683,7 @@ extern BOOL vscp_evt_setvaluezone_sendAltitude(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2736,7 +2736,7 @@ extern BOOL vscp_evt_setvaluezone_sendArea(uint8_t index, uint8_t zone, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2789,7 +2789,7 @@ extern BOOL vscp_evt_setvaluezone_sendRadiantIntensity(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2842,7 +2842,7 @@ extern BOOL vscp_evt_setvaluezone_sendRadiance(uint8_t index, uint8_t zone, uint } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2895,7 +2895,7 @@ extern BOOL vscp_evt_setvaluezone_sendIrradianceExitanceRadiosity(uint8_t index, } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -2948,7 +2948,7 @@ extern BOOL vscp_evt_setvaluezone_sendSpectralRadiance(uint8_t index, uint8_t zo } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3001,7 +3001,7 @@ extern BOOL vscp_evt_setvaluezone_sendSpectralIrradiance(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3054,7 +3054,7 @@ extern BOOL vscp_evt_setvaluezone_sendSoundPressureAcousticPressure(uint8_t inde } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3107,7 +3107,7 @@ extern BOOL vscp_evt_setvaluezone_sendSoundEnergyDensity(uint8_t index, uint8_t } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -3160,7 +3160,7 @@ extern BOOL vscp_evt_setvaluezone_sendSoundLevel(uint8_t index, uint8_t zone, ui } } - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_weather.c b/src/framework/events/vscp_evt_weather.c index ad2ba05..99e5f42 100644 --- a/src/framework/events/vscp_evt_weather.c +++ b/src/framework/events/vscp_evt_weather.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_weather_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_WEATHER, VSCP_TYPE_WEATHER_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_weather_sendSeasonWinter(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -142,7 +142,7 @@ extern BOOL vscp_evt_weather_sendSeasonSpring(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -172,7 +172,7 @@ extern BOOL vscp_evt_weather_sendSeasonSummer(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -202,7 +202,7 @@ extern BOOL vscp_evt_weather_sendAutumnSummer(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -232,7 +232,7 @@ extern BOOL vscp_evt_weather_sendNoWind(uint8_t index, uint8_t zone, uint8_t sub txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -262,7 +262,7 @@ extern BOOL vscp_evt_weather_sendLowWind(uint8_t index, uint8_t zone, uint8_t su txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -292,7 +292,7 @@ extern BOOL vscp_evt_weather_sendMediumWind(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -322,7 +322,7 @@ extern BOOL vscp_evt_weather_sendHighWind(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -352,7 +352,7 @@ extern BOOL vscp_evt_weather_sendVeryHighWind(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -382,7 +382,7 @@ extern BOOL vscp_evt_weather_sendAirFoggy(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -412,7 +412,7 @@ extern BOOL vscp_evt_weather_sendAirFreezing(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -442,7 +442,7 @@ extern BOOL vscp_evt_weather_sendAirVeryCold(uint8_t index, uint8_t zone, uint8_ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -472,7 +472,7 @@ extern BOOL vscp_evt_weather_sendAirCold(uint8_t index, uint8_t zone, uint8_t su txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -502,7 +502,7 @@ extern BOOL vscp_evt_weather_sendAirNormal(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -532,7 +532,7 @@ extern BOOL vscp_evt_weather_sendAirHot(uint8_t index, uint8_t zone, uint8_t sub txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -562,7 +562,7 @@ extern BOOL vscp_evt_weather_sendAirVeryHot(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -592,7 +592,7 @@ extern BOOL vscp_evt_weather_sendPollutionLow(uint8_t index, uint8_t zone, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -622,7 +622,7 @@ extern BOOL vscp_evt_weather_sendPollutionMedium(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -652,7 +652,7 @@ extern BOOL vscp_evt_weather_sendPollutionHigh(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -682,7 +682,7 @@ extern BOOL vscp_evt_weather_sendAirHumid(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -712,7 +712,7 @@ extern BOOL vscp_evt_weather_sendAirDry(uint8_t index, uint8_t zone, uint8_t sub txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -742,7 +742,7 @@ extern BOOL vscp_evt_weather_sendSoilHumid(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -772,7 +772,7 @@ extern BOOL vscp_evt_weather_sendSoilDry(uint8_t index, uint8_t zone, uint8_t su txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -802,7 +802,7 @@ extern BOOL vscp_evt_weather_sendRainNone(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -832,7 +832,7 @@ extern BOOL vscp_evt_weather_sendRainLight(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -862,7 +862,7 @@ extern BOOL vscp_evt_weather_sendRainHeavy(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -892,7 +892,7 @@ extern BOOL vscp_evt_weather_sendRainVeryHeavy(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -922,7 +922,7 @@ extern BOOL vscp_evt_weather_sendSunNone(uint8_t index, uint8_t zone, uint8_t su txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -952,7 +952,7 @@ extern BOOL vscp_evt_weather_sendSunLight(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -982,7 +982,7 @@ extern BOOL vscp_evt_weather_sendSunHeavy(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1012,7 +1012,7 @@ extern BOOL vscp_evt_weather_sendSnowNone(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1042,7 +1042,7 @@ extern BOOL vscp_evt_weather_sendSnowLight(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1072,7 +1072,7 @@ extern BOOL vscp_evt_weather_sendSnowHeavy(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1102,7 +1102,7 @@ extern BOOL vscp_evt_weather_sendDewPoint(uint8_t index, uint8_t zone, uint8_t s txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1132,7 +1132,7 @@ extern BOOL vscp_evt_weather_sendStorm(uint8_t index, uint8_t zone, uint8_t subZ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1162,7 +1162,7 @@ extern BOOL vscp_evt_weather_sendFlood(uint8_t index, uint8_t zone, uint8_t subZ txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1192,7 +1192,7 @@ extern BOOL vscp_evt_weather_sendEarthquake(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1222,7 +1222,7 @@ extern BOOL vscp_evt_weather_sendNuclearDisaster(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1252,7 +1252,7 @@ extern BOOL vscp_evt_weather_sendFire(uint8_t index, uint8_t zone, uint8_t subZo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1282,7 +1282,7 @@ extern BOOL vscp_evt_weather_sendLightning(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1312,7 +1312,7 @@ extern BOOL vscp_evt_weather_sendUvRadiationLow(uint8_t index, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1342,7 +1342,7 @@ extern BOOL vscp_evt_weather_sendUvRadiationMedium(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1372,7 +1372,7 @@ extern BOOL vscp_evt_weather_sendUvRadiationNormal(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1402,7 +1402,7 @@ extern BOOL vscp_evt_weather_sendUvRadiationHigh(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1432,7 +1432,7 @@ extern BOOL vscp_evt_weather_sendUvRadiationVeryHigh(uint8_t index, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1462,7 +1462,7 @@ extern BOOL vscp_evt_weather_sendWarningLevel1(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1492,7 +1492,7 @@ extern BOOL vscp_evt_weather_sendWarningLevel2(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1522,7 +1522,7 @@ extern BOOL vscp_evt_weather_sendWarningLevel3(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1552,7 +1552,7 @@ extern BOOL vscp_evt_weather_sendWarningLevel4(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1582,7 +1582,7 @@ extern BOOL vscp_evt_weather_sendWarningLevel5(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1612,7 +1612,7 @@ extern BOOL vscp_evt_weather_sendArmageddon(uint8_t index, uint8_t zone, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1646,7 +1646,7 @@ extern BOOL vscp_evt_weather_sendUvIndex(uint8_t index, uint8_t zone, uint8_t su txMsg.data[3] = uvIndex; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_weather_forecast.c b/src/framework/events/vscp_evt_weather_forecast.c index a6434a7..210bc89 100644 --- a/src/framework/events/vscp_evt_weather_forecast.c +++ b/src/framework/events/vscp_evt_weather_forecast.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_weather_forecast_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_WEATHER_FORECAST, VSCP_TYPE_WEATHER_FORECAST_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -112,7 +112,7 @@ extern BOOL vscp_evt_weather_forecast_sendSeasonWinter(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -142,7 +142,7 @@ extern BOOL vscp_evt_weather_forecast_sendSeasonSpring(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -172,7 +172,7 @@ extern BOOL vscp_evt_weather_forecast_sendSeasonSummer(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -202,7 +202,7 @@ extern BOOL vscp_evt_weather_forecast_sendAutumnSummer(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -232,7 +232,7 @@ extern BOOL vscp_evt_weather_forecast_sendNoWind(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -262,7 +262,7 @@ extern BOOL vscp_evt_weather_forecast_sendLowWind(uint8_t index, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -292,7 +292,7 @@ extern BOOL vscp_evt_weather_forecast_sendMediumWind(uint8_t index, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -322,7 +322,7 @@ extern BOOL vscp_evt_weather_forecast_sendHighWind(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -352,7 +352,7 @@ extern BOOL vscp_evt_weather_forecast_sendVeryHighWind(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -382,7 +382,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirFoggy(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -412,7 +412,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirFreezing(uint8_t index, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -442,7 +442,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirVeryCold(uint8_t index, uint8_t zon txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -472,7 +472,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirCold(uint8_t index, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -502,7 +502,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirNormal(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -532,7 +532,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirHot(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -562,7 +562,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirVeryHot(uint8_t index, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -592,7 +592,7 @@ extern BOOL vscp_evt_weather_forecast_sendPollutionLow(uint8_t index, uint8_t zo txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -622,7 +622,7 @@ extern BOOL vscp_evt_weather_forecast_sendPollutionMedium(uint8_t index, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -652,7 +652,7 @@ extern BOOL vscp_evt_weather_forecast_sendPollutionHigh(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -682,7 +682,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirHumid(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -712,7 +712,7 @@ extern BOOL vscp_evt_weather_forecast_sendAirDry(uint8_t index, uint8_t zone, ui txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -742,7 +742,7 @@ extern BOOL vscp_evt_weather_forecast_sendSoilHumid(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -772,7 +772,7 @@ extern BOOL vscp_evt_weather_forecast_sendSoilDry(uint8_t index, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -802,7 +802,7 @@ extern BOOL vscp_evt_weather_forecast_sendRainNone(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -832,7 +832,7 @@ extern BOOL vscp_evt_weather_forecast_sendRainLight(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -862,7 +862,7 @@ extern BOOL vscp_evt_weather_forecast_sendRainHeavy(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -892,7 +892,7 @@ extern BOOL vscp_evt_weather_forecast_sendRainVeryHeavy(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -922,7 +922,7 @@ extern BOOL vscp_evt_weather_forecast_sendSunNone(uint8_t index, uint8_t zone, u txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -952,7 +952,7 @@ extern BOOL vscp_evt_weather_forecast_sendSunLight(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -982,7 +982,7 @@ extern BOOL vscp_evt_weather_forecast_sendSunHeavy(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1012,7 +1012,7 @@ extern BOOL vscp_evt_weather_forecast_sendSnowNone(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1042,7 +1042,7 @@ extern BOOL vscp_evt_weather_forecast_sendSnowLight(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1072,7 +1072,7 @@ extern BOOL vscp_evt_weather_forecast_sendSnowHeavy(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1102,7 +1102,7 @@ extern BOOL vscp_evt_weather_forecast_sendDewPoint(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1132,7 +1132,7 @@ extern BOOL vscp_evt_weather_forecast_sendStorm(uint8_t index, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1162,7 +1162,7 @@ extern BOOL vscp_evt_weather_forecast_sendFlood(uint8_t index, uint8_t zone, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1192,7 +1192,7 @@ extern BOOL vscp_evt_weather_forecast_sendEarthquake(uint8_t index, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1222,7 +1222,7 @@ extern BOOL vscp_evt_weather_forecast_sendNuclearDisaster(uint8_t index, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1252,7 +1252,7 @@ extern BOOL vscp_evt_weather_forecast_sendFire(uint8_t index, uint8_t zone, uint txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1282,7 +1282,7 @@ extern BOOL vscp_evt_weather_forecast_sendLightning(uint8_t index, uint8_t zone, txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1312,7 +1312,7 @@ extern BOOL vscp_evt_weather_forecast_sendUvRadiationLow(uint8_t index, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1342,7 +1342,7 @@ extern BOOL vscp_evt_weather_forecast_sendUvRadiationMedium(uint8_t index, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1372,7 +1372,7 @@ extern BOOL vscp_evt_weather_forecast_sendUvRadiationNormal(uint8_t index, uint8 txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1402,7 +1402,7 @@ extern BOOL vscp_evt_weather_forecast_sendUvRadiationHigh(uint8_t index, uint8_t txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1432,7 +1432,7 @@ extern BOOL vscp_evt_weather_forecast_sendUvRadiationVeryHigh(uint8_t index, uin txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1462,7 +1462,7 @@ extern BOOL vscp_evt_weather_forecast_sendWarningLevel1(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1492,7 +1492,7 @@ extern BOOL vscp_evt_weather_forecast_sendWarningLevel2(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1522,7 +1522,7 @@ extern BOOL vscp_evt_weather_forecast_sendWarningLevel3(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1552,7 +1552,7 @@ extern BOOL vscp_evt_weather_forecast_sendWarningLevel4(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1582,7 +1582,7 @@ extern BOOL vscp_evt_weather_forecast_sendWarningLevel5(uint8_t index, uint8_t z txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1612,7 +1612,7 @@ extern BOOL vscp_evt_weather_forecast_sendArmageddon(uint8_t index, uint8_t zone txMsg.data[2] = subZone; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } @@ -1646,7 +1646,7 @@ extern BOOL vscp_evt_weather_forecast_sendUvIndex(uint8_t index, uint8_t zone, u txMsg.data[3] = uvIndex; size += 1; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/events/vscp_evt_wireless.c b/src/framework/events/vscp_evt_wireless.c index 5ce0d79..16c1823 100644 --- a/src/framework/events/vscp_evt_wireless.c +++ b/src/framework/events/vscp_evt_wireless.c @@ -82,7 +82,7 @@ extern BOOL vscp_evt_wireless_sendGeneralEvent(void) vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_WIRELESS, VSCP_TYPE_WIRELESS_GENERAL, VSCP_PRIORITY_3_NORMAL); - txMsg.dataNum = 0; + txMsg.dataSize = 0; return vscp_core_sendEvent(&txMsg); } @@ -107,7 +107,7 @@ extern BOOL vscp_evt_wireless_sendGsmCell(uint32_t count) txMsg.data[3] = (uint8_t)((count >> 0) & 0xff); size += 4; - txMsg.dataNum = size; + txMsg.dataSize = size; return vscp_core_sendEvent(&txMsg); } diff --git a/src/framework/user/vscp_dev_data_config_overwrite.h b/src/framework/user/vscp_dev_data_config_overwrite.h index e79cf43..1d46753 100644 --- a/src/framework/user/vscp_dev_data_config_overwrite.h +++ b/src/framework/user/vscp_dev_data_config_overwrite.h @@ -123,6 +123,8 @@ extern "C" #define VSCP_DEV_DATA_CONFIG_STANDARD_DEVICE_TYPE ((uint32_t)0x00000000) +#define VSCP_DEV_DATA_CONFIG_FIRMWARE_DEVICE_CODE ((uint16_t)0x0000) + */ /*******************************************************************************