From 6dde46c676d7ea63e928286dbc85af9007d43a0d Mon Sep 17 00:00:00 2001
From: paul-loedige <paul@gve-loedige.de>
Date: Fri, 25 Dec 2020 15:30:54 +0100
Subject: [PATCH] changed XML structure

---
 .../java/com/example/aped/MainActivity.java   |   4 +-
 .../aped/{communication => utils}/IXML.java   |   2 +-
 .../{communication => utils}/TestXML.java     |   2 +-
 .../example/aped/utils/XML_files/config.xml   |  23 ++++
 .../example/aped/utils/XML_files/config.xsd   | 122 ++++++++++++++++++
 .../aped/utils/XML_files/package-info.java    |   4 +
 .../com/example/aped/utils/package-info.java  |   4 +
 7 files changed, 157 insertions(+), 4 deletions(-)
 rename APED/app/src/main/java/com/example/aped/{communication => utils}/IXML.java (96%)
 rename APED/app/src/main/java/com/example/aped/{communication => utils}/TestXML.java (96%)
 create mode 100644 APED/app/src/main/java/com/example/aped/utils/XML_files/config.xml
 create mode 100644 APED/app/src/main/java/com/example/aped/utils/XML_files/config.xsd
 create mode 100644 APED/app/src/main/java/com/example/aped/utils/XML_files/package-info.java
 create mode 100644 APED/app/src/main/java/com/example/aped/utils/package-info.java

diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java
index 02b67ef..c82a256 100644
--- a/APED/app/src/main/java/com/example/aped/MainActivity.java
+++ b/APED/app/src/main/java/com/example/aped/MainActivity.java
@@ -7,8 +7,8 @@ import android.view.Menu;
 import android.widget.Toast;
 
 import com.example.aped.communication.IIO;
-import com.example.aped.communication.IXML;
-import com.example.aped.communication.TestXML;
+import com.example.aped.utils.IXML;
+import com.example.aped.utils.TestXML;
 import com.google.android.material.navigation.NavigationView;
 
 import androidx.annotation.NonNull;
diff --git a/APED/app/src/main/java/com/example/aped/communication/IXML.java b/APED/app/src/main/java/com/example/aped/utils/IXML.java
similarity index 96%
rename from APED/app/src/main/java/com/example/aped/communication/IXML.java
rename to APED/app/src/main/java/com/example/aped/utils/IXML.java
index 0c2b4a0..725a6c8 100644
--- a/APED/app/src/main/java/com/example/aped/communication/IXML.java
+++ b/APED/app/src/main/java/com/example/aped/utils/IXML.java
@@ -1,4 +1,4 @@
-package com.example.aped.communication;
+package com.example.aped.utils;
 
 import java.util.Dictionary;
 import java.util.List;
diff --git a/APED/app/src/main/java/com/example/aped/communication/TestXML.java b/APED/app/src/main/java/com/example/aped/utils/TestXML.java
similarity index 96%
rename from APED/app/src/main/java/com/example/aped/communication/TestXML.java
rename to APED/app/src/main/java/com/example/aped/utils/TestXML.java
index 3e043d4..723f494 100644
--- a/APED/app/src/main/java/com/example/aped/communication/TestXML.java
+++ b/APED/app/src/main/java/com/example/aped/utils/TestXML.java
@@ -1,4 +1,4 @@
-package com.example.aped.communication;
+package com.example.aped.utils;
 
 
 import java.util.ArrayList;
diff --git a/APED/app/src/main/java/com/example/aped/utils/XML_files/config.xml b/APED/app/src/main/java/com/example/aped/utils/XML_files/config.xml
new file mode 100644
index 0000000..244ae6b
--- /dev/null
+++ b/APED/app/src/main/java/com/example/aped/utils/XML_files/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DeviceList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="config.xsd">
+    <Device name="example">
+        <ValueInfo type="boolean"/>
+        <Port protocol="DI">
+            <Pin>GPIO_2</Pin>
+        </Port>
+    </Device>
+    <Device name="sensorarray">
+        <ValueInfo type="int" unit="°C">
+            <Offset>1.2</Offset>
+            <Factor>2.5</Factor>
+        </ValueInfo>
+        <Port protocol="DI">
+            <Pin>GPIO_3</Pin>
+            <Pin>GPIO_4</Pin>
+            <Pin>GPIO_5</Pin>
+            <Pin>GPIO_6</Pin>
+        </Port>
+    </Device>
+
+</DeviceList>
\ No newline at end of file
diff --git a/APED/app/src/main/java/com/example/aped/utils/XML_files/config.xsd b/APED/app/src/main/java/com/example/aped/utils/XML_files/config.xsd
new file mode 100644
index 0000000..800b53e
--- /dev/null
+++ b/APED/app/src/main/java/com/example/aped/utils/XML_files/config.xsd
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <!-- available protocols types -->
+    <xs:simpleType name="ProtocolType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="DI"/>
+            <xs:enumeration value="DO"/>
+            <xs:enumeration value="AI"/>
+            <xs:enumeration value="AO"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <!-- available value types -->
+    <xs:simpleType name="ValueType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="int"/>
+            <xs:enumeration value="float"/>
+            <xs:enumeration value="boolean"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+
+    <!-- available Pins -->
+    <xs:simpleType name="Pin">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="GPIO_2"/>
+            <xs:enumeration value="GPIO_3"/>
+            <xs:enumeration value="GPIO_4"/>
+            <xs:enumeration value="GPIO_5"/>
+            <xs:enumeration value="GPIO_6"/>
+            <xs:enumeration value="GPIO_7"/>
+            <xs:enumeration value="GPIO_8"/>
+            <xs:enumeration value="GPIO_9"/>
+            <xs:enumeration value="GPIO_10"/>
+            <xs:enumeration value="GPIO_11"/>
+            <xs:enumeration value="GPIO_12"/>
+            <xs:enumeration value="GPIO_13"/>
+            <xs:enumeration value="GPIO_14"/>
+            <xs:enumeration value="GPIO_15"/>
+            <xs:enumeration value="GPIO_16"/>
+            <xs:enumeration value="GPIO_17"/>
+            <xs:enumeration value="GPIO_18"/>
+            <xs:enumeration value="GPIO_19"/>
+            <xs:enumeration value="GPIO_20"/>
+            <xs:enumeration value="GPIO_21"/>
+            <xs:enumeration value="GPIO_22"/>
+            <xs:enumeration value="GPIO_23"/>
+            <xs:enumeration value="GPIO_24"/>
+            <xs:enumeration value="GPIO_25"/>
+            <xs:enumeration value="GPIO_26"/>
+            <xs:enumeration value="GPIO_27"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:element name="DeviceList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="Device" 
+                    minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="UniqueDevice">
+            <xs:selector xpath="Device"/>
+            <xs:field xpath="@name"/>
+        </xs:unique>
+        <xs:unique name="UniquePin">
+            <xs:selector xpath="Device"/>
+            <xs:field xpath="Protocol/Port/Pin"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:element name="Device">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ValueInfo" 
+                    minOccurs="1" 
+                    maxOccurs="1"/>
+                <xs:element ref="Port" 
+                    minOccurs="1" 
+                    maxOccurs="1"/>
+            </xs:sequence>
+            <xs:attribute name="name" 
+                type="xs:string" 
+                use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="ValueInfo">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Offset" 
+                    type="xs:float" 
+                    minOccurs="0" 
+                    maxOccurs="1"/>
+                <xs:element name="Factor" 
+                    type="xs:float" 
+                    minOccurs="0" 
+                    maxOccurs="1"/>
+            </xs:sequence>
+            <xs:attribute name="type" 
+                type="ValueType" 
+                use="required"/>
+            <xs:attribute name="unit" 
+                type="xs:string" 
+                use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="Port">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Pin" 
+                    type="Pin" 
+                    minOccurs="1" 
+                    maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="protocol" type="ProtocolType" use="required"/>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/APED/app/src/main/java/com/example/aped/utils/XML_files/package-info.java b/APED/app/src/main/java/com/example/aped/utils/XML_files/package-info.java
new file mode 100644
index 0000000..8411944
--- /dev/null
+++ b/APED/app/src/main/java/com/example/aped/utils/XML_files/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * package for the storage of the XML files.
+ * */
+package com.example.aped.utils.XML_files;
diff --git a/APED/app/src/main/java/com/example/aped/utils/package-info.java b/APED/app/src/main/java/com/example/aped/utils/package-info.java
new file mode 100644
index 0000000..66a280a
--- /dev/null
+++ b/APED/app/src/main/java/com/example/aped/utils/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * package for utilities.
+ * */
+package com.example.aped.utils;