Update IPSO model using from https://github.com/IPSO-Alliance/pub

commit (d0ef60f1fc219b68f55bc8b7f71bd13f434ba332)
eclipse-leshan · Jul 23, 2018 · 15f3ecd · 15f3ecd
1 parent c68e33a
commit 15f3ecd
Show file tree

Hide file tree

Showing 39 changed files with 208 additions and 68 deletions.
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
@@ -112,7 +112,7 @@ public class LeshanServerDemo {
                             "3326.xml", "3327.xml", "3328.xml", "3329.xml", "3330.xml", "3331.xml", "3332.xml",
                             "3333.xml", "3334.xml", "3335.xml", "3336.xml", "3337.xml", "3338.xml", "3339.xml",
                             "3340.xml", "3341.xml", "3342.xml", "3343.xml", "3344.xml", "3345.xml", "3346.xml",
-                            "3347.xml", "3348.xml",
+                            "3347.xml", "3348.xml", "3349.xml", "3350.xml",
 
                             "Communication_Characteristics-V1_0.xml",
 

diff --git a/leshan-server-demo/src/main/resources/models/3200.xml b/leshan-server-demo/src/main/resources/models/3200.xml
@@ -65,7 +65,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Counter value.</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3202.xml b/leshan-server-demo/src/main/resources/models/3202.xml
@@ -83,7 +83,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3203.xml b/leshan-server-demo/src/main/resources/models/3203.xml
@@ -20,13 +20,13 @@
 			</Item>
 			<Item ID="5750">
 				<Name>Application Type</Name>
-				<Operations>R</Operations>
+				<Operations>RW</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
 				<Type>String</Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
-				<Description>If present, the application type of the actuator as a string, for instance, “Thermostat”</Description>
+				<Description>If present, the application type of the actuator as a string, for instance, “Valve”</Description>
 			</Item>
 			<Item ID="5603">
 				<Name>Min Range Value</Name>
@@ -36,7 +36,7 @@
 				<Type>Float</Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
-				<Description>The minimum value that can be measured by the sensor</Description>
+				<Description>The minimum value that can be set for the output</Description>
 			</Item>
 			<Item ID="5604">
 				<Name>Max Range Value</Name>
@@ -46,7 +46,7 @@
 				<Type>Float</Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
-				<Description>The maximum value that can be measured by the sensor</Description>
+				<Description>The maximum value that can be set for the output</Description>
 			</Item>
 		</Resources>
 		<Description2></Description2>

diff --git a/leshan-server-demo/src/main/resources/models/3300.xml b/leshan-server-demo/src/main/resources/models/3300.xml
@@ -94,7 +94,7 @@ Specific object for a given range of sensors is described later in the document,
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3301.xml b/leshan-server-demo/src/main/resources/models/3301.xml
@@ -63,7 +63,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3302.xml b/leshan-server-demo/src/main/resources/models/3302.xml
@@ -33,7 +33,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Counter value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3304.xml b/leshan-server-demo/src/main/resources/models/3304.xml
@@ -43,7 +43,7 @@
 				<Operations>R</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
+				<Type>Float</Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units>Defined by “Units” resource.</Units>
 				<Description>The minimum value that can be measured by the sensor</Description>
@@ -73,7 +73,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3305.xml b/leshan-server-demo/src/main/resources/models/3305.xml
@@ -173,7 +173,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset both cumulative active/reactive power</Description>
@@ -183,7 +183,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3310.xml b/leshan-server-demo/src/main/resources/models/3310.xml
@@ -68,6 +68,16 @@
 				<Units>%</Units>
 				<Description>Defines the duty cycle for the load control event, i.e, what percentage of time the receiving device is allowed to be on.</Description>
 			</Item>
+                        <Item ID="5750">
+                                <Name>Application Type</Name>
+                                <Operations>RW</Operations>
+                                <MultipleInstances>Single</MultipleInstances>
+                                <Mandatory>Optional</Mandatory>
+                                <Type>String</Type>
+                                <RangeEnumeration></RangeEnumeration>
+                                <Units></Units>
+                                <Description>The application type of the sensor or actuator as a string, for instance, “Air Pressure”</Description>
+                        </Item>
 		</Resources>
 		<Description2></Description2>
 	</Object>

diff --git a/leshan-server-demo/src/main/resources/models/3311.xml b/leshan-server-demo/src/main/resources/models/3311.xml
@@ -78,7 +78,17 @@
 				<Units></Units>
 				<Description>If present, the type of sensor defined as the UCUM Unit Definition e.g. “Cel” for Temperature in Celcius.</Description>
 			</Item>
+                        <Item ID="5750">
+                                <Name>Application Type</Name>
+                                <Operations>RW</Operations>
+                                <MultipleInstances>Single</MultipleInstances>
+                                <Mandatory>Optional</Mandatory>
+                                <Type>String</Type>
+                                <RangeEnumeration></RangeEnumeration>
+                                <Units></Units>
+                                <Description>The application type of the sensor or actuator as a string, for instance, “Air Pressure”</Description>
+                        </Item>
 		</Resources>
 		<Description2></Description2>
 	</Object>
-</LWM2M>
+</LWM2M>
diff --git a/leshan-server-demo/src/main/resources/models/3312.xml b/leshan-server-demo/src/main/resources/models/3312.xml
@@ -20,7 +20,7 @@
 			</Item>
 			<Item ID="5851">
 				<Name>Dimmer</Name>
-				<Operations>W</Operations>
+				<Operations>RW</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
 				<Type>Integer</Type>
@@ -58,7 +58,17 @@
 				<Units></Units>
 				<Description>The power factor of the load.</Description>
 			</Item>
+                        <Item ID="5750">
+                                <Name>Application Type</Name>
+                                <Operations>RW</Operations>
+                                <MultipleInstances>Single</MultipleInstances>
+                                <Mandatory>Optional</Mandatory>
+                                <Type>String</Type>
+                                <RangeEnumeration></RangeEnumeration>
+                                <Units></Units>
+                                <Description>The application type of the sensor or actuator as a string, for instance, “Air Pressure”</Description>
+                        </Item>
 		</Resources>
 		<Description2></Description2>
 	</Object>
-</LWM2M>
+</LWM2M>
diff --git a/leshan-server-demo/src/main/resources/models/3315.xml b/leshan-server-demo/src/main/resources/models/3315.xml
@@ -73,7 +73,7 @@
 				<Operations>E</Operations>
 				<MultipleInstances>Single</MultipleInstances>
 				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
+				<Type></Type>
 				<RangeEnumeration></RangeEnumeration>
 				<Units></Units>
 				<Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3316.xml b/leshan-server-demo/src/main/resources/models/3316.xml
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3317.xml b/leshan-server-demo/src/main/resources/models/3317.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3318.xml b/leshan-server-demo/src/main/resources/models/3318.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3319.xml b/leshan-server-demo/src/main/resources/models/3319.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3320.xml b/leshan-server-demo/src/main/resources/models/3320.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3321.xml b/leshan-server-demo/src/main/resources/models/3321.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3322.xml b/leshan-server-demo/src/main/resources/models/3322.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3323.xml b/leshan-server-demo/src/main/resources/models/3323.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3324.xml b/leshan-server-demo/src/main/resources/models/3324.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3325.xml b/leshan-server-demo/src/main/resources/models/3325.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>

diff --git a/leshan-server-demo/src/main/resources/models/3326.xml b/leshan-server-demo/src/main/resources/models/3326.xml
@@ -24,7 +24,7 @@
                 <Operations>R</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Float</Type>
+                <Type>String</Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Measurement Units Definition e.g. “Cel” for Temperature in Celsius</Description>
@@ -74,7 +74,7 @@
                 <Operations>E</Operations>
                 <MultipleInstances>Single</MultipleInstances>
                 <Mandatory>Optional</Mandatory>
-                <Type>Opaque</Type>
+                <Type></Type>
                 <RangeEnumeration></RangeEnumeration>
                 <Units></Units>
                 <Description>Reset the Min and Max Measured Values to Current Value</Description>