Commit 99a39c52 authored by ankraft's avatar ankraft

Moved ModuleClass "washingMachineDataPoints" into the RootDevice.

parent 8bd99ced
...@@ -57,37 +57,10 @@ ...@@ -57,37 +57,10 @@
</DataPoint> </DataPoint>
</Data> </Data>
</ModuleClass> </ModuleClass>
<!-- example appliance types -->
<ModuleClass 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>
</DataPoint>
<DataPoint name="washingMachineSetting" type="enum" writable="true">
<Doc>Washing machine setting</Doc>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" type="enum" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" type="time" writable="false">
<Doc>This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.</Doc>
</DataPoint>
<DataPoint name="onTimerReservationSetting" type="enum" writable="true">
<Doc>Reservation ON/OFF</Doc>
</DataPoint>
<DataPoint name="onTimerSetting" type="time" writable="true">
<Doc>Timer value (HH:MM)</Doc>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" type="time" writable="true">
<Doc>Timer value (HH:MM)</Doc>
</DataPoint>
</Data>
</ModuleClass>
</Modules> </Modules>
<!-- Very simple example for a washing machine definition --> <!-- Very simple example for a washing machine definition -->
<RootDevices> <RootDevices>
...@@ -97,10 +70,41 @@ ...@@ -97,10 +70,41 @@
<Vendor>Echonet</Vendor> <Vendor>Echonet</Vendor>
</DeviceInfo> </DeviceInfo>
<!-- Inheriting from the global operating status -->
<Modules> <Modules>
<Module name="washingMachineDataPoints"> <Module name="washingMachineOperationStatus">
<extends domain="jp.echonet" class="operationStatus"/> <extends domain="jp.echonet" class="operationStatus"/>
</Module> </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>
</DataPoint>
<DataPoint name="washingMachineSetting" type="enum" writable="true">
<Doc>Washing machine setting</Doc>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" type="enum" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" type="time" writable="false">
<Doc>This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.</Doc>
</DataPoint>
<DataPoint name="onTimerReservationSetting" type="enum" writable="true">
<Doc>Reservation ON/OFF</Doc>
</DataPoint>
<DataPoint name="onTimerSetting" type="time" writable="true">
<Doc>Timer value (HH:MM)</Doc>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" type="time" writable="true">
<Doc>Timer value (HH:MM)</Doc>
</DataPoint>
</Data>
</Module>
</Modules> </Modules>
</RootDevice> </RootDevice>
</RootDevices> </RootDevices>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?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" <Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
id="jp.echonet"> id="jp.echonet">
<!-- Various examples for module classes -->
<Modules> <Modules>
<!-- actuator -->
<ModuleClass name="operationStatus"> <ModuleClass name="operationStatus">
<Data> <Data>
<DataPoint name="operationStatus" writable="true"> <DataPoint name="operationStatus" writable="true">
...@@ -26,9 +18,6 @@ ...@@ -26,9 +18,6 @@
</Event> </Event>
</Events> </Events>
</ModuleClass> </ModuleClass>
<!-- runtime property -->
<ModuleClass name="installationLocation"> <ModuleClass name="installationLocation">
<Data> <Data>
<DataPoint name="installationLocation" writable="true"> <DataPoint name="installationLocation" writable="true">
...@@ -43,9 +32,6 @@ ...@@ -43,9 +32,6 @@
</Event> </Event>
</Events> </Events>
</ModuleClass> </ModuleClass>
<!-- sensor readout -->
<ModuleClass name="measuredInstantaneousPowerConsumption"> <ModuleClass name="measuredInstantaneousPowerConsumption">
<Data> <Data>
<DataPoint name="measuredInstantaneousPowerConsumption" writable="false"> <DataPoint name="measuredInstantaneousPowerConsumption" writable="false">
...@@ -56,7 +42,6 @@ ...@@ -56,7 +42,6 @@
</DataPoint> </DataPoint>
</Data> </Data>
</ModuleClass> </ModuleClass>
<ModuleClass name="temperatureSensorDataPoints"> <ModuleClass name="temperatureSensorDataPoints">
<Data> <Data>
<DataPoint name="measuredTemperatureValue" writable="false"> <DataPoint name="measuredTemperatureValue" writable="false">
...@@ -67,59 +52,8 @@ ...@@ -67,59 +52,8 @@
</DataPoint> </DataPoint>
</Data> </Data>
</ModuleClass> </ModuleClass>
<!-- example appliance types -->
<ModuleClass name="washingMachineDataPoints">
<Data>
<DataPoint name="door/CoverOpen/CloseStatus" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="washingMachineSetting" writable="true">
<Doc>Washing machine setting</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" 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" />
</DataType>
</DataPoint>
<DataPoint name="onTimerReservationSetting" writable="true">
<Doc>Reservation ON/OFF</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="onTimerSetting" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time" />
</DataType>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time" />
</DataType>
</DataPoint>
</Data>
</ModuleClass>
</Modules> </Modules>
<!-- Very simple example for a washing machine definition -->
<Devices> <Devices>
<Device id="SimpleWaschingMachine"> <Device id="SimpleWaschingMachine">
<Properties> <Properties>
...@@ -131,11 +65,56 @@ ...@@ -131,11 +65,56 @@
</Property> </Property>
</Properties> </Properties>
<Modules> <Modules>
<Module name="washingMachineDataPoints"> <Module name="washingMachineOperationStatus">
<extends domain="jp.echonet" class="operationStatus"/> <extends domain="jp.echonet" class="operationStatus"/>
</Module> </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>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="washingMachineSetting" writable="true">
<Doc>Washing machine setting</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" 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" />
</DataType>
</DataPoint>
<DataPoint name="onTimerReservationSetting" writable="true">
<Doc>Reservation ON/OFF</Doc>
<DataType>
<SimpleType type="enum" />
</DataType>
</DataPoint>
<DataPoint name="onTimerSetting" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time" />
</DataType>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
<SimpleType type="time" />
</DataType>
</DataPoint>
</Data>
</Module>
</Modules> </Modules>
</Device> </Device>
</Devices> </Devices>
</Domain> </Domain>
\ No newline at end of file
Markdown is supported
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