Skip to content
Snippets Groups Projects
Commit 8ac28e39 authored by ankraft's avatar ankraft
Browse files

Merge branch 'WI-0081-Smart_Device_Template_4_0' into RDM-2019-0065-SDT_4_0_-_Documentation_changes 

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
parents 7ff61ade 24da6924
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 280 additions and 80 deletions
SDT/schema4.0/test/datatypes-test.xml 0 → 100644
+ 31
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
<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"/>
</DataType>
<DataType name="anEnumType">
<Enum>
<EnumValue name="red" type="integer" value="1"/>
<EnumValue name="green" value="2"/>
<EnumValue name="blue" value="3"/>
</Enum>
</DataType>
</DataTypes>
<ModuleClasses>
<ModuleClass name="TestDataTypes">
<Data>
<DataPoint name="TestDataPoint" writable="true">
<DataType>
<Extend domain="datatypes-test" entity="temperatureType" />
</DataType>
</DataPoint>
</Data>
</ModuleClass>
</ModuleClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/deviceClass-test.xml 0 → 100644
+ 21
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass.test" >
<Imports>
<xi:include href="./dal-core.xml" parse="xml"/>
</Imports>
<DeviceClasses>
<DeviceClass id="Test">
<Doc>This is a test device.</Doc>
<Properties>
<Property name="aProperty">
<SimpleType type="string"></SimpleType>
</Property>
</Properties>
<ModuleClasses>
<ModuleClass name="aModuleClass">
<Extend domain="hgi.dal.core" entity="BooleanState" />
</ModuleClass>
</ModuleClasses>
</DeviceClass>
</DeviceClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/enumtype-test.xml 0 → 100644
+ 20
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the EnumType -->
<Domain id="enumtype-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestEnumType">
<Data>
<DataPoint name="TestEnumTypeDataPoint" writable="true">
<DataType>
<Enum>
<EnumValue name="red" value="1" type="integer" />
<EnumValue name="green" value="2" />
<EnumValue name="blue" value="3" />
</Enum>
</DataType>
</DataPoint>
</Data>
</ModuleClass>
</ModuleClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/example1.SDT.xml
+ 3
− 3
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example1.SDT">
<Modules>
<ModuleClasses>
<!-- Various examples for module classes -->
<ModuleClass name="operationStatus">
......@@ -70,6 +70,6 @@
</Data>
</ModuleClass>
</Modules>
</ModuleClasses>
</Domain>
SDT/schema4.0/test/example2.SDT.xml
+ 22
− 22
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example2.SDT">
......@@ -8,25 +8,25 @@
<xi:include href="./example1.SDT.xml" parse="xml" />
</Imports>
<Devices>
<Device id="airConditioner">
<Modules>
<Module name="operationStatus">
<extends domain="example1.SDT" class="operationStatus"/>
</Module>
<Module name="installationLocation">
<extends domain="example1.SDT" class="installationLocation"/>
</Module>
<Module name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
</Module>
<Module name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
</Module>
<Module name="onTimerSetting">
<extends domain="example1.SDT" class="onTimerSetting"/>
</Module>
</Modules>
</Device>
</Devices>
<DeviceClasses>
<DeviceClass id="airConditioner">
<ModuleClasses>
<ModuleClass name="operationStatus">
<Extend domain="example1.SDT" entity="operationStatus"/>
</ModuleClass>
<ModuleClass name="installationLocation">
<Extend domain="example1.SDT" entity="installationLocation"/>
</ModuleClass>
<ModuleClass name="measuredCumulativePowerConsumption">
<Extend domain="example1.SDT" entity="measuredCumulativePowerConsumption"/>
</ModuleClass>
<ModuleClass name="measuredCumulativePowerConsumption">
<Extend domain="example1.SDT" entity="measuredCumulativePowerConsumption"/>
</ModuleClass>
<ModuleClass name="onTimerSetting">
<Extend domain="example1.SDT" entity="onTimerSetting"/>
</ModuleClass>
</ModuleClasses>
</DeviceClass>
</DeviceClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/example3.SDT.xml
+ 25
− 25
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example3.SDT">
......@@ -8,28 +8,28 @@
<xi:include href="./example1.SDT.xml" parse="xml" />
</Imports>
<Devices>
<Device id="waschingMachine">
<Modules>
<Module name="operationStatus">
<extends domain="example1.SDT" class="operationStatus"/>
</Module>
<Module name="installationLocation">
<extends domain="example1.SDT" class="installationLocation"/>
</Module>
<Module name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
</Module>
<Module name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
</Module>
<Module name="onTimerSetting">
<extends domain="example1.SDT" class="onTimerSetting"/>
</Module>
<Module name="statusDoor">
<extends domain="example1.SDT" class="statusDoor"/>
</Module>
</Modules>
</Device>
</Devices>
<DeviceClasses>
<DeviceClass id="waschingMachine">
<ModuleClasses>
<ModuleClass name="operationStatus">
<Extend domain="example1.SDT" entity="operationStatus"/>
</ModuleClass>
<ModuleClass name="installationLocation">
<Extend domain="example1.SDT" entity="installationLocation"/>
</ModuleClass>
<ModuleClass name="measuredCumulativePowerConsumption">
<Extend domain="example1.SDT" entity="measuredCumulativePowerConsumption"/>
</ModuleClass>
<ModuleClass name="measuredCumulativePowerConsumption">
<Extend domain="example1.SDT" entity="measuredCumulativePowerConsumption"/>
</ModuleClass>
<ModuleClass name="onTimerSetting">
<Extend domain="example1.SDT" entity="onTimerSetting"/>
</ModuleClass>
<ModuleClass name="statusDoor">
<Extend domain="example1.SDT" entity="statusDoor"/>
</ModuleClass>
</ModuleClasses>
</DeviceClass>
</DeviceClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/extends-test.xml 0 → 100644
+ 33
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the extends element -->
<Domain id="extend-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestExtendsParent">
<Data>
<DataPoint name="TestExtendsDataPoint1" writable="true">
<DataType>
<SimpleType type="integer" />
</DataType>
</DataPoint>
<DataPoint name="TestExtendsDataPoint2" writable="true">
<DataType>
<SimpleType type="integer" />
</DataType>
</DataPoint>
</Data>
</ModuleClass>
<ModuleClass name="TestExtendsChild">
<Extend domain="extend-test" entity="TestExtendsParent">
<Exclude name="TestExtendsDataPoint2" type="datapoint" />
</Extend>
<Data>
<DataPoint name="TestExtendsDataPoint3" writable="true">
<DataType>
<SimpleType type="integer" />
</DataType>
</DataPoint>
</Data>
</ModuleClass>
</ModuleClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/mseeb.xml
+ 30
− 30
View file @ 8ac28e39
......@@ -5,7 +5,7 @@
<!--
+................................................+
:Domain:org.homegatewayinitiative :
:Domain:org.onem2m :
: :
: +..........................................+ :
: :Module:BooleanState : :
......@@ -62,8 +62,8 @@
-->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
id="org.homegatewayinitiative">
xmlns="http://www.onem2m.org/xml/sdt/4.0"
id="org.onem2m">
<!-- The following import statements include ModuleClasses from HGI -->
......@@ -71,7 +71,7 @@
<xi:include href="./dal-core.xml" parse="xml" />
</Imports>
<Modules>
<ModuleClasses>
<ModuleClass name="BooleanState">
<Doc>
<tt>BooleanState</tt> is the preferred module for modelling a functionality corresponding to an underlying binary state.This module should be used to abstract away from the actual datatype and values in question. Note that the module does not define whether the execution mode is blocking or non-blocking.
......@@ -113,15 +113,15 @@
</Event>
</Events>
</ModuleClass>
</Modules>
</ModuleClasses>
<!-- Definition of the Device starts here. -->
<Devices>
<DeviceClasses>
<!-- The Device contains several sub-devices and offers one action on its own. -->
<Device id="MSEEB.root">
<DeviceClass id="MSEEB.root">
<Doc>
This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
</Doc>
......@@ -139,7 +139,7 @@
<SimpleType type="string" />
</Property>
<Property name="VendorURL">
<Doc>Original value: http://www.homegatewayinitative.org</Doc>
<Doc>Original value: http://www.onem2m.org</Doc>
<SimpleType type="uri" />
</Property>
<Property name="SerialNumber">
......@@ -153,21 +153,21 @@
- A module with some data points for the firmware version of the whole device and a list of names of the containted power switches.
-->
<Modules>
<Module name="rootPowerOnOff" optional="true">
<extends domain="hgi.dal.core" class="BooleanState"/>
<ModuleClasses>
<ModuleClass name="rootPowerOnOff" optional="true">
<Doc>
The proprietry interface for turning all switches of the extension block on and off.
The action "BooleanState:get" returns "true" when any of the sub-devices is in the state "on", otherwise it returns "false".
</Doc>
<Extend domain="hgi.dal.core" entity="BooleanState"/>
<Properties>
<Property name="version" value="1.0.0">
<Doc>Version for this ModuleClass</Doc>
<SimpleType type="string" />
</Property>
</Properties>
</Module>
<Module name="power">
</ModuleClass>
<ModuleClass name="power">
<Actions>
<Action name="getPowerConsumption">
<Doc>Get the power consumption.</Doc>
......@@ -200,9 +200,9 @@
</DataType>
</Action>
</Actions>
</Module>
</ModuleClass>
<Module name="extensionBlockDataPoints">
<ModuleClass name="extensionBlockDataPoints">
<Actions>
<Action name="getNames">
<DataType name="names">
......@@ -241,8 +241,8 @@
</DataType>
</DataPoint>
</Data>
</Module>
</Modules>
</ModuleClass>
</ModuleClasses>
<!-- Definition of sub-devices starts here. -->
......@@ -263,11 +263,11 @@
<SimpleType type="string" />
</Property>
</Properties>
<Modules>
<Module name="power">
<extends domain="hgi.dal.core" class="BooleanState"/>
</Module>
</Modules>
<ModuleClasses>
<ModuleClass name="power">
<Extend domain="hgi.dal.core" entity="BooleanState"/>
</ModuleClass>
</ModuleClasses>
</SubDevice>
<!-- This is the second power switch of the extension block. -->
......@@ -283,22 +283,22 @@
<Property name="Vendor" value="HGI">
<SimpleType type="string" />
</Property>
<Property name="VendorURL" value="http://homegatwaysinitiative.org">
<Property name="VendorURL" value="http://www.onem2m.org">
<SimpleType type="uri" />
</Property>
<Property name="maximumAltitude" value="2800">
<SimpleType type="integer" />
</Property>
</Properties>
<Modules>
<Module name="power">
<extends domain="hgi.dal.core" class="BooleanState"/>
</Module>
</Modules>
<ModuleClasses>
<ModuleClass name="power">
<Extend domain="hgi.dal.core" entity="BooleanState"/>
</ModuleClass>
</ModuleClasses>
</SubDevice>
</SubDevices>
</Device>
</Devices>
</DeviceClass>
</DeviceClasses>
</Domain>
SDT/schema4.0/test/productClass-test.xml 0 → 100644
+ 41
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="productClass-test" >
<ProductClasses>
<ProductClass id="TestProductClass" semanticURI="http://example.com/TestProduct.rdf">
<Doc>This is a test product</Doc>
<Properties>
<Property name="aProperty">
<SimpleType type="string"></SimpleType>
</Property>
</Properties>
<ModuleClasses>
<ModuleClass name="aModuleClass">
<Extend domain="hgi.dal.core" entity="BooleanState" />
</ModuleClass>
</ModuleClasses>
<SubDevices>
<SubDevice id="aSubDevice">
<ModuleClasses>
<ModuleClass name="aSubDeviceModuleClass">
<Extend domain="hgi.dal.core" entity="BooleanState"/>
</ModuleClass>
</ModuleClasses>
</SubDevice>
</SubDevices>
<DeviceClass>
<Extend domain="deviceClass.test" entity="Test" />
</DeviceClass>
</ProductClass>
<!-- Derived ProductClass -->
<ProductClass id="DerivedProductClass" semanticURI="http://example.com/DerivedProduct.rdf">
<Extend domain="productClass.test" entity="TestProductClass" />
<ModuleClasses>
<ModuleClass name="anotherModuleClass">
<Extend domain="hgi.dal.core" entity="BooleanState" />
</ModuleClass>
</ModuleClasses>
</ProductClass>
</ProductClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/semanticURI-test.xml 0 → 100644
+ 31
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
<Domain id="semanticURI-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
<DataTypes>
<DataType name="temperatureType" unitOfMeasure="C" semanticURI="http://example.com/temperatureType.rdf">
<SimpleType type="float"/>
</DataType>
<DataType name="anEnumType" semanticURI="http://example.com/anEnumType.rdf">
<Enum>
<EnumValue name="red" type="integer" value="1" semanticURI="http://example.com/anEnumType-red.rdf"/>
<EnumValue name="green" value="2" semanticURI="http://example.com/anEnumType-green.rdf"/>
<EnumValue name="blue" value="3" semanticURI="http://example.com/anEnumType-blue.rdf"/>
</Enum>
</DataType>
</DataTypes>
<ModuleClasses>
<ModuleClass name="TestDataTypes" semanticURI="http://example.com/TestDataTypes.rdf">
<Data>
<DataPoint name="TestDataPoint" writable="true" semanticURI="http://example.com/TestDataPoint.rdf">
<DataType>
<Extend domain="datatypes-test" entity="temperatureType" />
</DataType>
</DataPoint>
</Data>
</ModuleClass>
</ModuleClasses>
</Domain>
\ No newline at end of file
SDT/schema4.0/test/void-test.xml 0 → 100644
+ 23
− 0
View file @ 8ac28e39
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the void BasicType -->
<Domain id="void-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestVoid">
<Actions>
<Action name="TestVoidAction">
<DataType>
<SimpleType type="void"/>
</DataType>
</Action>
</Actions>
<Data>
<DataPoint name="TestVoidDataPoint" writable="true">
<DataType>
<SimpleType type="void"/>
</DataType>
</DataPoint>
</Data>
</ModuleClass>
</ModuleClasses>
</Domain>
\ No newline at end of file
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