Skip to content
Snippets Groups Projects
Commit 84fbbaa1 authored by ankraft's avatar ankraft
Browse files

Changed all ID types to Name. Corrected EchonetLiteExample test

parent 2d82a80a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SDT/schema4.0/etc/domain.rnc
+ 9
− 9
View file @ 84fbbaa1
...@@ -39,7 +39,7 @@ Domain = ...@@ -39,7 +39,7 @@ Domain =
PropertiesDef = PropertiesDef =
element Properties { element Properties {
element Property { element Property {
attribute name { text }, attribute name { xsd:Name },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
attribute value { text }?, attribute value { text }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
...@@ -49,7 +49,7 @@ PropertiesDef = ...@@ -49,7 +49,7 @@ PropertiesDef =
} }
DataTypeDef = DataTypeDef =
element DataType { element DataType {
attribute name { text }?, attribute name { xsd:Name }?,
attribute unitOfMeasure { text }?, attribute unitOfMeasure { text }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
DocDef, DocDef,
...@@ -78,7 +78,7 @@ BasicType = ...@@ -78,7 +78,7 @@ BasicType =
| "void" | "void"
EnumValueDef = EnumValueDef =
element EnumValue { element EnumValue {
attribute name { text }, attribute name { xsd:Name },
attribute value { text }, attribute value { text },
attribute type { BasicType }?, attribute type { BasicType }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
...@@ -87,7 +87,7 @@ EnumValueDef = ...@@ -87,7 +87,7 @@ EnumValueDef =
ConstraintsDef = ConstraintsDef =
element Constraints { element Constraints {
element Constraint { element Constraint {
attribute name { text }, attribute name { xsd:Name },
attribute type { BasicType }?, attribute type { BasicType }?,
attribute value { text }?, attribute value { text }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
...@@ -112,7 +112,7 @@ DocDef = ...@@ -112,7 +112,7 @@ DocDef =
ModuleClasses = ModuleClasses =
element ModuleClasses { element ModuleClasses {
element ModuleClass { element ModuleClass {
attribute name { text }, attribute name { xsd:Name },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
DocDef, DocDef,
...@@ -127,7 +127,7 @@ ModuleClasses = ...@@ -127,7 +127,7 @@ ModuleClasses =
Actions = Actions =
element Actions { element Actions {
element Action { element Action {
attribute name { text }, attribute name { xsd:Name },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
DocDef, DocDef,
...@@ -138,7 +138,7 @@ Actions = ...@@ -138,7 +138,7 @@ Actions =
ArgDef = ArgDef =
element Args { element Args {
element Arg { element Arg {
attribute name { text }, attribute name { xsd:Name },
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
DocDef, DocDef,
DataTypeDef DataTypeDef
...@@ -147,7 +147,7 @@ ArgDef = ...@@ -147,7 +147,7 @@ ArgDef =
Data = Data =
element Data { element Data {
element DataPoint { element DataPoint {
attribute name { text }, attribute name { xsd:Name },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
attribute writable { xsd:boolean }?, attribute writable { xsd:boolean }?,
attribute readable { xsd:boolean }?, attribute readable { xsd:boolean }?,
...@@ -160,7 +160,7 @@ Data = ...@@ -160,7 +160,7 @@ Data =
Events = Events =
element Events { element Events {
element Event { element Event {
attribute name { text }, attribute name { xsd:Name },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
attribute semanticURI { xsd:anyURI }?, attribute semanticURI { xsd:anyURI }?,
DocDef, DocDef,
......
SDT/schema4.0/src/domain.rng
+ 11
− 9
View file @ 84fbbaa1
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<oneOrMore> <oneOrMore>
<element name="Property"> <element name="Property">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="optional"> <attribute name="optional">
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<element name="DataType"> <element name="DataType">
<optional> <optional>
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
</optional> </optional>
<optional> <optional>
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<define name="EnumValueDef"> <define name="EnumValueDef">
<element name="EnumValue"> <element name="EnumValue">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<attribute name="value"> <attribute name="value">
<text/> <text/>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
<oneOrMore> <oneOrMore>
<element name="Constraint"> <element name="Constraint">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="type"> <attribute name="type">
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
<oneOrMore> <oneOrMore>
<element name="ModuleClass"> <element name="ModuleClass">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="optional"> <attribute name="optional">
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
<oneOrMore> <oneOrMore>
<element name="Action"> <element name="Action">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="optional"> <attribute name="optional">
...@@ -383,7 +383,9 @@ ...@@ -383,7 +383,9 @@
<element name="Args"> <element name="Args">
<oneOrMore> <oneOrMore>
<element name="Arg"> <element name="Arg">
<attribute name="name"/> <attribute name="name">
<data type="Name"/>
</attribute>
<optional> <optional>
<attribute name="semanticURI"> <attribute name="semanticURI">
<data type="anyURI"/> <data type="anyURI"/>
...@@ -402,7 +404,7 @@ ...@@ -402,7 +404,7 @@
<oneOrMore> <oneOrMore>
<element name="DataPoint"> <element name="DataPoint">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="optional"> <attribute name="optional">
...@@ -442,7 +444,7 @@ ...@@ -442,7 +444,7 @@
<oneOrMore> <oneOrMore>
<element name="Event"> <element name="Event">
<attribute name="name"> <attribute name="name">
<text/> <data type="Name"/>
</attribute> </attribute>
<optional> <optional>
<attribute name="optional"> <attribute name="optional">
......
SDT/schema4.0/src/domain.xsd
+ 9
− 9
View file @ 84fbbaa1
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<xs:sequence> <xs:sequence>
<xs:element ref="SimpleType"/> <xs:element ref="SimpleType"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="optional" type="xs:boolean"/> <xs:attribute name="optional" type="xs:boolean"/>
<xs:attribute name="value"/> <xs:attribute name="value"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</xs:choice> </xs:choice>
<xs:element minOccurs="0" ref="Constraints"/> <xs:element minOccurs="0" ref="Constraints"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name"/> <xs:attribute name="name" type="xs:Name"/>
<xs:attribute name="unitOfMeasure"/> <xs:attribute name="unitOfMeasure"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
</xs:extension> </xs:extension>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<xs:complexType> <xs:complexType>
<xs:complexContent> <xs:complexContent>
<xs:extension base="DocDef"> <xs:extension base="DocDef">
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="value" use="required"/> <xs:attribute name="value" use="required"/>
<xs:attribute name="type" type="BasicType"/> <xs:attribute name="type" type="BasicType"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<xs:complexType> <xs:complexType>
<xs:complexContent> <xs:complexContent>
<xs:extension base="DocDef"> <xs:extension base="DocDef">
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="type" type="BasicType"/> <xs:attribute name="type" type="BasicType"/>
<xs:attribute name="value"/> <xs:attribute name="value"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
<xs:element minOccurs="0" ref="Data"/> <xs:element minOccurs="0" ref="Data"/>
<xs:element minOccurs="0" ref="Events"/> <xs:element minOccurs="0" ref="Events"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="optional" type="xs:boolean"/> <xs:attribute name="optional" type="xs:boolean"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
</xs:extension> </xs:extension>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<xs:element minOccurs="0" ref="DataType"/> <xs:element minOccurs="0" ref="DataType"/>
<xs:element minOccurs="0" ref="Args"/> <xs:element minOccurs="0" ref="Args"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="optional" type="xs:boolean"/> <xs:attribute name="optional" type="xs:boolean"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
</xs:extension> </xs:extension>
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
<xs:sequence> <xs:sequence>
<xs:element ref="DataType"/> <xs:element ref="DataType"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
<xs:sequence> <xs:sequence>
<xs:element ref="DataType"/> <xs:element ref="DataType"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="optional" type="xs:boolean"/> <xs:attribute name="optional" type="xs:boolean"/>
<xs:attribute name="writable" type="xs:boolean"/> <xs:attribute name="writable" type="xs:boolean"/>
<xs:attribute name="readable" type="xs:boolean"/> <xs:attribute name="readable" type="xs:boolean"/>
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" ref="Data"/> <xs:element minOccurs="0" ref="Data"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required" type="xs:Name"/>
<xs:attribute name="optional" type="xs:boolean"/> <xs:attribute name="optional" type="xs:boolean"/>
<xs:attribute name="semanticURI" type="xs:anyURI"/> <xs:attribute name="semanticURI" type="xs:anyURI"/>
</xs:extension> </xs:extension>
......
SDT/schema4.0/test/EchonetLiteExamples.xml
+ 1
− 1
View file @ 84fbbaa1
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<ModuleClass name="washingMachineDataPoints"> <ModuleClass name="washingMachineDataPoints">
<Data> <Data>
<DataPoint name="door/CoverOpen/CloseStatus" readable="true" writable="false"> <DataPoint name="door_CoverOpen_CloseStatus" readable="true" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc> <Doc>This property indicates whether the door/cover is open or closed.</Doc>
<DataType> <DataType>
<!-- <SimpleType type="enum" /> --> <!-- <SimpleType type="enum" /> -->
......
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