Skip to content
Snippets Groups Projects
Commit 81d24142 authored by Andreas Kraft's avatar Andreas Kraft
Browse files

Merge branch 'RDM-2020-0024-SDT_4_0_-_Renaming_Data_Types' into WI-0081-Smart_Device_Template_4_0 

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
#	SDT/schema4.0/docs/images/SDT_simplified.png
#	SDT/schema4.0/test/subdevices-test.xml
parents ff202849 6af1118e
Branches RDM-2020-0024-SDT_4_0_-_Renaming_Data_Types
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 85 additions and 85 deletions
SDT/schema4.0/docs/images/Array.png
+ 0
− 0
View replaced file @ ff202849 View file @ 81d24142
SDT/schema4.0/docs/images/Array.png

1.6 KiB | W: | H:

SDT/schema4.0/docs/images/Array.png

1.56 KiB | W: | H:

SDT/schema4.0/docs/images/Array.png
SDT/schema4.0/docs/images/Array.png
SDT/schema4.0/docs/images/Array.png
SDT/schema4.0/docs/images/Array.png
  • 2-up
  • Swipe
  • Onion skin
SDT/schema4.0/docs/images/Enum.png
+ 0
− 0
View replaced file @ ff202849 View file @ 81d24142
SDT/schema4.0/docs/images/Enum.png

2.08 KiB | W: | H:

SDT/schema4.0/docs/images/Enum.png

1.69 KiB | W: | H:

SDT/schema4.0/docs/images/Enum.png
SDT/schema4.0/docs/images/Enum.png
SDT/schema4.0/docs/images/Enum.png
SDT/schema4.0/docs/images/Enum.png
  • 2-up
  • Swipe
  • Onion skin
SDT/schema4.0/docs/images/SDT_UML_DataType.png
+ 0
− 0
View replaced file @ ff202849 View file @ 81d24142
SDT/schema4.0/docs/images/SDT_UML_DataType.png

55.9 KiB | W: | H:

SDT/schema4.0/docs/images/SDT_UML_DataType.png

53.6 KiB | W: | H:

SDT/schema4.0/docs/images/SDT_UML_DataType.png
SDT/schema4.0/docs/images/SDT_UML_DataType.png
SDT/schema4.0/docs/images/SDT_UML_DataType.png
SDT/schema4.0/docs/images/SDT_UML_DataType.png
  • 2-up
  • Swipe
  • Onion skin
SDT/schema4.0/docs/images/SimpleType.png
+ 0
− 0
View replaced file @ ff202849 View file @ 81d24142
SDT/schema4.0/docs/images/SimpleType.png

2.49 KiB | W: | H:

SDT/schema4.0/docs/images/SimpleType.png

2.28 KiB | W: | H:

SDT/schema4.0/docs/images/SimpleType.png
SDT/schema4.0/docs/images/SimpleType.png
SDT/schema4.0/docs/images/SimpleType.png
SDT/schema4.0/docs/images/SimpleType.png
  • 2-up
  • Swipe
  • Onion skin
SDT/schema4.0/docs/images/Struct.png
+ 0
− 0
View replaced file @ ff202849 View file @ 81d24142
SDT/schema4.0/docs/images/Struct.png

1.76 KiB | W: | H:

SDT/schema4.0/docs/images/Struct.png

1.69 KiB | W: | H:

SDT/schema4.0/docs/images/Struct.png
SDT/schema4.0/docs/images/Struct.png
SDT/schema4.0/docs/images/Struct.png
SDT/schema4.0/docs/images/Struct.png
  • 2-up
  • Swipe
  • Onion skin
SDT/schema4.0/etc/domain.rnc
+ 7
− 7
View file @ 81d24142
......@@ -29,7 +29,7 @@ PropertiesDef =
attribute value { text }?,
attribute semanticURI { xsd:anyURI }?,
DocDef,
SimpleType
Simple
}+
}
DataTypeDef =
......@@ -38,16 +38,16 @@ DataTypeDef =
attribute unitOfMeasure { text }?,
attribute semanticURI { xsd:anyURI }?,
DocDef,
(ExtendDef? | (StructType | ArrayType | SimpleType | EnumType)),
(ExtendDef? | (Struct | Array | Simple | Enum)),
ConstraintsDef?
}
StructType = element Struct { DataTypeDef+ }
ArrayType = element Array { DataTypeDef }
SimpleType =
element SimpleType {
Struct = element Struct { DataTypeDef+ }
Array = element Array { DataTypeDef }
Simple =
element Simple {
attribute type { BasicType }
}
EnumType = element Enum { EnumValueDef+ }
Enum = element Enum { EnumValueDef+ }
BasicType =
"integer"
| "boolean"
......
SDT/schema4.0/src/domain.rng
+ 10
− 10
View file @ 81d24142
......@@ -87,7 +87,7 @@
</attribute>
</optional>
<ref name="DocDef"/>
<ref name="SimpleType" />
<ref name="Simple" />
</element>
</oneOrMore>
</element>
......@@ -117,10 +117,10 @@
<ref name="ExtendDef" />
</optional>
<choice>
<ref name="StructType" />
<ref name="ArrayType" />
<ref name="SimpleType" />
<ref name="EnumType" />
<ref name="Struct" />
<ref name="Array" />
<ref name="Simple" />
<ref name="Enum" />
</choice>
</choice>
<optional>
......@@ -130,7 +130,7 @@
</define>
<define name="StructType">
<define name="Struct">
<element name="Struct">
<oneOrMore>
<ref name="DataTypeDef" />
......@@ -139,15 +139,15 @@
</define>
<define name="ArrayType">
<define name="Array">
<element name="Array">
<ref name="DataTypeDef" />
</element>
</define>
<define name="SimpleType">
<element name="SimpleType">
<define name="Simple">
<element name="Simple">
<attribute name="type">
<ref name="BasicType" />
</attribute>
......@@ -155,7 +155,7 @@
</define>
<define name="EnumType">
<define name="Enum">
<element name="Enum">
<oneOrMore>
<ref name="EnumValueDef" />
......
SDT/schema4.0/src/domain.xsd
+ 3
− 3
View file @ 81d24142
......@@ -60,7 +60,7 @@
<xs:complexContent>
<xs:extension base="DocDef">
<xs:sequence>
<xs:element ref="SimpleType"/>
<xs:element ref="Simple"/>
</xs:sequence>
<xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="optional" type="xs:boolean"/>
......@@ -80,7 +80,7 @@
<xs:choice>
<xs:element ref="Struct"/>
<xs:element ref="Array"/>
<xs:element ref="SimpleType"/>
<xs:element ref="Simple"/>
<xs:element ref="Enum"/>
</xs:choice>
</xs:choice>
......@@ -107,7 +107,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SimpleType">
<xs:element name="Simple">
<xs:complexType>
<xs:attribute name="type" use="required" type="BasicType"/>
</xs:complexType>
......
SDT/schema4.0/test/EchonetLiteExamples.xml
+ 13
− 13
View file @ 81d24142
......@@ -15,7 +15,7 @@
<DataPoint name="operationStatus" readable="true" writable="true">
<Doc>This property indicates the ON/OFF status.</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</DataPoint>
</Data>
......@@ -28,7 +28,7 @@
<DataPoint name="installationLocation" readable="true" writable="true">
<Doc>This property indicates the installation location</Doc>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</DataPoint>
</Data>
......@@ -46,7 +46,7 @@
<DataPoint name="measuredInstantaneousPowerConsumption" readable="true" writable="false">
<Doc>This property indicates the instantaneous power consumption of the device in watts.</Doc>
<DataType unitOfMeasure="watts">
<SimpleType type="integer" />
<Simple type="integer" />
</DataType>
</DataPoint>
</Data>
......@@ -57,7 +57,7 @@
<DataPoint name="measuredTemperatureValue" readable="true" writable="false">
<Doc>This property indicates the measured temperature value in units of 0.1C.</Doc>
<DataType unitOfMeasure="celsius">
<SimpleType type="integer" />
<Simple type="integer" />
</DataType>
</DataPoint>
</Data>
......@@ -74,10 +74,10 @@
<Properties>
<Property name="Name" value="washing machine">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="Vendor" value="ACME">
<SimpleType type="string" />
<Simple type="string" />
</Property>
</Properties>
......@@ -122,25 +122,25 @@
<DataPoint name="door_CoverOpen_CloseStatus" readable="true" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="washingMachineSetting" readable="true" writable="true">
<Doc>Washing machine setting</Doc>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" readable="true" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" readable="true" writable="false">
<Doc>This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.</Doc>
<DataType>
<SimpleType type="time" />
<Simple type="time" />
</DataType>
</DataPoint>
......@@ -152,19 +152,19 @@
<DataPoint name="onTimerReservationSetting" readable="true" writable="true">
<Doc>Reservation ON/OFF</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="onTimerSetting" readable="true" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time" />
<Simple type="time" />
</DataType>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" readable="true" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time" />
<Simple type="time" />
</DataType>
</DataPoint>
</Data>
......
SDT/schema4.0/test/SimpleExample.xml
+ 1
− 1
View file @ 81d24142
......@@ -9,7 +9,7 @@
<DataPoint name="status" readable="true" writable="true">
<Doc>This property indicates the ON/OFF status.</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</DataPoint>
</Data>
......
SDT/schema4.0/test/arg-test.xml
+ 4
− 4
View file @ 81d24142
......@@ -10,12 +10,12 @@
<Args>
<Arg name="argMandatory">
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Arg>
<Arg name="argOptional" optional="true">
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Arg>
</Args>
......@@ -24,12 +24,12 @@
<Args>
<Arg name="arg1" default="true">
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Arg>
<Arg name="arg2" default="foo">
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</Arg>
</Args>
......
SDT/schema4.0/test/dal-core.xml
+ 2
− 2
View file @ 81d24142
......@@ -16,7 +16,7 @@
<Action name="get">
<Doc>Obtain the current associated state.</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Action>
<Action name="setTarget">
......@@ -25,7 +25,7 @@
<Arg name="value">
<Doc>The desired value of the associated state.</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Arg>
</Args>
......
SDT/schema4.0/test/dal-eg.xml
+ 4
− 4
View file @ 81d24142
......@@ -9,12 +9,12 @@
<Properties>
<Property name="Name">
<Doc>Original value: PowerSwitch</Doc>
<SimpleType type="string"/>
<Simple type="string"/>
</Property>
<!-- The Vendor field should probably be part of the domain -->
<Property name="Vendor">
<Doc>Original value: Telekom Innovation Laboratories</Doc>
<SimpleType type="string"/>
<Simple type="string"/>
</Property>
</Properties>
<ModuleClasses>
......@@ -30,7 +30,7 @@
<Action name="state">
<Doc>Query the state of the switch. Returns the string &quot;<tt>on</tt>&quot; or &quot;<tt>off</tt>&quot;.</Doc>
<DataType>
<SimpleType type="string"/>
<Simple type="string"/>
</DataType>
</Action>
</Actions>
......@@ -40,7 +40,7 @@
<Data>
<DataPoint name="state" writable="false">
<DataType>
<SimpleType type="boolean"/>
<Simple type="boolean"/>
</DataType>
</DataPoint>
</Data>
......
SDT/schema4.0/test/datapoint-test.xml
+ 1
− 1
View file @ 81d24142
......@@ -7,7 +7,7 @@
<Data>
<DataPoint name="TestDataPoint" optional="true" default="foo">
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</DataPoint>
</Data>
......
SDT/schema4.0/test/datatypes-test.xml
+ 1
− 1
View file @ 81d24142
......@@ -4,7 +4,7 @@
<Domain id="datatypes-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<DataTypes>
<DataType name="temperatureType" unitOfMeasure="C">
<SimpleType type="float"/>
<Simple type="float"/>
</DataType>
<DataType name="anEnumType">
<Enum>
......
SDT/schema4.0/test/deviceClass-test.xml
+ 1
− 1
View file @ 81d24142
......@@ -8,7 +8,7 @@
<Doc>This is a test device.</Doc>
<Properties>
<Property name="aProperty">
<SimpleType type="string"></SimpleType>
<Simple type="string" />
</Property>
</Properties>
<ModuleClasses>
......
SDT/schema4.0/test/deviceModbusTemperature.xml
+ 10
− 10
View file @ 81d24142
......@@ -7,37 +7,37 @@
<DataPoint name="currentTemperature" readable="true" writable="false" eventable="true" optional="false">
<Doc>The current temperature.</Doc>
<DataType>
<SimpleType type="float" />
<Simple type="float" />
</DataType>
</DataPoint>
<DataPoint name="targetTemperature" readable="true" writable="true" eventable="true" optional="true">
<Doc>The desired temperature to reach.</Doc>
<DataType>
<SimpleType type="float" />
<Simple type="float" />
</DataType>
</DataPoint>
<DataPoint name="unit" readable="true" writable="false" eventable="true" optional="true">
<Doc>The unit of measure for the temperature values. The default is Celsius (C).</Doc>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="minValue" readable="true" writable="false" eventable="true" optional="true">
<Doc>Minimum value of "targetTemperature".</Doc>
<DataType>
<SimpleType type="float" />
<Simple type="float" />
</DataType>
</DataPoint>
<DataPoint name="maxValue" readable="true" writable="false" eventable="true" optional="true">
<Doc>Maximum value of "targetTemperature".</Doc>
<DataType>
<SimpleType type="float" />
<Simple type="float" />
</DataType>
</DataPoint>
<DataPoint name="stepValue" readable="true" writable="false" eventable="true" optional="true">
<Doc>Step value allowed for "targetTemperature".</Doc>
<DataType>
<SimpleType type="float" />
<Simple type="float" />
</DataType>
</DataPoint>
</Data>
......@@ -49,16 +49,16 @@
<Doc>This is a test device.</Doc>
<Properties>
<Property name="address">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="functionCode">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="registers">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="slaveID">
<SimpleType type="string" />
<Simple type="string" />
</Property>
</Properties>
<ModuleClasses>
......
SDT/schema4.0/test/example1.SDT.xml
+ 5
− 5
View file @ 81d24142
......@@ -12,7 +12,7 @@
<DataPoint name="operationStatus" writable="true">
<Doc>This property sets the ON/OFF status.</Doc>
<DataType>
<SimpleType type="boolean"/>
<Simple type="boolean"/>
</DataType>
</DataPoint>
</Data>
......@@ -28,7 +28,7 @@
<DataPoint name="installationLocation" writable="true">
<Doc>This property indicates the installation location</Doc>
<DataType>
<SimpleType type="string"/>
<Simple type="string"/>
</DataType>
</DataPoint>
</Data>
......@@ -42,7 +42,7 @@
<DataPoint name="measuredCumulativePowerConsumption" writable="false">
<Doc>This indicates cumulative power consumption of the device in increments of 0.001kWh.</Doc>
<DataType unitOfMeasure="watt">
<SimpleType type="integer"/>
<Simple type="integer"/>
</DataType>
</DataPoint>
</Data>
......@@ -53,7 +53,7 @@
<DataPoint name="onTimer" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time"/>
<Simple type="time"/>
</DataType>
</DataPoint>
</Data>
......@@ -64,7 +64,7 @@
<DataPoint name="statusDoor" writable="false">
<Doc>This reads the open=true or closed=false status of a door </Doc>
<DataType>
<SimpleType type="boolean"/>
<Simple type="boolean"/>
</DataType>
</DataPoint>
</Data>
......
SDT/schema4.0/test/extends-test.xml
+ 3
− 3
View file @ 81d24142
......@@ -7,12 +7,12 @@
<Data>
<DataPoint name="TestExtendsDataPoint1" writable="true">
<DataType>
<SimpleType type="integer" />
<Simple type="integer" />
</DataType>
</DataPoint>
<DataPoint name="TestExtendsDataPoint2" writable="true">
<DataType>
<SimpleType type="integer" />
<Simple type="integer" />
</DataType>
</DataPoint>
</Data>
......@@ -25,7 +25,7 @@
<Data>
<DataPoint name="TestExtendsDataPoint3" writable="true">
<DataType>
<SimpleType type="integer" />
<Simple type="integer" />
</DataType>
</DataPoint>
</Data>
......
SDT/schema4.0/test/mseeb.xml
+ 20
− 20
View file @ 81d24142
......@@ -82,7 +82,7 @@
Obtain the current associated state.
</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Action>
<Action name="setTarget">
......@@ -95,7 +95,7 @@
The desired value of the associated state.
</Doc>
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</Arg>
</Args>
......@@ -106,7 +106,7 @@
<Data>
<DataPoint name="state" readable="true">
<DataType>
<SimpleType type="boolean" />
<Simple type="boolean" />
</DataType>
</DataPoint>
</Data>
......@@ -128,23 +128,23 @@
<Properties>
<Property name="Name">
<Doc>Original value: Multi Socket Electrical-Extension-Block</Doc>
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="Vendor">
<Doc>Original value: HGI</Doc>
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="FirmwareVersion">
<Doc>Original value: 1.0</Doc>
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="VendorURL">
<Doc>Original value: http://www.onem2m.org</Doc>
<SimpleType type="uri" />
<Simple type="uri" />
</Property>
<Property name="SerialNumber">
<Doc>Original value: 1234.5</Doc>
<SimpleType type="string" />
<Simple type="string" />
</Property>
</Properties>
......@@ -163,7 +163,7 @@
<Properties>
<Property name="version" value="1.0.0">
<Doc>Version for this ModuleClass</Doc>
<SimpleType type="string" />
<Simple type="string" />
</Property>
</Properties>
</ModuleClass>
......@@ -177,7 +177,7 @@
<Array>
<DataType>
<Doc>This is an example simple data type with a minimum-value constraint.</Doc>
<SimpleType type="float" />
<Simple type="float" />
<Constraints>
<Constraint name="minValue" type="float" value="0.0">
<Doc>The value must be equal or greater 0.0</Doc>
......@@ -192,7 +192,7 @@
<DataType name="timeFrame">
<Array>
<DataType>
<SimpleType type="datetime" />
<Simple type="datetime" />
</DataType>
</Array>
</DataType>
......@@ -208,7 +208,7 @@
<DataType name="names">
<Array>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</Array>
</DataType>
......@@ -222,7 +222,7 @@
This datapoint represents the firmware version of the extension block.
</Doc>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</DataPoint>
......@@ -235,7 +235,7 @@
<DataType>
<Array>
<DataType>
<SimpleType type="string" />
<Simple type="string" />
</DataType>
</Array>
</DataType>
......@@ -257,10 +257,10 @@
</Doc>
<Properties>
<Property name="Name" value="PowerSwitch 1">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="Vendor" value="HGI">
<SimpleType type="string" />
<Simple type="string" />
</Property>
</Properties>
<ModuleClasses>
......@@ -278,16 +278,16 @@
</Doc>
<Properties>
<Property name="Name" value="PowerSwitch 2">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="Vendor" value="HGI">
<SimpleType type="string" />
<Simple type="string" />
</Property>
<Property name="VendorURL" value="http://www.onem2m.org">
<SimpleType type="uri" />
<Simple type="uri" />
</Property>
<Property name="maximumAltitude" value="2800">
<SimpleType type="integer" />
<Simple type="integer" />
</Property>
</Properties>
<ModuleClasses>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment