Merge pull request #45 from BlueAndi/release/v2.0.x

Prepare v2.0.3

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.0.3
+
+  * Add missing extern "C" sections to the event headers.
+  * Avoid using C++ keywords as function parameter name.
+
+## 2.0.2
+
+  * Changed recommended nickname discovery timeout from five to one second.
+
 ## 2.0.1
 
   Updates the library.json to include the ./src/events folder too.

doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "VSCP framework"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v2.0.1
+PROJECT_NUMBER         = v2.0.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

library.json

@@ -1,6 +1,6 @@
 {
     "name": "vscp-framework",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "Very Simple Control Procotol (VSCP) Level 1 library with C interface.",
     "keywords": "vscp, vscp-framework, automation, home automation",
     "repository": {

src/events/vscp_evt_alarm.h

@@ -49,6 +49,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -225,4 +230,8 @@ extern BOOL vscp_evt_alarm_sendWatchdog(uint8_t index, uint8_t zone, uint8_t sub
  */
 extern BOOL vscp_evt_alarm_sendAlarmReset(uint8_t alarmRegister, uint8_t zone, uint8_t subZone);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_ALARM_H__ */

src/events/vscp_evt_aol.h

@@ -49,6 +49,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -256,4 +261,8 @@ extern BOOL vscp_evt_aol_sendUpdateBiosImage(uint8_t index, uint8_t zone, uint8_
  */
 extern BOOL vscp_evt_aol_sendUpdatePerformOtherDiagnosticProcedures(uint8_t index, uint8_t zone, uint8_t subZone);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_AOL_H__ */

src/events/vscp_evt_configuration.h

@@ -48,6 +48,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -279,4 +284,8 @@ extern BOOL vscp_evt_configuration_sendSetParameterAcknowledge(uint16_t paramete
  */
 extern BOOL vscp_evt_configuration_sendSetParamterNegativeAcknowledge(uint16_t parameterid, uint16_t parametervalue);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_CONFIGURATION_H__ */

src/events/vscp_evt_control.h

@@ -52,6 +52,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -685,4 +690,8 @@ extern BOOL vscp_evt_control_sendIncrement(uint8_t userSpecific, uint8_t zone, u
  */
 extern BOOL vscp_evt_control_sendDecrement(uint8_t userSpecific, uint8_t zone, uint8_t subzone, uint8_t const * const decrementValue, uint8_t decrementValueSize);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_CONTROL_H__ */

src/events/vscp_evt_data.h

@@ -49,6 +49,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -152,4 +157,8 @@ extern BOOL vscp_evt_data_sendSignalLevel(uint8_t index, uint8_t unit, int32_t d
  */
 extern BOOL vscp_evt_data_sendSignalQuality(uint8_t index, uint8_t unit, int32_t data, int8_t exp);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_DATA_H__ */

src/events/vscp_evt_diagnostic.h

@@ -48,6 +48,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -1213,4 +1218,8 @@ extern BOOL vscp_evt_diagnostic_sendChargingOn(uint8_t index, uint8_t zone, uint
  */
 extern BOOL vscp_evt_diagnostic_sendChargingOff(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t const * const user, uint8_t userSize);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_DIAGNOSTIC_H__ */

src/events/vscp_evt_display.h

@@ -48,6 +48,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -193,4 +198,8 @@ extern BOOL vscp_evt_display_sendSetLed(uint8_t index, uint8_t zone, uint8_t sub
  */
 extern BOOL vscp_evt_display_sendSetRgbColor(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t red, uint8_t green, uint8_t blue);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_DISPLAY_H__ */

src/events/vscp_evt_error.h

@@ -48,6 +48,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -604,4 +609,8 @@ extern BOOL vscp_evt_error_sendOperationStoppedOrAborted(uint8_t index, uint8_t
  */
 extern BOOL vscp_evt_error_sendPointerWithInvalidValue(uint8_t index, uint8_t zone, uint8_t subZone, uint8_t const * const user, uint8_t userSize);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_ERROR_H__ */

src/events/vscp_evt_gnss.h

@@ -50,6 +50,11 @@ This file is automatically generated. Don't change it manually.
 #include "vscp_platform.h"
 #include <math.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -100,4 +105,8 @@ extern BOOL vscp_evt_gnss_sendPosition(float_t latitude, float_t longitude);
  */
 extern BOOL vscp_evt_gnss_sendSatellites(uint8_t count);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_GNSS_H__ */

src/events/vscp_evt_information.c

@@ -1332,12 +1332,12 @@ extern BOOL vscp_evt_information_sendStreamDataWithZone(uint8_t zone, uint8_t su
  * @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] sequenceNumber Sequence number.
- * @param[in] class Class.
- * @param[in] type Type.
+ * @param[in] vscpClass VSCP class.
+ * @param[in] vscpType VSCP type.
  * 
  * @return If event is sent, it will return TRUE otherwise FALSE.
  */
-extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t class, uint16_t type)
+extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t vscpClass, uint16_t vscpType)
 {
     vscp_TxMessage  txMsg;
     uint8_t         size    = 0;
@@ -1353,12 +1353,12 @@ extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint
     txMsg.data[2] = sequenceNumber;
     size += 1;
 
-    txMsg.data[3] = (uint8_t)((class >> 8) & 0xff);
-    txMsg.data[4] = (uint8_t)((class >> 0) & 0xff);
+    txMsg.data[3] = (uint8_t)((vscpClass >> 8) & 0xff);
+    txMsg.data[4] = (uint8_t)((vscpClass >> 0) & 0xff);
     size += 2;
 
-    txMsg.data[5] = (uint8_t)((type >> 8) & 0xff);
-    txMsg.data[6] = (uint8_t)((type >> 0) & 0xff);
+    txMsg.data[5] = (uint8_t)((vscpType >> 8) & 0xff);
+    txMsg.data[6] = (uint8_t)((vscpType >> 0) & 0xff);
     size += 2;
 
     txMsg.dataSize = size;

src/events/vscp_evt_information.h

@@ -50,6 +50,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -522,12 +527,12 @@ extern BOOL vscp_evt_information_sendStreamDataWithZone(uint8_t zone, uint8_t su
  * @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] sequenceNumber Sequence number.
- * @param[in] class Class.
- * @param[in] type Type.
+ * @param[in] vscpClass VSCP class.
+ * @param[in] vscpType VSCP type.
  * 
  * @return If event is sent, it will return TRUE otherwise FALSE.
  */
-extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t class, uint16_t type);
+extern BOOL vscp_evt_information_sendConfirm(uint8_t zone, uint8_t subZone, uint8_t sequenceNumber, uint16_t vscpClass, uint16_t vscpType);
 
 /**
  * Level Changed
@@ -1093,4 +1098,8 @@ extern BOOL vscp_evt_information_sendDecremented(uint8_t userSpecific, uint8_t z
  */
 extern BOOL vscp_evt_information_sendProximityDetected(uint8_t userSpecific, uint8_t zone, uint8_t subzone, uint16_t const * const proximityLevel);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_INFORMATION_H__ */

src/events/vscp_evt_ir.h

@@ -48,6 +48,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -142,4 +147,8 @@ extern BOOL vscp_evt_ir_sendVscpAbstractRemoteFormat(uint16_t code, uint8_t zone
  */
 extern BOOL vscp_evt_ir_sendMapitoRemoteFormat(uint8_t repeat, uint8_t zone, uint8_t subZone, uint32_t address, uint8_t keyCode);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_IR_H__ */

src/events/vscp_evt_log.h

@@ -48,6 +48,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -119,4 +124,8 @@ extern BOOL vscp_evt_log_sendLogStop(uint8_t id);
  */
 extern BOOL vscp_evt_log_sendLogLevel(uint8_t level);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_LOG_H__ */

src/events/vscp_evt_measurement.h

@@ -50,6 +50,11 @@ This file is automatically generated. Don't change it manually.
 #include <stdint.h>
 #include "vscp_platform.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -841,4 +846,8 @@ extern BOOL vscp_evt_measurement_sendReactivePower(uint8_t index, uint8_t unit,
  */
 extern BOOL vscp_evt_measurement_sendReactiveEnergy(uint8_t index, uint8_t unit, int32_t data, int8_t exp);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_MEASUREMENT_H__ */

src/events/vscp_evt_measurement32.h

@@ -50,6 +50,11 @@ This file is automatically generated. Don't change it manually.
 #include "vscp_platform.h"
 #include <math.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -652,4 +657,8 @@ extern BOOL vscp_evt_measurement32_sendReactivePower(float_t value);
  */
 extern BOOL vscp_evt_measurement32_sendReactiveEnergy(float_t value);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_MEASUREMENT32_H__ */

src/events/vscp_evt_measurement64.h

@@ -50,6 +50,11 @@ This file is automatically generated. Don't change it manually.
 #include "vscp_platform.h"
 #include <math.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*******************************************************************************
     COMPILER SWITCHES
 *******************************************************************************/
@@ -652,4 +657,8 @@ extern BOOL vscp_evt_measurement64_sendReactivePower(double_t value);
  */
 extern BOOL vscp_evt_measurement64_sendReactiveEnergy(double_t value);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __VSCP_EVT_MEASUREMENT64_H__ */