Updated to be compliant with VSCP v1.15.9

BlueAndi · BlueAndi · commit 3a8ad89a3c26 · 2025-01-16T01:09:36.000+01:00
diff --git a/src/framework/core/vscp_core.h b/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.15.4"
+#define VSCP_CORE_VERSION_STR       "v1.15.9"
 
 /** VSCP framework version string */
 #define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0"
diff --git a/src/framework/core/vscp_type_measurement.h b/src/framework/core/vscp_type_measurement.h
@@ -150,14 +150,14 @@ extern "C"
 
 /**
  * Default unit: Joule.
- * Optional unit: KWh (1), Wh(2)
+ * Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
  * This is a measurement of energy.
  */
 #define VSCP_TYPE_MEASUREMENT_ENERGY                       13
 
 /**
  * Default unit: watt.
- * Optional unit: Horse power (1).
+ * Optional unit: Horse power Metric (1), Horse power Imperial (2).
  * This is a measurement of power.
  */
 #define VSCP_TYPE_MEASUREMENT_POWER                        14
@@ -194,7 +194,7 @@ extern "C"
 
 /**
  * Default unit: amperes per meter (H).
- * Optional units: teslas (B) (1)
+ * Optional units: Oersted (Oe) (1)
  * This is a measurement of magnetic field strength.
  */
 #define VSCP_TYPE_MEASUREMENT_MAGNETIC_FIELD_STRENGTH      20
@@ -246,8 +246,9 @@ extern "C"
 
 /**
  * Default unit: cubic meter (m³)
- * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
- * where unit 4 is only available for Level II measurement events where units can hold this value.
+ * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
+ * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
+ * hold this value.
  * This is a measurement of volume.
  */
 #define VSCP_TYPE_MEASUREMENT_VOLUME                       28
@@ -277,13 +278,13 @@ extern "C"
 
 /**
  * Default unit: Meters per second.
- * Optional unit: Kilometers per hour (1) Miles per hour (2)
+ * Optional unit: Kilometers per hour (1), Miles per hour (2)
  * This is a measurement of a speed.
  */
 #define VSCP_TYPE_MEASUREMENT_SPEED                        32
 
 /**
- * Default unit: Meters per second/second (m/s2).
+ * Default unit: Meter per second squared (m/s²).
  * This is a measurement of acceleration.
  */
 #define VSCP_TYPE_MEASUREMENT_ACCELERATION                 33
@@ -339,7 +340,7 @@ extern "C"
 #define VSCP_TYPE_MEASUREMENT_SOUND_RESISTANCE             41
 
 /**
- * Default unit: daraf (f-1).
+ * Default unit: daraf (F-1).
  * This is a measurement of electric elasticity.
  */
 #define VSCP_TYPE_MEASUREMENT_ELECTRIC_ELASTANCE           42
@@ -401,6 +402,7 @@ extern "C"
 
 /**
  * Default unit: square meter (m²)
+ * Opt. unit: are (1), hectare (2), square kilometer (km²)
  * Area in square meter.
  */
 #define VSCP_TYPE_MEASUREMENT_AREA                         52
diff --git a/src/framework/core/vscp_type_measurement32.h b/src/framework/core/vscp_type_measurement32.h
@@ -149,14 +149,14 @@ extern "C"
 
 /**
  * Default unit: Joule.
- * Optional unit: KWh (1)
+ * Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
  * This is a measurement of energy.
  */
 #define VSCP_TYPE_MEASUREMENT32_ENERGY                       13
 
 /**
  * Default unit: watt.
- * Optional unit: Horse power (1).
+ * Optional unit: Horse power Metric (1), Horse power Imperial (2).
  * This is a measurement of power.
  */
 #define VSCP_TYPE_MEASUREMENT32_POWER                        14
@@ -193,7 +193,7 @@ extern "C"
 
 /**
  * Default unit: amperes per meter (H).
- * Optional units: teslas (B) (1)
+ * Optional units: Oersted (Oe) (1)
  * This is a measurement of magnetic field strength.
  */
 #define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FIELD_STRENGTH      20
@@ -245,8 +245,9 @@ extern "C"
 
 /**
  * Default unit: cubic meter (m³)
- * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
- * where unit 4 is only available for Level II measurement events where units can hold this value.
+ * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
+ * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
+ * hold this value.
  * This is a measurement of volume.
  */
 #define VSCP_TYPE_MEASUREMENT32_VOLUME                       28
@@ -276,13 +277,13 @@ extern "C"
 
 /**
  * Default unit: Meters per second.
- * Optional unit: Kilometers per hour (1) Miles per hour (2)
+ * Optional unit: Kilometers per hour (1), Miles per hour (2)
  * This is a measurement of a speed.
  */
 #define VSCP_TYPE_MEASUREMENT32_SPEED                        32
 
 /**
- * Default unit: Meters per second/second (m/s2).
+ * Default unit: Meter per second squared (m/s²).
  * This is a measurement of acceleration.
  */
 #define VSCP_TYPE_MEASUREMENT32_ACCELERATION                 33
@@ -338,7 +339,7 @@ extern "C"
 #define VSCP_TYPE_MEASUREMENT32_SOUND_RESISTANCE             41
 
 /**
- * Default unit: daraf (f-1).
+ * Default unit: daraf (F-1).
  * This is a measurement of electric elasticity.
  */
 #define VSCP_TYPE_MEASUREMENT32_ELECTRIC_ELASTANCE           42
@@ -400,6 +401,7 @@ extern "C"
 
 /**
  * Default unit: square meter (m²)
+ * Opt. unit: are (1), hectare (2), square kilometer (km²)
  * Area in square meter.
  */
 #define VSCP_TYPE_MEASUREMENT32_AREA                         52
diff --git a/src/framework/core/vscp_type_measurement64.h b/src/framework/core/vscp_type_measurement64.h
@@ -149,14 +149,14 @@ extern "C"
 
 /**
  * Default unit: Joule.
- * Optional unit: KWh (1)
+ * Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
  * This is a measurement of energy.
  */
 #define VSCP_TYPE_MEASUREMENT64_ENERGY                       13
 
 /**
  * Default unit: watt.
- * Optional unit: Horse power (1).
+ * Optional unit: Horse power Metric (1), Horse power Imperial (2).
  * This is a measurement of power.
  */
 #define VSCP_TYPE_MEASUREMENT64_POWER                        14
@@ -193,7 +193,7 @@ extern "C"
 
 /**
  * Default unit: amperes per meter (H).
- * Optional units: teslas (B) (1)
+ * Optional units: Oersted (Oe) (1)
  * This is a measurement of magnetic field strength.
  */
 #define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FIELD_STRENGTH      20
@@ -245,8 +245,9 @@ extern "C"
 
 /**
  * Default unit: cubic meter (m³)
- * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
- * where unit 4 is only available for Level II measurement events where units can hold this value.
+ * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
+ * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
+ * hold this value.
  * This is a measurement of volume.
  */
 #define VSCP_TYPE_MEASUREMENT64_VOLUME                       28
@@ -276,13 +277,13 @@ extern "C"
 
 /**
  * Default unit: Meters per second.
- * Optional unit: Kilometers per hour (1) Miles per hour (2)
+ * Optional unit: Kilometers per hour (1), Miles per hour (2)
  * This is a measurement of a speed.
  */
 #define VSCP_TYPE_MEASUREMENT64_SPEED                        32
 
 /**
- * Default unit: Meters per second/second (m/s2).
+ * Default unit: Meter per second squared (m/s²).
  * This is a measurement of acceleration.
  */
 #define VSCP_TYPE_MEASUREMENT64_ACCELERATION                 33
@@ -338,7 +339,7 @@ extern "C"
 #define VSCP_TYPE_MEASUREMENT64_SOUND_RESISTANCE             41
 
 /**
- * Default unit: daraf (f-1).
+ * Default unit: daraf (F-1).
  * This is a measurement of electric elasticity.
  */
 #define VSCP_TYPE_MEASUREMENT64_ELECTRIC_ELASTANCE           42
@@ -400,6 +401,7 @@ extern "C"
 
 /**
  * Default unit: square meter (m²)
+ * Opt. unit: are (1), hectare (2), square kilometer (km²)
  * Area in square meter.
  */
 #define VSCP_TYPE_MEASUREMENT64_AREA                         52
diff --git a/src/framework/core/vscp_type_measurezone.h b/src/framework/core/vscp_type_measurezone.h
@@ -151,14 +151,14 @@ extern "C"
 
 /**
  * Default unit: Joule.
- * Optional unit: KWh (1)
+ * Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
  * This is a measurement of energy.
  */
 #define VSCP_TYPE_MEASUREZONE_ENERGY                       13
 
 /**
  * Default unit: watt.
- * Optional unit: Horse power (1).
+ * Optional unit: Horse power Metric (1), Horse power Imperial (2).
  * This is a measurement of power.
  */
 #define VSCP_TYPE_MEASUREZONE_POWER                        14
@@ -195,7 +195,7 @@ extern "C"
 
 /**
  * Default unit: amperes per meter (H).
- * Optional units: teslas (B) (1)
+ * Optional units: Oersted (Oe) (1)
  * This is a measurement of magnetic field strength.
  */
 #define VSCP_TYPE_MEASUREZONE_MAGNETIC_FIELD_STRENGTH      20
@@ -247,8 +247,9 @@ extern "C"
 
 /**
  * Default unit: cubic meter (m³)
- * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
- * where unit 4 is only available for Level II measurement events where units can hold this value.
+ * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
+ * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
+ * hold this value.
  * This is a measurement of volume.
  */
 #define VSCP_TYPE_MEASUREZONE_VOLUME                       28
@@ -278,13 +279,13 @@ extern "C"
 
 /**
  * Default unit: Meters per second.
- * Optional unit: Kilometers per hour (1) Miles per hour (2)
+ * Optional unit: Kilometers per hour (1), Miles per hour (2)
  * This is a measurement of a speed.
  */
 #define VSCP_TYPE_MEASUREZONE_SPEED                        32
 
 /**
- * Default unit: Meters per second/second (m/s2).
+ * Default unit: Meter per second squared (m/s²).
  * This is a measurement of acceleration.
  */
 #define VSCP_TYPE_MEASUREZONE_ACCELERATION                 33
@@ -340,7 +341,7 @@ extern "C"
 #define VSCP_TYPE_MEASUREZONE_SOUND_RESISTANCE             41
 
 /**
- * Default unit: daraf (f-1).
+ * Default unit: daraf (F-1).
  * This is a measurement of electric elasticity.
  */
 #define VSCP_TYPE_MEASUREZONE_ELECTRIC_ELASTANCE           42
@@ -402,6 +403,7 @@ extern "C"
 
 /**
  * Default unit: square meter (m²)
+ * Opt. unit: are (1), hectare (2), square kilometer (km²)
  * Area in square meter.
  */
 #define VSCP_TYPE_MEASUREZONE_AREA                         52
diff --git a/src/framework/core/vscp_type_setvaluezone.h b/src/framework/core/vscp_type_setvaluezone.h
@@ -149,14 +149,14 @@ extern "C"
 
 /**
  * Default unit: Joule.
- * Optional unit: KWh (1)
+ * Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
  * This is a measurement of energy.
  */
 #define VSCP_TYPE_SETVALUEZONE_ENERGY                       13
 
 /**
  * Default unit: watt.
- * Optional unit: Horse power (1).
+ * Optional unit: Horse power Metric (1), Horse power Imperial (2).
  * This is a measurement of power.
  */
 #define VSCP_TYPE_SETVALUEZONE_POWER                        14
@@ -193,7 +193,7 @@ extern "C"
 
 /**
  * Default unit: amperes per meter (H).
- * Optional units: teslas (B) (1)
+ * Optional units: Oersted (Oe) (1)
  * This is a measurement of magnetic field strength.
  */
 #define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FIELD_STRENGTH      20
@@ -246,8 +246,9 @@ extern "C"
 
 /**
  * Default unit: cubic meter (m³)
- * Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
- * where unit 4 is only available for Level II measurement events where units can hold this value.
+ * Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
+ * millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
+ * hold this value.
  * This is a measurement of volume.
  */
 #define VSCP_TYPE_SETVALUEZONE_VOLUME                       28
@@ -277,13 +278,13 @@ extern "C"
 
 /**
  * Default unit: Meters per second.
- * Optional unit: Kilometers per hour (1) Miles per hour (2)
+ * Optional unit: Kilometers per hour (1), Miles per hour (2)
  * This is a measurement of a speed.
  */
 #define VSCP_TYPE_SETVALUEZONE_SPEED                        32
 
 /**
- * Default unit: Meters per second/second (m/s2).
+ * Default unit: Meter per second squared (m/s²).
  * This is a measurement of acceleration.
  */
 #define VSCP_TYPE_SETVALUEZONE_ACCELERATION                 33
@@ -339,7 +340,7 @@ extern "C"
 #define VSCP_TYPE_SETVALUEZONE_SOUND_RESISTANCE             41
 
 /**
- * Default unit: daraf (f-1).
+ * Default unit: daraf (F-1).
  * This is a measurement of electric elasticity.
  */
 #define VSCP_TYPE_SETVALUEZONE_ELECTRIC_ELASTANCE           42
@@ -401,6 +402,7 @@ extern "C"
 
 /**
  * Default unit: square meter (m²)
+ * Opt. unit: are (1), hectare (2), square kilometer (km²)
  * Area in square meter.
  */
 #define VSCP_TYPE_SETVALUEZONE_AREA                         52
diff --git a/src/framework/events/vscp_evt_control.h b/src/framework/events/vscp_evt_control.h
@@ -626,8 +626,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.
