Moved ModuleClass "washingMachineDataPoints" into the RootDevice.

SDT/schema2.0/test/EchonetLiteExamples.xml

@@ -57,10 +57,29 @@
   			</DataPoint>
   		</Data>
   	</ModuleClass>
+  </Modules>
+
+
+
+  <!-- Very simple example for a washing machine definition -->
+
+  <RootDevices>
+    <RootDevice id="SimpleWaschingMachine">
+      <DeviceInfo>
+        <Name>washing machine</Name>
+        <Vendor>Echonet</Vendor>
+      </DeviceInfo>
 
-    <!-- example appliance types -->
+      <!-- Inheriting from the global operating status -->
 
-    <ModuleClass name="washingMachineDataPoints">
+      <Modules>
+        <Module name="washingMachineOperationStatus">
+          <extends domain="jp.echonet" class="operationStatus"/>
+        </Module>
+
+      <!-- Data points local to the wasching machine device -->
+
+        <Module name="washingMachineDataPoints">
           <Data>
             <DataPoint name="door/CoverOpen/CloseStatus" type="enum" writable="false">
               <Doc>This property indicates whether the door/cover is open or closed.</Doc>
@@ -84,23 +103,8 @@
               <Doc>Timer value (HH:MM)</Doc>
             </DataPoint>
           </Data>
-    </ModuleClass>
-  </Modules>
-
-
-  <!-- Very simple example for a washing machine definition -->
-
-  <RootDevices>
-    <RootDevice id="SimpleWaschingMachine">
-      <DeviceInfo>
-        <Name>washing machine</Name>
-        <Vendor>Echonet</Vendor>
-      </DeviceInfo>
-
-      <Modules>
-        <Module name="washingMachineDataPoints">
-          <extends domain="jp.echonet" class="operationStatus"/>
         </Module>
+
       </Modules>
     </RootDevice>
   </RootDevices>

SDT/schema3.0/test/EchonetLiteExamples.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
-
-<!-- Example SDT definition taken from EchonetLite https://github.com/ECHONET-Consortium -->
-
 <Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	id="jp.echonet">
 	
-  <!-- Various examples for module classes -->
-  
 	<Modules>
-
-    <!-- actuator -->
-
 		<ModuleClass name="operationStatus">
 			<Data>
 				<DataPoint name="operationStatus" writable="true">
@@ -26,9 +18,6 @@
 				</Event>
 			</Events>
 		</ModuleClass>
-
-  		<!-- runtime property -->
-
 		<ModuleClass name="installationLocation">
 			<Data>
 				<DataPoint name="installationLocation" writable="true">
@@ -43,9 +32,6 @@
 				</Event>
 			</Events>
 		</ModuleClass>
-
-		<!-- sensor readout -->
-		
 		<ModuleClass name="measuredInstantaneousPowerConsumption">
 			<Data>
 				<DataPoint name="measuredInstantaneousPowerConsumption" writable="false">
@@ -56,7 +42,6 @@
 				</DataPoint>
 			</Data>
 		</ModuleClass>
-
 		<ModuleClass name="temperatureSensorDataPoints">
 			<Data>
 				<DataPoint name="measuredTemperatureValue" writable="false">
@@ -67,10 +52,23 @@
 				</DataPoint>
 			</Data>
 		</ModuleClass>
+	</Modules>
 	
-		<!-- example appliance types -->
-
-		<ModuleClass name="washingMachineDataPoints">
+	<Devices>
+		<Device id="SimpleWaschingMachine">
+			<Properties>
+				<Property name="Name" value="washing machine">
+					<SimpleType type="string" />
+				</Property>
+				<Property name="Vendor" value="Echonet">
+					<SimpleType type="string" />
+				</Property>
+			</Properties>
+			<Modules>
+				<Module name="washingMachineOperationStatus">
+					<extends domain="jp.echonet" class="operationStatus"/>
+				</Module>
+				<Module name="washingMachineDataPoints">
 					<Data>
 						<DataPoint name="door/CoverOpen/CloseStatus" writable="false">
 							<Doc>This property indicates whether the door/cover is open or closed.</Doc>
@@ -115,27 +113,8 @@
 							</DataType>
 						</DataPoint>
 					</Data>
-		</ModuleClass>
-	</Modules>
-	
-	<!-- Very simple example for a washing machine definition -->
-
-	<Devices>
-		<Device id="SimpleWaschingMachine">
-			<Properties>
-				<Property name="Name" value="washing machine">
-					<SimpleType type="string" />
-				</Property>
-				<Property name="Vendor" value="Echonet">
-					<SimpleType type="string" />
-				</Property>
-			</Properties>
-			<Modules>
-				<Module name="washingMachineDataPoints">
-					<extends domain="jp.echonet" class="operationStatus"/>
 				</Module>
 			</Modules>
 		</Device>
 	</Devices>
-	
 </Domain>
\ No newline at end of file