Update to VSCP specification v1.15.4

Author: BlueAndi

src/framework/core/vscp_core.h

@@ -99,7 +99,7 @@ extern "C"
 #define VSCP_CORE_VERSION_SUB_MINOR (1)
 
 /** VSCP specification version string, the framework is compliant to. */
-#define VSCP_CORE_VERSION_STR       "v1.13.1"
+#define VSCP_CORE_VERSION_STR       "v1.15.4"
 
 /** VSCP framework version string */
 #define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0"

src/framework/core/vscp_type_measurement.h

@@ -461,7 +461,7 @@ extern "C"
  * Optional unit rem (1)
  * This is a measurement of a radiation dose (Equivalent dose of ionizing radiation).
  */
-#define VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ            61
+#define VSCP_TYPE_MEASUREMENT_DOSE_EQUIVALENT              61
 
 /**
  * Default unit: coulomb per kilogram (C/kg).

src/framework/core/vscp_type_measurement32.h

@@ -460,7 +460,7 @@ extern "C"
  * 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
+#define VSCP_TYPE_MEASUREMENT32_DOSE_EQUIVALENT              61
 
 /**
  * Default unit: coulomb per kilogram (C/kg).

src/framework/core/vscp_type_measurement64.h

@@ -460,7 +460,7 @@ extern "C"
  * 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
+#define VSCP_TYPE_MEASUREMENT64_DOSE_EQUIVALENT              61
 
 /**
  * Default unit: coulomb per kilogram (C/kg).

src/framework/core/vscp_type_measurezone.h

@@ -462,7 +462,7 @@ extern "C"
  * 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
+#define VSCP_TYPE_MEASUREZONE_DOSE_EQUIVALENT              61
 
 /**
  * Default unit: coulomb per kilogram (C/kg).

src/framework/events/vscp_evt_control.c

@@ -1603,8 +1603,8 @@ extern BOOL vscp_evt_control_sendSetSecurityPin(uint8_t reserved, uint8_t zone,
  * @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] securityPassword Security password. This password can be 1-5 bytes and length of event
- * is set accordingly. It should be interpreted as an UTF-8 string with a length set bt event data
- * length - 3 (array[5])
+ * is set accordingly. It should be interpreted as a UTF-8 string of length equal to the event data
+ * length minus 3 bytes (array[5])
  * @param[in] securityPasswordsize Size in byte.
  * 
  * @return If event is sent, it will return TRUE otherwise FALSE.

src/framework/events/vscp_evt_measurement.c

@@ -1498,7 +1498,7 @@ extern BOOL vscp_evt_measurement_sendRadiationDoseEquivalent(uint8_t index, uint
 {
     vscp_TxMessage  txMsg;
 
-    vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL);
+    vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT, VSCP_TYPE_MEASUREMENT_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL);
 
     txMsg.dataSize = 1;
     txMsg.data[0] = vscp_data_coding_getFormatByte(VSCP_DATA_CODING_REPRESENTATION_NORMALIZED_INTEGER, unit, index);

src/framework/events/vscp_evt_measurement32.c

@@ -1553,7 +1553,7 @@ 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);
+    vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT32, VSCP_TYPE_MEASUREMENT32_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL);
 
     txMsg.data[0] = ((uint8_t*)&value)[3];
     txMsg.data[1] = ((uint8_t*)&value)[2];

src/framework/events/vscp_evt_measurement64.c

@@ -1785,7 +1785,7 @@ 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);
+    vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREMENT64, VSCP_TYPE_MEASUREMENT64_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL);
 
     txMsg.data[0] = ((uint8_t*)&value)[7];
     txMsg.data[1] = ((uint8_t*)&value)[6];

src/framework/events/vscp_evt_measurezone.c

@@ -1673,7 +1673,7 @@ extern BOOL vscp_evt_measurezone_sendRadiationDoseEquivalent(uint8_t index, uint
 {
     vscp_TxMessage  txMsg;
 
-    vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_RADIATION_DOSE_EQ, VSCP_PRIORITY_3_NORMAL);
+    vscp_core_prepareTxMessage(&txMsg, VSCP_CLASS_L1_MEASUREZONE, VSCP_TYPE_MEASUREZONE_DOSE_EQUIVALENT, VSCP_PRIORITY_3_NORMAL);
 
     txMsg.dataSize = 3;
     txMsg.data[0] = index;