CLASS1.MEASUREMENT, type13/14 new units. Fixed faulty link

grodansparadis · Jan 9, 2025 · 1057d64 · 1057d64
1 parent 64a6979
commit 1057d64
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 15 deletions.
diff --git a/class1.measurement.md b/class1.measurement.md
@@ -37,7 +37,7 @@ Level II measurement events with type >= 1280 have no relation to any Level I me
 ## Data format
 | Data byte | Description | 
  | :---------: | ----------- | 
- | 0 | [Data coding]((./vscp_measurements.md)).  | 
+ | 0 | [Data coding]((./vscp_measurements.md?id=datacoding)).  | 
  | 1-7 | Data with format defined by byte 0. | 
 
 
@@ -201,6 +201,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -213,7 +215,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class1.measurement32.md b/class1.measurement32.md
@@ -235,6 +235,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -251,7 +253,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class1.measurement64.md b/class1.measurement64.md
@@ -237,6 +237,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -253,7 +255,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class1.measurezone.md b/class1.measurezone.md
@@ -229,6 +229,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -245,7 +247,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class1.setvaluezone.md b/class1.setvaluezone.md
@@ -232,6 +232,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -248,7 +250,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.level1.measurement.md b/class2.level1.measurement.md
@@ -220,6 +220,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -236,7 +238,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.level1.measurement32.md b/class2.level1.measurement32.md
@@ -221,6 +221,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -237,7 +239,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.level1.measurement64.md b/class2.level1.measurement64.md
@@ -221,6 +221,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -237,7 +239,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.level1.measurezone.md b/class2.level1.measurezone.md
@@ -221,6 +221,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -237,7 +239,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.level1.setvaluezone.md b/class2.level1.setvaluezone.md
@@ -221,6 +221,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -237,7 +239,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.measurement_float.md b/class2.measurement_float.md
@@ -236,6 +236,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -252,7 +254,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/class2.measurement_str.md b/class2.measurement_str.md
@@ -237,6 +237,8 @@ VSCP_TYPE_MEASUREMENT_ENERGY
 ```
 **Default unit:** Joule.  
 **Optional unit:** KWh (1)
+**Optional unit:** KWh (2)
+**Optional unit:** eV (electron volts) (3)
 
 This is a measurement of energy. 
 
@@ -253,7 +255,8 @@ This is a measurement of energy.
 VSCP_TYPE_MEASUREMENT_POWER
 ```
 **Default unit:** watt.  
-**Optional unit:** Horse power (1).
+**Optional unit:** Horse power Metric (1).
+**Optional unit:** Horse power Imperial (2).
 
 This is a measurement of power. 
 

diff --git a/variables.xml b/variables.xml
@@ -1,4 +1,4 @@
 <var>
-    <creation-time>2025-01-07 12:20:00</creation-time>
-    <document-version>1.15.5</document-version>
+    <creation-time>2025-01-08 10:55:00</creation-time>
+    <document-version>1.15.6</document-version>
 </var>
diff --git a/vscp_specification_history.md b/vscp_specification_history.md
@@ -2,6 +2,7 @@
 
  | Date       | By   | Description |
  | ---------- | ---- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|2025-01-08| AKHE | CLASS1.MEASUREMENT, type13/14 new units. Fixed faulty link |
 |2025-01-07| AKHE | Added events CLASS1_CONTROL: VSCP_TYPE_CONTROL_TURN_ALL_OFF (17), VSCP_TYPE_CONTROL_TURN_ALL_ON (18) VSCP_TYPE_CONTROL_TURN_ALL_X (19) Fixes grodansparadis/vscp#278 |
 |2025-01-06| AKHE | Fixed several faulty data coding links, typo fixed. |
 |2025-01-02| AKHE | Arguments for CLASS1.PROTOCOL,VSCP_TYPE_PROTOCOL_GET_EVENT_INTEREST added. Fixed faulty links. |