diff --git a/SDT/schema3.0/docs/Examples.md b/SDT/schema3.0/docs/Examples.md
index 4082f949e494d9f2f1c466ce02e6f8cd3e8fcac9..5cdf3f82eee2879fc45c93928c0b25c1e11e1218 100644
--- a/SDT/schema3.0/docs/Examples.md
+++ b/SDT/schema3.0/docs/Examples.md
@@ -1,14 +1,159 @@
# Examples and Contributions
+[A simple example](#simpleExample)
+[Multi Socket Electrical-Extension-Block](#mseeb)
-## HGI
+<a name="simpleExample"></a>
+## A very simple SDT example
+In the ideal case, a large organization or SDO would define a widely-applicable set of [ModuleClasses](SDT_Components.md#ModuleClass), each of which could be used as needed to compose the description of a complex device. In order to show the appoach, this section will create a few example ModuleClasses based on - or inspired by - featues in the Echonet Lite protocol. Please note that the examples shown in this document are very "cut down" and by no means represent a true representation of Echonet Lite.
+
+The Echonet Consortium has standardized their specifications within IEC/ISO (IEC62394, ISO/IEC24767-1, ISO/IEC24767-2, IEC62480, ISO/IEC14543-4-1, ISO/IEC14543-4-2, IEC62457) and they provide a comprehensive collection of various types of home appliances relevant to SmartGrid applications as ECHONET Device objects (see [https://echonet.jp/spec_object_rf_en/](https://echonet.jp/spec_object_rf_en/) ).
+
+For the example in this document, to show re-use of ModuleClass definitions, two complex devices are chosen which have some common features and hence could be expected to both use some of the same ModuleClasses: an air conditioner and a washing machine.
+
+<table>
+<tr><th>Funtionality</th><th>Air Conditioner</th><th>Washing Machine</th></tr>
+<tr><td>operationStatus</td><td>operates on/off</td><td>operates on/off</td></tr>
+<tr><td>measuredCumulativePowerConsumption</td><td>the cumulative power consumption</td><td>the cumulative power consumption</td></tr>
+<tr><td>installationLocation</td><td>this sets/reads a string text describing the location (room) of the air-conditioner.</td><td>this sets/reads a string text describing the location (room) of the washing machine.</td></tr>
+<tr><td>setTimer</td><td>(not applicable. there is no preset start for an air-conditioner)</td><td>This sets/reads use the on/off timer</td></tr>
+</table>
+
+Based on the simplified example above, the two appliances will need the ModuleClasses below:
+
+- *air-conditioner*: operationStatus, measuredCumulativePowerConsumption, installationLocation;
+- *washing-machine*: operationStatus, measuredCumulativePowerConsumption, and setTimer.
+
+ <ModuleClass name="operationStatus">
+ <Data>
+ <DataPoint name="operationStatus" writable="true">
+ <Doc>This property sets/reads the ON/OFF status.</Doc>
+ <DataType>
+ <SimpleType type="boolean"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ <Events>
+ <Event name="operationStatus">
+ </Event>
+ </Events>
+ </ModuleClass>
+
+ <ModuleClass name="measuredCumulativePowerConsumption">
+ <Data>
+ <DataPoint name="measuredCumulativePowerConsumption" writable="false">
+ <Doc>This indicates cumulative power consumption of the device in increments of 0.001kWh.</Doc>
+ <DataType>
+ <SimpleType type="integer"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ </ModuleClass>
+
+ <ModuleClass name="installationLocation">
+ <Data>
+ <DataPoint name="installationLocation" writable="true">
+ <Doc>This property indicates the installation location</Doc>
+ <DataType>
+ <SimpleType type="string"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ <Events>
+ <Event name="installationLocation"> </Event>
+ </Events>
+ </ModuleClass>
+
+ <ModuleClass name="onTimerSetting">
+ <DataPoint name="onTimer" writable="true">
+ <Doc>Timer value (HH:MM)</Doc>
+ <DataType>
+ <SimpleType type="time"/>
+ </DataType>
+ </DataPoint>
+ </ModuleClass>
+
+The structure and the according SDT now looks like this:
+
+<table>
+<tr><td colspan="2" width="50%"><b>Example1.SDT</b></td></tr>
+<tr><td> </td><td>Namespace information</td></tr>
+<tr><td> </td><td>Modules (contains ModuleClasses)</td></tr>
+<tr><td> </td><td>operationStatus<ul>
+ <li>measuredCumulativePowerConsumption</li>
+ <li>installationLocation</li>
+ <li>onTimerSetting</li></ul></td></tr>
+</table>
+
+ <?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"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ id="example1.SDT">
+
+ <Modules>
+ <!-- Various examples for module classes -->
+ <ModuleClass name="operationStatus">
+ <Data>
+ <DataPoint name="operationStatus" writable="true">
+ <Doc>This property sets the ON/OFF status.</Doc>
+ <DataType>
+ <SimpleType type="boolean"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ <Events>
+ <Event name="operationStatus">
+ </Event>
+ </Events>
+ </ModuleClass>
+
+ <ModuleClass name="installationLocation">
+ <Data>
+ <DataPoint name="installationLocation" writable="true">
+ <Doc>This property indicates the installation location</Doc>
+ <DataType>
+ <SimpleType type="string"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ <Events>
+ <Event name="installationLocation"> </Event>
+ </Events>
+ </ModuleClass>
+
+ <ModuleClass name="measuredCumulativePowerConsumption">
+ <Data>
+ <DataPoint name="measuredCumulativePowerConsumption" writable="false">
+ <Doc>This indicates cumulative power consumption of the device in increments of 0.001kWh.</Doc>
+ <DataType>
+ <SimpleType type="integer"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ </ModuleClass>
+
+ <ModuleClass name="onTimerSetting">
+ <DataPoint name="onTimer" writable="true">
+ <Doc>Timer value (HH:MM)</Doc>
+ <DataType>
+ <SimpleType type="time"/>
+ </DataType>
+ </DataPoint>
+ </ModuleClass>
+ </Modules>
+ </Domain>
+
+
+---
+
+<a name="mseeb"></a>
### Multi Socket Electrical-Extension-Block
-[mseeb.xml](../test/mseeb.xml)
+This example is a specification for an imaginged device, a connected extension block with multiple power socket where each of the sockets are modeled as a
+separate *SubDevice*.
-
+[mseeb.xml](../test/mseeb.xml)
-## DECT ULE
-## Echonet
+---
-## EnOcean
\ No newline at end of file
diff --git a/SDT/schema3.0/docs/SDT_Components.md b/SDT/schema3.0/docs/SDT_Components.md
index cb1a03e912f351d78d87a717e2dace07e540d8cb..63a275a4821d2a76375d43494cfb9efd4360b61e 100644
--- a/SDT/schema3.0/docs/SDT_Components.md
+++ b/SDT/schema3.0/docs/SDT_Components.md
@@ -1,13 +1,18 @@
# SDT Components
[Domain](#Domain)
-[RootDevice](#RootDevice) | [Device](#Device)
- [DeviceInfo](#DeviceInfo)
+[Device](#Device) | [SubDevice](#SubDevice)
+[Property](#Property)
[ModuleClass](#ModuleClass)
[Action](#Action)
- [Data / DataPoint](#Data)
- [DataType](#DataType)
+ [DataPoint](#DataPoint)
[Event](#Event)
+[Data Types](#Data_Types)
+ [DataType](#DataType)
+ [Constraint](#Constraint)
+ [SimpleType](#SimpleType)
+ [StructType](#StructType)
+ [ArrayType](#ArrayType)
[Doc](#Documentation)
---
@@ -37,10 +42,6 @@ The followng UML diagram presents an overview about the SDT components.
-The [DataType](#DataType) strukture is shown in the following UML diagram:
-
-
-
The key to the diagram elements of the UML diagrams above and the snippets in the following sections:
@@ -53,176 +54,181 @@ The syntax used in the diagram to model an XML Schema Definition (XSD) as an UML
## Components
-
-**NOTE** The content here is still SDT2 and needs to be updated
-
-
-
-
<a name="Domain"></a>
### Domain
-The *Domain* is the top-level component that defines all modules and devices of a domain. A *Domain* can import definitions of other domains.
-
-A *Domain* can define [Modules](#ModuleClass) or [RootDevices](#RootDevice) only, or may choose to provide both.
+The *Domain* element allows labeling of different SDT templates for different technologies and/or industry segments ("verticals"): for example eHealth and Building Management might prefer quite different detailed structures/templates. This also helps keep information in human-friendly and manageable blocks. It is assumed that there will be multiple "SDT Templates" and some of them may be completely proprietary.
+
+It can also be used to collect all specified [ModuleClasses](#ModuleClasses)
+ and [Devices](#Devices) in one referencable logical group.
+
#### Attributes
- **id** : The identifier for that *Domain*. Required.
#### Elements
+- **[Doc](#Documentation)** : Documentation for the *Domain*. Optional.
- **Imports** : XML import/include of other XML files. Optional.
-- **Modules** : A list of [Module](#ModuleClass) components that are global to the whole domain. Optional.
-- **RootDevices** : a List of [RootDevices](#RootDevice) components. Optional.
+- **[Module](#ModuleClass)** : A list of *Module* components that are global to the whole domain. Optional.
+- **[Devices](#Device)** : a List of *Devices* components. Optional.
#### Example
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
id="org.homegatewayinitiative">
+ <Doc>Some documentation</Doc>
+
<Imports>
- <xi:include href="./dal-core.xml" parse="xml" />
+ <!-- Import other SDTs via XInclude's include mechanism -->
+ <xi:include href="./dal-core.xml" parse="xml" />
</Imports>
+
<Modules>
<!-- List of Domain global Modules goes here -->
</Modules>
- <RootDevices>
- <!-- List of RootDevices goes here -->
- </RootDevices>
+ <Devices>
+ <!-- List of Devices goes here -->
+ </Devices>
</Domain>
-
---
-<a name="RootDevice"/></a>
-### RootDevice
+<a name="Device"/></a>
+### Device
-A *RootDevice* is the definition of a physical device that may contain optional embedded sub-devices. It represents the idea an appliance that is addressable on a Home Area Network where one or more sub-[Devices](#Devices) provide certain functionalities.
+
-For each physical device on the network at least one *RootDevice* **must** be defined. If the physical device is a simple device, ie. it does not contain embedded devices, e.g. a light switch, it does not include further *Devices*. On the other hand, if the pyhsical is a compound device, ie. it does contain embedded devices that can be addressed separately, the *RootDevice* **should** contain *Devices* for each of the identifiable embedded devices.
+The *Device* was initially thought of as the representation of "the basic things we are trying to model" and can still be considered so. However, after discussion with various SDOs, it was decided to add also "[sub-devices](#SubDevice)". That is, there is one level of hierarchy to allow modeling of e.g. a set of independent energy monitoring plugs in a single addressable power-extension-block. (Other SDOs might consider it more appropriate to use a recursive sub-sub-sub ... device definition). Note that all the different devices which one needs to model within a Domain are composed of one or more [Modules](#ModuleClass).
-There is also the possibility to have more than one *RootDevice* for one physical device if a physical device offers more than one distinguishable services or when it is for other reasons meaningful to deliberatly separate the device's services.
+For each physical device on the network at least one *Device* **must** be defined. If the physical device is a simple device, ie. it does not contain embedded devices, e.g. a light switch, it does not include further [SubDevices](#SubDevices). On the other hand, if the physical is a compound device, ie. it does contain embedded devices that can be addressed separately, the *Device* **should** contain [SubDevices](SubDevices) for each of the identifiable embedded devices.
An example for a compound device is a connected power-strip where each of the sockets can be switched on and off individually. The power-strip itself can provide functions such as "all sockets off" and "overall power consumption".
-If the *RootDevice* includes sub-[Devices](#Device) then each sub-device may be of the same type or of different types. The functionality ([Actions](#Action)) of the *RootDevice* may be different from the functionality of its sub-[Devices](#Device).
-
-If the *RootDevice* does not include sub-devices then the *RootDevice* is the actual adressable device that provides all the functionality of the connected appliance.
-
-*RootDevices* may define their own [ModuleClasses](#ModuleClass) or refer to predefined ModulesClasses of the same or another *Domain*.
-
-
+*Devices* may define their own [ModuleClasses](#ModuleClass) or refer to predefined ModulesClasses of the same or another [Domain](Domain).
#### Attributes
-- **id** : The identifier for that *RootDevice*. The identifier must be unique at least in the scope of the domain, but the final scope is also influenced by implementing technologies. Required.
+- **id** : The identifier for that *Device*. The identifier must be unique at least in the scope of the domain, but the final scope is also influenced by implementing technologies. Required.
#### Elements
-- **[Doc](#Documentation)** : Documentation for the *RootDevice*. Optional.
-- **Modules** : A list of [Module](#ModuleClass) components that are local to the *RootDevice*. Optional.
-- **[DeviceInfo](#DeviceInfo)** : Further meta-data about the *RootDevice*. Optional.
-- **Devices** : A list of [Device](#Device) components. Optional.
+- **[Doc](#Documentation)** : Documentation for the *Device*. Optional.
+- **[Properties](#Property)** : Further meta-data (or properties) about the *Device*. Optional.
+- **[Modules](#ModuleClass)** : A list of *Module* components that are local to the *Device*. Optional.
+- **[SubDevices](#SubDevice)** : A list of *SubDevice* components. Optional.
#### Example
- <RootDevice id="aRootDevice">
+ <Device id="aDevice">
<Doc>Some documentation</Doc>
+ <Properties>
+ <!-- The list of Properties for the Device goes here-->
+ </Properties>
<Modules>
- <!-- List of Modules local to the RootDevice goes here-->
+ <!-- List of Modules local to the Device goes here-->
</Modules>
- <DeviceInfo>
- <!-- The DeviceInfos for the RootDevice goes here-->
- </DeviceInfo>
- <Devices>
- <!-- List of Sub-Devices of the RootDevice goes here-->
- </Devices>
- </RootDevice>
+ <SubDevices>
+ <!-- List of Sub-Devices of the Device goes here-->
+ </SubDevices>
+ </Device>
---
-### Device
-*Devices* are optional components of a [RootDevice](#RootDevice). They represent physical sub-devices inside another device (the RootDevice).
+<a name="SubDevice"/></a>
+### SubDevice
+*SubDevices* are optional components of a [Device](#Device). They represent physical sub-devices and services inside another device (the *Device*).
-*Devices* may define their own [ModuleClasses](#ModuleClass) or extend ModulesClasses of its or another [Domain](#Domain).
+*SubDevices* may define their own [ModuleClasses](#ModuleClass) or extend ModulesClasses of its or another [Domain](#Domain).
-
+
#### Attributes
-- **id** : The identifier for that *Device*. The identifier must be unique at least in the scope of the domain, but the final scope is also influenced by implementing technologies. Required.
+- **id** : The identifier for that *SubDevice*. The identifier must be unique at least in the scope of the domain, but the final scope is also influenced by implementing technologies. Required.
#### Elements
-- **[Doc](#Documentation)** : Documentation for the *Device*. Optional.
-- **Modules** : A list of [Module](#ModuleClass) components that are local to the *Device*. Optional.
-- **[DeviceInfo](#DeviceInfo)** : Further meta-data about the *Device*. Optional.
+- **[Doc](#Documentation)** : Documentation for the *SubDevice*. Optional.
+- **[Properties](#Property)** : Further meta-data (or properties) about the *SubDevice*. Optional.
+- **[Modules](#ModuleClass)** : A list of *Module* components that are local to the *SubDevice*. Optional.
#### Example
- <Device id="aDevice">
+ <SubDevice id="aSubDevice">
<Doc>Some documentation</Doc>
+ <Properties>
+ <!-- The list of Properties for the Device goes here-->
+ </Properties>
<Modules>
<!-- List of Modules local to the Device goes here-->
</Modules>
- <DeviceInfo>
- <!-- The DeviceInfo for the Device goes here-->
- </DeviceInfo>
- </RootDevice>
+ </SubDevice>
---
-<a name="DeviceInfo"/></a>
-### DeviceInfo
-The *DeviceInfo* is an element of [RootDevice](#RootDevice) or [Device](#Device) where a device vendor can provide metadata for a device that may be presented to an end-user.
+<a name="Property"/></a>
+### Property
-
+
+
+*Property* elements are used to append to [Devices](#Device) and their [ModuleClass](ModuleClass) elements with arbitrary additional information. For [Devices](#Device) it would be very common for a manufacturer to want to add into the XML file which is describing the device such information as "Manufacturing Site", "Date of Manufacture", "Certification Code", "Energy Label Code", "compatible LAN technology", "URL for the device handbook", "physical limits of operation environments", etc.
+
+Some of that information might in some devices be available by reading a specific device [DataPoint](#DataPoint), however even if it cannot be read from the device then at least it can be noted in the device's XML description. Examples for organizations that specifiy these kind of added "Property" information are [eCl@ss](http://www.eclass.eu) and [UNSPSC](http://www.unspsc.org) (United Nations Standard Products and Services Code).
+
+Since the *Properties* are highly varied, depending on industry segment, no attempt is made in the SDT to constrain the options: however it is highly recommended to provide software-developer-friendly information in the [Doc](#Documentation) field of each Property.
#### Attributes
-None.
+- **name**: Name or identifier of a *Property*.
+- **optional**: Boolean that indicates whether a *Property* is optional or mandatory. Optional, the default is *false*.
+- **value**: Text representation of value of a *Property*. Optional.
#### Elements
-- **Name** : Vendor-specific name of a device. Required.
-- **Vendor** : Name of the vendor for the device. Required.
-- **FirmwareVersion** : Current version number of the firmware or other version information. Optional.
-- **VendorURL** : A URL that points to further information for that device. This might be the product page on the web or an URL to the device manual. Optional.
-- **SerialNumber** : The serial number or serial string. Optional.
-- **[Doc](#Documentation)** : Documentation for the *DeviceInfo*. Optional.
-
+- **[Doc](#Documentation)** : Documentation for the *Property*. Optional.
+- **DataType** : The data type of the property. This must be a [SimpleType](#SimpleType).
#### Example
- <DeviceInfo>
- <Name>SomeDeviceName</Name>
- <Vendor>ACME</Vendor>
- <FirmwareVersion>1.0</FirmwareVersion>
- <VendorURL>http://www.example.com/</VendorURL>
- <SerialNumber>1234.5</SerialNumber>
- </DeviceInfo>
+ <Property name="ManufacturedDate" value="2015.10.30 10:06">
+ <SimpleType type="datetime" />
+ </Property>
---
<a name="ModuleClass"/></a>
### Module, ModuleClass
-The *ModuleClass* represents the concept of a reusable module that defines the [Actions](#Action), [Data](#Data) and [Events](#Event) for a single functionality of a device. A connected device may contain or refer to single or multiple *ModuleClasses* to specify its inherent services it exposes for use by applications.
-*Modules* represent instantiations of *ModuleClasses*.
+
-*ModuleClasses* can be defined by a domain (on the level of the [Domain](#Domain) component) or in [RootDevices](#RootDevice)/[Devices](#Device): The first are global to a [Domain](#Domain) and can be used (refered to) by all [RootDevices](#RootDevice) resp. [Devices](#Device) of a [Domain](#Domain); the later are local to the [RootDevices](#RootDevice)/[Devices](#Device) where it is defined in. *ModuleClasses* defined on the [Domain](#Domain) level can be imported, extended and used by other domains.
+**Module**
-New *ModuleClasses* can be defined by extending existing *ModuleClasses* from the same or other domains to add new or overriding defined [Actions](#Action), [Data](#Data) and [Events](#Event).
+*Module* elements are basically constraints or templates for how to model functionality of real things/appliances/devices within the [Domain](#Domain). There could be an infinite number of possible functionalities, however it is recommended to identify a not-too-large selection of them as generic examples (called *"*ModuleClasses*, see below) and allow for additional proprietary extensions. In a particular [Domain](#Domain) there will be one *Module* for each of the agreed *ModuleClasses* plus additional ones for each extension of a *ModuleClass*.
-
+The advantage of identifying a subset of generic *ModuleClasses* is that any suitable high-level software would then be able to "parse" the generic functionality for all compliant appliances, even if the proprietary parts could not be interpreted by the software.
+
+Every [Device](#Device) can then be described by a collection of *Modules* (functionality). In the simplest examples, where there are no extensions needed, each *ModuleClass* has exactly one "child" Module ... in such cases the software developer can consider the two terms to be the same.
+
+The relationship between a *ModuleClass* and a *Module* is very similar to the specification of a class and an instantiated object in an object oriented programming language.
+
+**ModuleClass**
+
+The set of *ModuleClasses* is defined at the [Domain](#Domain) level. Each one describes some functionality (services). In principle there could be an infinite number of *ModuleClasses* (as noted above), for every kind of functionality found in UPnP, ZigBee and all the other automation protocols ... However that would not simplify the job of software developers at all! Therefore, HGI recommends that a finite and convenient number of prototypical *ModuleClasses* are re-used as much as possible (within a Domain at least).
+
+Typical *ModuleClasses* might be equivalent to "power ON/OFF", "Open/Close", "PanUP/DOWN", "ReadTemperature", etc. Those examples make it apparent that various read/write usage of parameters, invoking of actions and waiting for events might be needed in the different *ModuleClasses*, and a guideline for those structures is explained below.
#### Attributes
-- **Name** : Name of the *ModuleClass*. The name must be unique in the scope of the [Domain](#Domain). Required.
+- **name** : Name of the *Module* or *ModuleClass*. The name must be unique in the scope of the [Domain](#Domain). Required.
+- **optional**: Boolean that indicates whether a *Module* or *ModuleClass* is optional or mandatory. Optional, the default is *false*.
#### Elements
-- **extends** : Reference to a another *ModuleClass* that is extended with this *ModuleClass*. Optional.
+
+- **[Doc](#Documentation)** : Documentation for the *Module* or *ModuleClass*. Optional.
+- **extends** : Reference to a another *ModuleClass* or *Module* which is extended with this *ModuleClass*. Optional.
The element has the following attributes:
- - **domain** : Identifier / Reference of the [Domain](#Domain) of the extended *ModuleClass*. Required when *extends* is specified.
- - **class** : Name of the *ModuleClass* in the [Domain](#Domain) thet is extended.
-- **[Doc](#Documentation)** : Documentation for the *ModuleClass*. Optional.
-- **Actions** : A list of [Action](#Action) components, each defining a single action. Optional.
-- **Data** : A list of [Data](#Data) components. Optional.
-- **Events** : A list of [Event](#Event) components. Optional.
+ - **domain** : Identifier / Reference of the [Domain](#Domain) of the extended *ModuleClass*. Required for this element.
+ - **class** : Name of the *ModuleClass* in the [Domain](#Domain) that is extended. Required for this element.
+- **[Properties](#Property)** : Further meta-data (or properties) about the *SubDevice*. Optional.
+- **[Actions](#Action)** : A list of *Action* components, each defining a single action. Optional.
+- **[Data](#DataPoint)** : A list of *DataPoint* components. Optional.
+- **[Events](#Event)** : A list of *Event* components. Optional.
#### Example
@@ -243,23 +249,21 @@ The element has the following attributes:
<a name="Action"/></a>
### Action
-An *Action* defines a single procedure call for a [ModuleClass](#ModuleClass). It is basically used for calling a function on a physical device in order to set or request data, or to invoke an action at a [Device](#Device). #
-
-It is also possible that an *Action* results in calling multiple functions on the device. Examples for this are the assembly of single function calls into one *Action* in order to provide sanity checks on the arguments, or for managing and fullfil transactional function calls on the device.
+*Action* elements are an efficient way of describing arbitrary sequences of operations/methods; these are very common in automation. Typical example include "FactoryReset", and "AutoCalibrate". *Actions* preserve transaction integrity by putting together all the parameters ("args", see next section) with the method which checks and executes them, in one step.
+
+Note that systems which rely on RESTful operations need to carry out such complex setup-parameters-then-do-action by first using (several) [DataPoint](#DataPoint) operations to "load" the parameters to the device and then do a [DataPoint](#DataPoint) operation to manipulate the "start operation NOW" action.
+
#### Attributes
- **name** : The name of the *Action*. The name must be unique in the scope of the [ModuleClass](#ModuleClass). Required.
-- **type** : The return type of the *Action*. It must comply to one of the defined [DataTypes](#DataType). Optional. If no *type* is specified the *Action* does not return a value.
+- **optional**: Boolean that indicates whether an *Action* is optional or mandatory. Optional, the default is *false*.
#### Elements
- **[Doc](#Documentation)** : Documentation for the *Action*. Optional.
-- **Arg** : Zero or more occurances of argument definitions for an *Action*. Optional.
-The *Arg* has the following attributes and elements:
- - **name** : The name of the *Arg*. Attribute. Required.
- - **type** : The type of the *Arg*. It must comply to one of the defined [DataTypes](#DataType) Attribute. Required.
- - **Doc** : Documentation for the *Arg* element. Optional.
+- **[DataType](#DataType)** : The return type of the *Action*. It must comply to the *DataType* definition. Optional. If no *DataType* is specified the *Action* does not return a value.
+- **Args** : Zero or more occurances of [argument](#Arg) definitions for an *Action*. Optional.
#### Example
The following are two examples for actions implementing a getter and a setter for boolean values.
@@ -270,21 +274,43 @@ The following are two examples for actions implementing a getter and a setter fo
<Action name="setTarget">
<Doc>Set the associated state to the specified value. Example of a setter.</Doc>
- <Arg name="value" type="boolean">
- <Doc>The desired value of the associated state.</Doc>
- </Arg>
+ <Args>
+ <Arg name="value">
+ <Doc>The desired value of the associated state.</Doc>
+ <DataType>
+ <SimpleType type="boolean" />
+ </DataType>
+ </Arg>
+ </Args>
</Action>
+---
+<a name="Arg"/></a>
+### Arg
+
+
+
+The *Arg* element represents the parameter information which a device needs to carry out a required *Action*.
+
+The *Arg* has the following attributes and elements:
+
+#### Attributes
+- **name** : The name of the *Arg* attribute. Required.
+
+#### Elements
+- **[Doc](#Documentation)** : Documentation for the *argument*. Optional.
+- **[DataType](#DataType)** : The return type of the *argument*. It must comply to the *DataType* definition. Required.
+
---
<a name="Data"/></a>
-### Data
-The *Data* component represents a list of *DataPoints* of a [ModuleClass](#ModuleClass).
+### DataPoint
-
+
+A *DataPoint* element represents an aspect of a device which can be read/written to, and forms part of a device’s data model. Manipulating *DataPoints* is the most common way of controlling devices. Each *DataPoint* has an associated *type* (e.g. simple integer/real numbers, string of text, struct, or arrays thereof) which facillitates data integrity. Note that all RESTful systems (e.g. CoAP) only use *DataPoint* operations, so the mapping of a data models using an SDT into RESTful applications is easy.
-*DataPoints* serve to provide information to application developers about the internal structure, types and attributes of a device's data model. There are no implicite setter or getter actions to manipulate the data points directly. To do this, [Actions](#Action) must be defined and used explicitly.
+However, *DataPoints* are not the only way of controlling devices, so further "Actions" and "Events are described below.
Though *DataPoints* only refer to single data points of a physical device it is possible to describe hierarchies by model the path to the data point in the hierarchy by a path-like structure like to the pathname of a UNIX file system. Here, the root node of the hierarchy is a slash (/ 0x2F) and the segments or nodes along the path are also separated by slashes. The actual datapoint is the last leaf at the path.
@@ -298,32 +324,120 @@ In EBNF:
#### Attributes
-None.
+- **name** : The name (and possible path in a hierarchical data model) of the *DataPoint*. The name must be unique in the scope of the [ModuleClass](#ModuleClass). Required.
+- **optional**: Boolean that indicates whether a *DataPoint* is optional or mandatory. Optional, the default is *false*.
+- **writable** : Boolean value that indicates whether this *DataPoint* is writable by an application. Optional. Default: true.
+- **readable** : Boolean value that indicates whether this *DataPoint* is readable by an application. Optional. Default: true.
+- **eventable** : Boolean value that indicates whether an internal or external change of this *DataPoint* raises an event. Optional. Default: false.
#### Elements
-- **DataPoint** : Zero or more occurances of *DataPoints. Optional.
-A *DataPoint* has the following attributes and elements:
- - **name** : The name (and possible path in a hierarchical data model) of the *DataPoint*. Attribute. The name must be unique in the scope of the [ModuleClass](#ModuleClass).Required.
- - **type** : The type of the *DataPoint*. It must comply to one of the defined *DataTypes*. Attribute. Required.
- - **writable** : Boolean value that indicates whether this *DataPoint* is writable by an application. Attribute. Optional. Default: false.
- - **readable** : Boolean value that indicates whether this *DataPoint* is readable by an application. Attribute. Optional. Default: false.
- - **eventable** : Boolean value that indicates whether an internal or external change of this *DataPoint* raises an event. Attribute. Optional. Default: false.
- - **[Doc](#Documentation)** : Documentation for the *DataPoint* element. Optional.
-
+- **[Doc](#Documentation)** : Documentation for the *DataPoint*. Optional.
+- **[DataType](#DataType)** : The type of the *DataPoint*. It must comply to the *DataType* definition. Required.
#### Example
+
<Data>
- <DataPoint name="attributeName" type="string" writable="false">
+ <DataPoint name="attributeName" writable="false">
<Doc>Some documentation for the DataPoint</Doc>
+ <DataType>
+ <SimpleType type="string" />
+ </DataType
</DataPoint>
</Data>
---
+<a name="Event"/></a>
+### Event
+
+
+
+*Event* elements are needed for automation protocols which "push" information, instead of relying on polling by the software application. A typical example would be a "SensorAlert" where a window sensor immediately transmits a change of its state from "closed" to "open", which could be used in a burglar alarm application, needs to be ready to accept such information immediately, and not wait for a regular polling of the device.
+
+#### Attributes
+- **name** : The name of the *Event*. The name must be unique in the scope of the [ModuleClass](#ModuleClass). Required.
+- **optional**: Boolean that indicates whether an *Event* is optional or mandatory. Optional, the default is *false*.
+
+#### Elements
+- **[Doc](#Documentation)** : Documentation for the *Event* Element. Optional.
+- **[Data](#DataPoint)** : A list of *DataPoint* components for an event's payload. Optional.
+
+#### Example
+
+ <Event name="stateChanged">
+ <Doc>Some documentation for the Event</Doc>
+ <Data>
+ <DataPoint name="state">
+ <DataType>
+ <SimpleType type="boolean" />
+ </DataType>
+ </DataPoint>
+ </Data>
+ </Event>
+
+---
+
+<a name="Data_Types"/></a>
+### Data Types
+The data type can be simple integers or string text, or rather complex, as shown below:
+
+
+
+The various elements are described in the sections below.
+
+---
<a name="DataType"/></a>
### DataType
-The following *DataTypes* can be used in the SDT's [Action](#Action), *Arg* and [DataPoint](#Data) elements and attributes. If not stated otherwise datatypes should comply to the equivalent datatypes defined in [XML Schema Part 2: Datatypes Second Edition](http://www.w3.org/TR/xmlschema-2/#boolean):
+
+
+
+
+The *DataType* element is a "container" for the various aspects of a type.
+
+#### Attributes
+- **name** : The name of the *DataType*. The name must be set for the [Struct](#Struct) types to distinguish individual fields in that structure. It can be used in other cases. Optional.
+- **unitOfMeasure** : This is the option to label the data with the units of measurement. A "Temperature" measurement is meaningless until the units Kelvin, Celcius, Fahrenheit etc are known. Because of the extreme variety of units, a string field is the default annotation method, although of course a SDO could decide to reference a standardized list of units. Optional.
+
+#### Elements
+- **[Doc](#Documentation)** : Documentation for the *DataType* Element. Optional.
+- **TypeChoice** : This element is actual an element from the following list of data types:
+ - **[SimpleType](#SimpleType)**
+ - **[Struct](#StructType)**
+ - **[Array](#ArrayType)**
+- **[Constraint](#Constraint)** : A list of *Constraint* elements. Optional.
+
+---
+
+<a name="Constraint"/></a>
+### Constraint
+
+
+
+The *Constraint* element is an optional element allowing the manufacturer to provide constraints on the permitted values of measured data or input parameters. It can significantly improve the reliability of software and validation of transmitted data.
+
+#### Attributes
+- **name** : The name or ID that identifies the *Constraint*. Required.
+- **type** : The basic data type of the constraint. Note that this may be different from the type of the [DataType](#DataType) that this *Constraint* is assigned to. For example, a *Constraint* that specifies a maximum length of a string is of type *integer*. Optional.
+- **value** : A pre-assigned value for the constraint, for example the maximum number of characters in a string. Optional.
+
+#### Elements
+- **[Doc](#Documentation)** : Documentation for the *Cosntraint* Element. Optional.
+
+---
+
+<a name="SimpleType"/></a>
+### SimpleType
+
+
+
+The "SimpleType" element is required in order for software to understand the format of the associated data, e.g. are the bytes an integer or real value? The selection choosen is based on practical experience to include some specific types which are slightly more complex:
+
+1. the (technically redundant) options of *date* and *time* - to avoid problems which can arise interpreting a *datetime* value;
+2. *url* because it is expected to become extremely common to provide links to other data sources;
+3. the "blob" type to represent binary data of arbitrary structure.
+
+If not stated otherwise datatypes should comply to the equivalent datatypes defined in [XML Schema Part 2: Datatypes Second Edition](http://www.w3.org/TR/xmlschema-2/#boolean):
- **boolean** : A boolean value as defined in [http://www.w3.org/TR/xmlschema-2/#boolean](http://www.w3.org/TR/xmlschema-2/#boolean) .
- **byte** : An integer datatype with the range of [0 - 255] as defined in [http://www.w3.org/TR/xmlschema-2/#unsignedByte](http://www.w3.org/TR/xmlschema-2/#unsignedByte) .
@@ -339,28 +453,28 @@ The following *DataTypes* can be used in the SDT's [Action](#Action), *Arg* and
---
-<a name="Event"/></a>
-### Event
-An *Event* is a component that defines properties for events that are raised as reactions to changes in [DataPoints](#Data) of a [Device](#Device)'s data model. These state changes can happen either through a device-internal change, e.g. a low battery level, or by external means, e.g. a user operates a switch or the temperature in a room rises beyond a certain threshold.
+<a name="StructType"/></a>
+### StructType
-
+
-#### Attributes
-- **name** : The name of the *Event*. The name must be unique in the scope of the [ModuleClass](#ModuleClass). Required.
+The *StructType* element can be used to represent an ordered list of diverse DataTypes, which are represented by the *name* attribute of each [DataType](#DataType), and can be used recursively.
#### Elements
-- **Data** : A list of [Data](#Data) components for an event's payload. Optional.
-- **[Doc](#Documentation)** : Documentation for the *Event* Element. Optional.
+- **[DataType](#DataType)** : A list of DataTypes elements representing the elements of a structure.
-#### Example
+---
- <Event name="stateChanged">
- <Data>
- <DataPoint name="state" type="boolean">
- </DataPoint>
- </Data>
- </Event>
+<a name="ArrayType"/></a>
+### ArrayType
+
+
+
+The *ArrayType* element is provided for defining lists of data; the definition is recursive so that multi-dimensional arrays can be described. Note that a Constraint can be used to provide limits on Array size.
+
+#### Elements
+- **[DataType](#DataType)** : A single DataType element that specifies the data type for the elements of the array.
---
diff --git a/SDT/schema3.0/docs/SDT_UML.uxf b/SDT/schema3.0/docs/SDT_UML.uxf
index 506ab24c18cfabeb3e34a00cabd023317b1814f6..8b3bbd81f80f57359b4faf427b12edd6100229a5 100644
--- a/SDT/schema3.0/docs/SDT_UML.uxf
+++ b/SDT/schema3.0/docs/SDT_UML.uxf
@@ -5,8 +5,8 @@
<element>
<id>UMLNote</id>
<coordinates>
- <x>70</x>
- <y>420</y>
+ <x>21</x>
+ <y>427</y>
<w>217</w>
<h>182</h>
</coordinates>
@@ -35,8 +35,8 @@ Cardinalities:
<element>
<id>Relation</id>
<coordinates>
- <x>154</x>
- <y>490</y>
+ <x>105</x>
+ <y>497</y>
<w>77</w>
<h>28</h>
</coordinates>
@@ -49,8 +49,8 @@ m1=0..*
<element>
<id>Relation</id>
<coordinates>
- <x>154</x>
- <y>518</y>
+ <x>105</x>
+ <y>525</y>
<w>77</w>
<h>21</h>
</coordinates>
@@ -61,8 +61,8 @@ fontsize=10</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>700</x>
- <y>763</y>
+ <x>651</x>
+ <y>770</y>
<w>105</w>
<h>154</h>
</coordinates>
@@ -85,8 +85,8 @@ uri</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>406</x>
- <y>826</y>
+ <x>357</x>
+ <y>833</y>
<w>98</w>
<h>56</h>
</coordinates>
@@ -98,8 +98,8 @@ m1= 0,1
<element>
<id>Relation</id>
<coordinates>
- <x>406</x>
- <y>770</y>
+ <x>357</x>
+ <y>777</y>
<w>98</w>
<h>56</h>
</coordinates>
@@ -111,8 +111,8 @@ m1= 0,1
<element>
<id>UMLClass</id>
<coordinates>
- <x>70</x>
- <y>770</y>
+ <x>21</x>
+ <y>777</y>
<w>133</w>
<h>84</h>
</coordinates>
@@ -129,8 +129,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>175</x>
- <y>728</y>
+ <x>126</x>
+ <y>735</y>
<w>490</w>
<h>91</h>
</coordinates>
@@ -142,8 +142,8 @@ m2=1..*
<element>
<id>Relation</id>
<coordinates>
- <x>175</x>
- <y>728</y>
+ <x>126</x>
+ <y>735</y>
<w>490</w>
<h>133</h>
</coordinates>
@@ -155,8 +155,8 @@ m2=1
<element>
<id>UMLClass</id>
<coordinates>
- <x>490</x>
- <y>854</y>
+ <x>441</x>
+ <y>861</y>
<w>133</w>
<h>35</h>
</coordinates>
@@ -169,8 +169,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>616</x>
- <y>868</y>
+ <x>567</x>
+ <y>875</y>
<w>98</w>
<h>35</h>
</coordinates>
@@ -182,8 +182,8 @@ m1= 1
<element>
<id>UMLClass</id>
<coordinates>
- <x>490</x>
- <y>910</y>
+ <x>441</x>
+ <y>917</y>
<w>133</w>
<h>70</h>
</coordinates>
@@ -199,8 +199,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>196</x>
- <y>840</y>
+ <x>147</x>
+ <y>847</y>
<w>308</w>
<h>98</h>
</coordinates>
@@ -212,8 +212,8 @@ m1=0..*
<element>
<id>Relation</id>
<coordinates>
- <x>616</x>
- <y>910</y>
+ <x>567</x>
+ <y>917</y>
<w>147</w>
<h>56</h>
</coordinates>
@@ -225,8 +225,8 @@ m1=1
<element>
<id>UMLClass</id>
<coordinates>
- <x>490</x>
- <y>770</y>
+ <x>441</x>
+ <y>777</y>
<w>133</w>
<h>35</h>
</coordinates>
@@ -239,8 +239,8 @@ fg=blue</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>490</x>
- <y>812</y>
+ <x>441</x>
+ <y>819</y>
<w>133</w>
<h>35</h>
</coordinates>
@@ -253,8 +253,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>406</x>
- <y>805</y>
+ <x>357</x>
+ <y>812</y>
<w>98</w>
<h>35</h>
</coordinates>
@@ -267,8 +267,8 @@ m1= 0,1
<element>
<id>UMLClass</id>
<coordinates>
- <x>70</x>
- <y>665</y>
+ <x>21</x>
+ <y>672</y>
<w>735</w>
<h>28</h>
</coordinates>
@@ -282,8 +282,8 @@ lw=0.1</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>70</x>
- <y>0</y>
+ <x>21</x>
+ <y>7</y>
<w>840</w>
<h>28</h>
</coordinates>
@@ -297,8 +297,8 @@ lw=0.1</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>308</x>
- <y>119</y>
+ <x>259</x>
+ <y>126</y>
<w>154</w>
<h>133</h>
</coordinates>
@@ -310,7 +310,7 @@ lw=0.1</panel_attributes>
/- extends/
/ @domain : IDRF/
/ @class : text /
-/* Property : Properties/
+/* Properties : Property/
/* Actions : Action/
/* Data : DataPoint/
/* Events : Event/
@@ -321,8 +321,8 @@ fg=blue
<element>
<id>UMLClass</id>
<coordinates>
- <x>546</x>
- <y>119</y>
+ <x>497</x>
+ <y>126</y>
<w>154</w>
<h>77</h>
</coordinates>
@@ -339,8 +339,8 @@ fg=blue</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>791</x>
- <y>182</y>
+ <x>742</x>
+ <y>189</y>
<w>119</w>
<h>56</h>
</coordinates>
@@ -355,8 +355,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>693</x>
- <y>182</y>
+ <x>644</x>
+ <y>189</y>
<w>112</w>
<h>28</h>
</coordinates>
@@ -367,8 +367,8 @@ m1= 0..*</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>70</x>
- <y>119</y>
+ <x>21</x>
+ <y>126</y>
<w>154</w>
<h>77</h>
</coordinates>
@@ -385,8 +385,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>119</y>
+ <x>168</x>
+ <y>126</y>
<w>105</w>
<h>63</h>
</coordinates>
@@ -397,8 +397,8 @@ m1= 0..*</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>70</x>
- <y>301</y>
+ <x>21</x>
+ <y>308</y>
<w>154</w>
<h>70</h>
</coordinates>
@@ -406,7 +406,7 @@ m1= 0..*</panel_attributes>
--
*@ id : Name*
/- Doc : Doc/
-/* Property : Properties/
+/* Properties : Property/
/* Modules : Module/
fg=blue</panel_attributes>
<additional_attributes/>
@@ -414,8 +414,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>175</y>
+ <x>168</x>
+ <y>182</y>
<w>49</w>
<h>63</h>
</coordinates>
@@ -427,8 +427,8 @@ m1=0..*
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>308</y>
+ <x>168</x>
+ <y>315</y>
<w>105</w>
<h>49</h>
</coordinates>
@@ -439,8 +439,8 @@ m1= 0..*</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>791</x>
- <y>350</y>
+ <x>742</x>
+ <y>357</y>
<w>119</w>
<h>35</h>
</coordinates>
@@ -452,8 +452,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>455</x>
- <y>119</y>
+ <x>406</x>
+ <y>126</y>
<w>105</w>
<h>42</h>
</coordinates>
@@ -465,8 +465,8 @@ m1= 0..*
<element>
<id>Relation</id>
<coordinates>
- <x>735</x>
- <y>343</y>
+ <x>686</x>
+ <y>350</y>
<w>70</w>
<h>35</h>
</coordinates>
@@ -478,8 +478,8 @@ m1=0,1
<element>
<id>Relation</id>
<coordinates>
- <x>455</x>
- <y>154</y>
+ <x>406</x>
+ <y>161</y>
<w>105</w>
<h>84</h>
</coordinates>
@@ -491,8 +491,8 @@ m1= 0..*
<element>
<id>UMLClass</id>
<coordinates>
- <x>546</x>
- <y>210</y>
+ <x>497</x>
+ <y>217</y>
<w>154</w>
<h>98</h>
</coordinates>
@@ -513,8 +513,8 @@ fg=blue
<element>
<id>UMLClass</id>
<coordinates>
- <x>546</x>
- <y>322</y>
+ <x>497</x>
+ <y>329</y>
<w>154</w>
<h>63</h>
</coordinates>
@@ -531,8 +531,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>455</x>
- <y>224</y>
+ <x>406</x>
+ <y>231</y>
<w>105</w>
<h>126</h>
</coordinates>
@@ -544,8 +544,8 @@ m1= 0..*
<element>
<id>UMLClass</id>
<coordinates>
- <x>308</x>
- <y>273</y>
+ <x>259</x>
+ <y>280</y>
<w>154</w>
<h>21</h>
</coordinates>
@@ -556,8 +556,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>273</y>
+ <x>168</x>
+ <y>280</y>
<w>105</w>
<h>98</h>
</coordinates>
@@ -569,8 +569,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>371</x>
- <y>245</y>
+ <x>322</x>
+ <y>252</y>
<w>21</w>
<h>42</h>
</coordinates>
@@ -581,8 +581,8 @@ fg=blue</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>70</x>
- <y>210</y>
+ <x>21</x>
+ <y>217</y>
<w>154</w>
<h>77</h>
</coordinates>
@@ -590,7 +590,7 @@ fg=blue</panel_attributes>
--
*@ id : Name*
/- Doc : Doc/
-/* Property : Properties/
+/* Properties : Property/
/* Modules : Module/
/* SubDevices : SubDevice/
fg=blue</panel_attributes>
@@ -599,8 +599,8 @@ fg=blue</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>273</y>
+ <x>168</x>
+ <y>280</y>
<w>49</w>
<h>56</h>
</coordinates>
@@ -612,8 +612,8 @@ m1=0..*
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>245</y>
+ <x>168</x>
+ <y>252</y>
<w>105</w>
<h>56</h>
</coordinates>
@@ -625,8 +625,8 @@ m1= 0..*
<element>
<id>Relation</id>
<coordinates>
- <x>217</x>
- <y>259</y>
+ <x>168</x>
+ <y>266</y>
<w>105</w>
<h>70</h>
</coordinates>
@@ -636,8 +636,8 @@ m1= 0..*
<element>
<id>UMLClass</id>
<coordinates>
- <x>308</x>
- <y>308</y>
+ <x>259</x>
+ <y>315</y>
<w>154</w>
<h>77</h>
</coordinates>
@@ -655,8 +655,8 @@ transparency=80</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
- <x>693</x>
- <y>210</y>
+ <x>644</x>
+ <y>217</y>
<w>56</w>
<h>147</h>
</coordinates>
@@ -668,8 +668,8 @@ m1=0..*
<element>
<id>Relation</id>
<coordinates>
- <x>455</x>
- <y>238</y>
+ <x>406</x>
+ <y>245</y>
<w>49</w>
<h>98</h>
</coordinates>
@@ -680,8 +680,8 @@ m1=0..*</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
- <x>280</x>
- <y>770</y>
+ <x>231</x>
+ <y>777</y>
<w>133</w>
<h>70</h>
</coordinates>
@@ -698,8 +698,8 @@ Array : ArrayType
<element>
<id>Relation</id>
<coordinates>
- <x>196</x>
- <y>777</y>
+ <x>147</x>
+ <y>784</y>
<w>98</w>
<h>63</h>
</coordinates>
diff --git a/SDT/schema3.0/docs/images/Device.png b/SDT/schema3.0/docs/images/Device.png
index 1531e9e6f127f204dc73ffca53c06a5ef9a67bba..39ac44b0ab73abcabae53fbaf6641aba0dd3da50 100644
Binary files a/SDT/schema3.0/docs/images/Device.png and b/SDT/schema3.0/docs/images/Device.png differ
diff --git a/SDT/schema3.0/docs/images/ModuleClass.png b/SDT/schema3.0/docs/images/ModuleClass.png
index 4d0cf45b81ee7606441337b4edbeaff22bf00a90..1878593c1d8999ba7e891c77d6494489d8b1dbee 100644
Binary files a/SDT/schema3.0/docs/images/ModuleClass.png and b/SDT/schema3.0/docs/images/ModuleClass.png differ
diff --git a/SDT/schema3.0/docs/images/SDT_UML_Basic_Elements.png b/SDT/schema3.0/docs/images/SDT_UML_Basic_Elements.png
index 2f789edefc9d4f2cd014f41ef6a5c3e8234f62e8..98121276a51889da2c842e80ddfd50a1a807ae0a 100644
Binary files a/SDT/schema3.0/docs/images/SDT_UML_Basic_Elements.png and b/SDT/schema3.0/docs/images/SDT_UML_Basic_Elements.png differ
diff --git a/SDT/schema3.0/docs/images/SubDevice.png b/SDT/schema3.0/docs/images/SubDevice.png
index 9c8b124295078675a8c2b42d1488d43d079c8f54..e77637fd4681b6b6076e93d6bf9654f7b2499b84 100644
Binary files a/SDT/schema3.0/docs/images/SubDevice.png and b/SDT/schema3.0/docs/images/SubDevice.png differ