Skip to content

Commit 05cba6d

Browse files
committed
Avoid using C++ keywords as function parameter name.
#6
1 parent 57a3911 commit 05cba6d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/framework/events/vscp_evt_information.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ This file is automatically generated. Don't change it manually.
4343
INCLUDES
4444
*******************************************************************************/
4545
#include "vscp_evt_information.h"
46-
#include "..\core\vscp_core.h"
47-
#include "..\core\vscp_class_l1.h"
48-
#include "..\core\vscp_type_information.h"
46+
#include "vscp_core.h"
47+
#include "vscp_class_l1.h"
48+
#include "vscp_type_information.h"
4949

5050
/*******************************************************************************
5151
COMPILER SWITCHES
@@ -1332,12 +1332,12 @@ extern BOOL vscp_evt_information_sendStreamDataWithZone(uint8_t zone, uint8_t su
13321332
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
13331333
* @param[in] subZone Sub-Zone for which event applies to (0-255). 255 is all sub-zones.
13341334
* @param[in] sequenceNumber Sequence number.
1335-
* @param[in] class Class.
1336-
* @param[in] type Type.
1335+
* @param[in] vscpClass VSCP class.
1336+
* @param[in] vscpType VSCP type.
13371337
*
13381338
* @return If event is sent, it will return TRUE otherwise FALSE.
13391339
*/
1340-
extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t class, uint16_t type)
1340+
extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t vscpClass, uint16_t vscpType)
13411341
{
13421342
vscp_TxMessage txMsg;
13431343
uint8_t size = 0;
@@ -1353,12 +1353,12 @@ extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint
13531353
txMsg.data[2] = sequenceNumber;
13541354
size += 1;
13551355

1356-
txMsg.data[3] = (uint8_t)((class >> 8) & 0xff);
1357-
txMsg.data[4] = (uint8_t)((class >> 0) & 0xff);
1356+
txMsg.data[3] = (uint8_t)((vscpClass >> 8) & 0xff);
1357+
txMsg.data[4] = (uint8_t)((vscpClass >> 0) & 0xff);
13581358
size += 2;
13591359

1360-
txMsg.data[5] = (uint8_t)((type >> 8) & 0xff);
1361-
txMsg.data[6] = (uint8_t)((type >> 0) & 0xff);
1360+
txMsg.data[5] = (uint8_t)((vscpType >> 8) & 0xff);
1361+
txMsg.data[6] = (uint8_t)((vscpType >> 0) & 0xff);
13621362
size += 2;
13631363

13641364
txMsg.dataSize = size;

src/framework/events/vscp_evt_information.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,12 +527,12 @@ extern BOOL vscp_evt_information_sendStreamDataWithZone(uint8_t zone, uint8_t su
527527
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
528528
* @param[in] subZone Sub-Zone for which event applies to (0-255). 255 is all sub-zones.
529529
* @param[in] sequenceNumber Sequence number.
530-
* @param[in] class Class.
531-
* @param[in] type Type.
530+
* @param[in] vscpClass VSCP class.
531+
* @param[in] vscpType VSCP type.
532532
*
533533
* @return If event is sent, it will return TRUE otherwise FALSE.
534534
*/
535-
extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t class, uint16_t type);
535+
extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t vscpClass, uint16_t vscpType);
536536

537537
/**
538538
* Level Changed

0 commit comments

Comments
 (0)