Skip to content

Commit 3a8ad89

Browse files
BlueAndiBlueAndi
committed
Updated to be compliant with VSCP v1.15.9
1 parent e467053 commit 3a8ad89

File tree

7 files changed

+53
-43
lines changed

7 files changed

+53
-43
lines changed

‎src/framework/core/vscp_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ extern "C"
9999
#define VSCP_CORE_VERSION_SUB_MINOR (1)
100100

101101
/** VSCP specification version string, the framework is compliant to. */
102-
#define VSCP_CORE_VERSION_STR "v1.15.4"
102+
#define VSCP_CORE_VERSION_STR "v1.15.9"
103103

104104
/** VSCP framework version string */
105105
#define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0"

‎src/framework/core/vscp_type_measurement.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ extern "C"
150150

151151
/**
152152
* Default unit: Joule.
153-
* Optional unit: KWh (1), Wh(2)
153+
* Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
154154
* This is a measurement of energy.
155155
*/
156156
#define VSCP_TYPE_MEASUREMENT_ENERGY 13
157157

158158
/**
159159
* Default unit: watt.
160-
* Optional unit: Horse power (1).
160+
* Optional unit: Horse power Metric (1), Horse power Imperial (2).
161161
* This is a measurement of power.
162162
*/
163163
#define VSCP_TYPE_MEASUREMENT_POWER 14
@@ -194,7 +194,7 @@ extern "C"
194194

195195
/**
196196
* Default unit: amperes per meter (H).
197-
* Optional units: teslas (B) (1)
197+
* Optional units: Oersted (Oe) (1)
198198
* This is a measurement of magnetic field strength.
199199
*/
200200
#define VSCP_TYPE_MEASUREMENT_MAGNETIC_FIELD_STRENGTH 20
@@ -246,8 +246,9 @@ extern "C"
246246

247247
/**
248248
* Default unit: cubic meter (m³)
249-
* Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
250-
* where unit 4 is only available for Level II measurement events where units can hold this value.
249+
* Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
250+
* millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
251+
* hold this value.
251252
* This is a measurement of volume.
252253
*/
253254
#define VSCP_TYPE_MEASUREMENT_VOLUME 28
@@ -277,13 +278,13 @@ extern "C"
277278

278279
/**
279280
* Default unit: Meters per second.
280-
* Optional unit: Kilometers per hour (1) Miles per hour (2)
281+
* Optional unit: Kilometers per hour (1), Miles per hour (2)
281282
* This is a measurement of a speed.
282283
*/
283284
#define VSCP_TYPE_MEASUREMENT_SPEED 32
284285

285286
/**
286-
* Default unit: Meters per second/second (m/s2).
287+
* Default unit: Meter per second squared (m/s²).
287288
* This is a measurement of acceleration.
288289
*/
289290
#define VSCP_TYPE_MEASUREMENT_ACCELERATION 33
@@ -339,7 +340,7 @@ extern "C"
339340
#define VSCP_TYPE_MEASUREMENT_SOUND_RESISTANCE 41
340341

341342
/**
342-
* Default unit: daraf (f-1).
343+
* Default unit: daraf (F-1).
343344
* This is a measurement of electric elasticity.
344345
*/
345346
#define VSCP_TYPE_MEASUREMENT_ELECTRIC_ELASTANCE 42
@@ -401,6 +402,7 @@ extern "C"
401402

402403
/**
403404
* Default unit: square meter (m²)
405+
* Opt. unit: are (1), hectare (2), square kilometer (km²)
404406
* Area in square meter.
405407
*/
406408
#define VSCP_TYPE_MEASUREMENT_AREA 52

‎src/framework/core/vscp_type_measurement32.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ extern "C"
149149

150150
/**
151151
* Default unit: Joule.
152-
* Optional unit: KWh (1)
152+
* Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
153153
* This is a measurement of energy.
154154
*/
155155
#define VSCP_TYPE_MEASUREMENT32_ENERGY 13
156156

157157
/**
158158
* Default unit: watt.
159-
* Optional unit: Horse power (1).
159+
* Optional unit: Horse power Metric (1), Horse power Imperial (2).
160160
* This is a measurement of power.
161161
*/
162162
#define VSCP_TYPE_MEASUREMENT32_POWER 14
@@ -193,7 +193,7 @@ extern "C"
193193

194194
/**
195195
* Default unit: amperes per meter (H).
196-
* Optional units: teslas (B) (1)
196+
* Optional units: Oersted (Oe) (1)
197197
* This is a measurement of magnetic field strength.
198198
*/
199199
#define VSCP_TYPE_MEASUREMENT32_MAGNETIC_FIELD_STRENGTH 20
@@ -245,8 +245,9 @@ extern "C"
245245

246246
/**
247247
* Default unit: cubic meter (m³)
248-
* Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
249-
* where unit 4 is only available for Level II measurement events where units can hold this value.
248+
* Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
249+
* millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
250+
* hold this value.
250251
* This is a measurement of volume.
251252
*/
252253
#define VSCP_TYPE_MEASUREMENT32_VOLUME 28
@@ -276,13 +277,13 @@ extern "C"
276277

277278
/**
278279
* Default unit: Meters per second.
279-
* Optional unit: Kilometers per hour (1) Miles per hour (2)
280+
* Optional unit: Kilometers per hour (1), Miles per hour (2)
280281
* This is a measurement of a speed.
281282
*/
282283
#define VSCP_TYPE_MEASUREMENT32_SPEED 32
283284

284285
/**
285-
* Default unit: Meters per second/second (m/s2).
286+
* Default unit: Meter per second squared (m/s²).
286287
* This is a measurement of acceleration.
287288
*/
288289
#define VSCP_TYPE_MEASUREMENT32_ACCELERATION 33
@@ -338,7 +339,7 @@ extern "C"
338339
#define VSCP_TYPE_MEASUREMENT32_SOUND_RESISTANCE 41
339340

340341
/**
341-
* Default unit: daraf (f-1).
342+
* Default unit: daraf (F-1).
342343
* This is a measurement of electric elasticity.
343344
*/
344345
#define VSCP_TYPE_MEASUREMENT32_ELECTRIC_ELASTANCE 42
@@ -400,6 +401,7 @@ extern "C"
400401

401402
/**
402403
* Default unit: square meter (m²)
404+
* Opt. unit: are (1), hectare (2), square kilometer (km²)
403405
* Area in square meter.
404406
*/
405407
#define VSCP_TYPE_MEASUREMENT32_AREA 52

‎src/framework/core/vscp_type_measurement64.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ extern "C"
149149

150150
/**
151151
* Default unit: Joule.
152-
* Optional unit: KWh (1)
152+
* Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
153153
* This is a measurement of energy.
154154
*/
155155
#define VSCP_TYPE_MEASUREMENT64_ENERGY 13
156156

157157
/**
158158
* Default unit: watt.
159-
* Optional unit: Horse power (1).
159+
* Optional unit: Horse power Metric (1), Horse power Imperial (2).
160160
* This is a measurement of power.
161161
*/
162162
#define VSCP_TYPE_MEASUREMENT64_POWER 14
@@ -193,7 +193,7 @@ extern "C"
193193

194194
/**
195195
* Default unit: amperes per meter (H).
196-
* Optional units: teslas (B) (1)
196+
* Optional units: Oersted (Oe) (1)
197197
* This is a measurement of magnetic field strength.
198198
*/
199199
#define VSCP_TYPE_MEASUREMENT64_MAGNETIC_FIELD_STRENGTH 20
@@ -245,8 +245,9 @@ extern "C"
245245

246246
/**
247247
* Default unit: cubic meter (m³)
248-
* Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
249-
* where unit 4 is only available for Level II measurement events where units can hold this value.
248+
* Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
249+
* millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
250+
* hold this value.
250251
* This is a measurement of volume.
251252
*/
252253
#define VSCP_TYPE_MEASUREMENT64_VOLUME 28
@@ -276,13 +277,13 @@ extern "C"
276277

277278
/**
278279
* Default unit: Meters per second.
279-
* Optional unit: Kilometers per hour (1) Miles per hour (2)
280+
* Optional unit: Kilometers per hour (1), Miles per hour (2)
280281
* This is a measurement of a speed.
281282
*/
282283
#define VSCP_TYPE_MEASUREMENT64_SPEED 32
283284

284285
/**
285-
* Default unit: Meters per second/second (m/s2).
286+
* Default unit: Meter per second squared (m/s²).
286287
* This is a measurement of acceleration.
287288
*/
288289
#define VSCP_TYPE_MEASUREMENT64_ACCELERATION 33
@@ -338,7 +339,7 @@ extern "C"
338339
#define VSCP_TYPE_MEASUREMENT64_SOUND_RESISTANCE 41
339340

340341
/**
341-
* Default unit: daraf (f-1).
342+
* Default unit: daraf (F-1).
342343
* This is a measurement of electric elasticity.
343344
*/
344345
#define VSCP_TYPE_MEASUREMENT64_ELECTRIC_ELASTANCE 42
@@ -400,6 +401,7 @@ extern "C"
400401

401402
/**
402403
* Default unit: square meter (m²)
404+
* Opt. unit: are (1), hectare (2), square kilometer (km²)
403405
* Area in square meter.
404406
*/
405407
#define VSCP_TYPE_MEASUREMENT64_AREA 52

‎src/framework/core/vscp_type_measurezone.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ extern "C"
151151

152152
/**
153153
* Default unit: Joule.
154-
* Optional unit: KWh (1)
154+
* Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
155155
* This is a measurement of energy.
156156
*/
157157
#define VSCP_TYPE_MEASUREZONE_ENERGY 13
158158

159159
/**
160160
* Default unit: watt.
161-
* Optional unit: Horse power (1).
161+
* Optional unit: Horse power Metric (1), Horse power Imperial (2).
162162
* This is a measurement of power.
163163
*/
164164
#define VSCP_TYPE_MEASUREZONE_POWER 14
@@ -195,7 +195,7 @@ extern "C"
195195

196196
/**
197197
* Default unit: amperes per meter (H).
198-
* Optional units: teslas (B) (1)
198+
* Optional units: Oersted (Oe) (1)
199199
* This is a measurement of magnetic field strength.
200200
*/
201201
#define VSCP_TYPE_MEASUREZONE_MAGNETIC_FIELD_STRENGTH 20
@@ -247,8 +247,9 @@ extern "C"
247247

248248
/**
249249
* Default unit: cubic meter (m³)
250-
* Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
251-
* where unit 4 is only available for Level II measurement events where units can hold this value.
250+
* Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
251+
* millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
252+
* hold this value.
252253
* This is a measurement of volume.
253254
*/
254255
#define VSCP_TYPE_MEASUREZONE_VOLUME 28
@@ -278,13 +279,13 @@ extern "C"
278279

279280
/**
280281
* Default unit: Meters per second.
281-
* Optional unit: Kilometers per hour (1) Miles per hour (2)
282+
* Optional unit: Kilometers per hour (1), Miles per hour (2)
282283
* This is a measurement of a speed.
283284
*/
284285
#define VSCP_TYPE_MEASUREZONE_SPEED 32
285286

286287
/**
287-
* Default unit: Meters per second/second (m/s2).
288+
* Default unit: Meter per second squared (m/s²).
288289
* This is a measurement of acceleration.
289290
*/
290291
#define VSCP_TYPE_MEASUREZONE_ACCELERATION 33
@@ -340,7 +341,7 @@ extern "C"
340341
#define VSCP_TYPE_MEASUREZONE_SOUND_RESISTANCE 41
341342

342343
/**
343-
* Default unit: daraf (f-1).
344+
* Default unit: daraf (F-1).
344345
* This is a measurement of electric elasticity.
345346
*/
346347
#define VSCP_TYPE_MEASUREZONE_ELECTRIC_ELASTANCE 42
@@ -402,6 +403,7 @@ extern "C"
402403

403404
/**
404405
* Default unit: square meter (m²)
406+
* Opt. unit: are (1), hectare (2), square kilometer (km²)
405407
* Area in square meter.
406408
*/
407409
#define VSCP_TYPE_MEASUREZONE_AREA 52

‎src/framework/core/vscp_type_setvaluezone.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ extern "C"
149149

150150
/**
151151
* Default unit: Joule.
152-
* Optional unit: KWh (1)
152+
* Optional unit: kWh (1), Wh (2), eV (electron volt) (3)
153153
* This is a measurement of energy.
154154
*/
155155
#define VSCP_TYPE_SETVALUEZONE_ENERGY 13
156156

157157
/**
158158
* Default unit: watt.
159-
* Optional unit: Horse power (1).
159+
* Optional unit: Horse power Metric (1), Horse power Imperial (2).
160160
* This is a measurement of power.
161161
*/
162162
#define VSCP_TYPE_SETVALUEZONE_POWER 14
@@ -193,7 +193,7 @@ extern "C"
193193

194194
/**
195195
* Default unit: amperes per meter (H).
196-
* Optional units: teslas (B) (1)
196+
* Optional units: Oersted (Oe) (1)
197197
* This is a measurement of magnetic field strength.
198198
*/
199199
#define VSCP_TYPE_SETVALUEZONE_MAGNETIC_FIELD_STRENGTH 20
@@ -246,8 +246,9 @@ extern "C"
246246

247247
/**
248248
* Default unit: cubic meter (m³)
249-
* Opt. unit: Liter (dm³) (1), decilitre (100 cm³) (2), centilitre (10 cm³) (3), millilitre (cm³) (4)
250-
* where unit 4 is only available for Level II measurement events where units can hold this value.
249+
* Opt. unit: Liter (dm³) (1), millilitre (cm³) (2), decilitre (100 cm³) (3), centilitre (10 cm³) (4),
250+
* millilitre (cm³) (4) where unit 4 is only available for Level II measurement events where units can
251+
* hold this value.
251252
* This is a measurement of volume.
252253
*/
253254
#define VSCP_TYPE_SETVALUEZONE_VOLUME 28
@@ -277,13 +278,13 @@ extern "C"
277278

278279
/**
279280
* Default unit: Meters per second.
280-
* Optional unit: Kilometers per hour (1) Miles per hour (2)
281+
* Optional unit: Kilometers per hour (1), Miles per hour (2)
281282
* This is a measurement of a speed.
282283
*/
283284
#define VSCP_TYPE_SETVALUEZONE_SPEED 32
284285

285286
/**
286-
* Default unit: Meters per second/second (m/s2).
287+
* Default unit: Meter per second squared (m/s²).
287288
* This is a measurement of acceleration.
288289
*/
289290
#define VSCP_TYPE_SETVALUEZONE_ACCELERATION 33
@@ -339,7 +340,7 @@ extern "C"
339340
#define VSCP_TYPE_SETVALUEZONE_SOUND_RESISTANCE 41
340341

341342
/**
342-
* Default unit: daraf (f-1).
343+
* Default unit: daraf (F-1).
343344
* This is a measurement of electric elasticity.
344345
*/
345346
#define VSCP_TYPE_SETVALUEZONE_ELECTRIC_ELASTANCE 42
@@ -401,6 +402,7 @@ extern "C"
401402

402403
/**
403404
* Default unit: square meter (m²)
405+
* Opt. unit: are (1), hectare (2), square kilometer (km²)
404406
* Area in square meter.
405407
*/
406408
#define VSCP_TYPE_SETVALUEZONE_AREA 52

‎src/framework/events/vscp_evt_control.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,8 @@ extern BOOL vscp_evt_control_sendSetSecurityPin(uint8_t reserved, uint8_t zone,
626626
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
627627
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
628628
* @param[in] securityPassword Security password. This password can be 1-5 bytes and length of event
629-
* is set accordingly. It should be interpreted as an UTF-8 string with a length set bt event data
630-
* length - 3 (array[5])
629+
* is set accordingly. It should be interpreted as a UTF-8 string of length equal to the event data
630+
* length minus 3 bytes (array[5])
631631
* @param[in] securityPasswordsize Size in byte.
632632
*
633633
* @return If event is sent, it will return TRUE otherwise FALSE.

0 commit comments

Comments
 (0)