Diff: device.xml

Revision:

182:2bd8ec44998f

Parent:

177:672ef279c8e0

Child:

183:c7a9c309086c

--- a/device.xml	Fri Jul 08 14:58:17 2016 +0000
+++ b/device.xml	Sun Jul 10 05:35:08 2016 +0000
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <root>
     <structure name="device" typedef="Device">
-        <structure name="user" typedef="DeviceUserProtocol">
-            <variable name="address" typedef="uint16_t" value="0"/>
-        </structure>
-
         <structure name="sensor" typedef="DeviceSensor">
             <structure name="settings" typedef="DeviceSensorSettings">
                 <variable name="id" typedef="uint16_t" value="0"/>
@@ -12,6 +8,30 @@
             </structure>
         </structure>
         
+        <structure name="user" typedef="DeviceUser">
+            <variable name="address" typedef="uint16_t" value="0"/>
+            
+            <structure name="port" typedef="DeviceUserPort">
+                <structure name="settings" typedef="DeviceUserPortSettings">
+                    <variable name="baud" typedef="uint32_t" value="38400"/>
+                </structure>
+                <structure name="state" typedef="DeviceUserPortState">
+                    <variable name="baud" typedef="uint32_t" value="38400"/>
+                </structure>
+            </structure>
+        </structure>
+        
+        <structure name="service" typedef="DeviceService">
+            <structure name="port" typedef="DeviceServicePort">
+                <structure name="settings" typedef="DeviceServicePortSettings">
+                    <variable name="baud" typedef="uint32_t" value="38400"/>
+                </structure>
+                <structure name="state" typedef="DeviceServicePortState">
+                    <variable name="baud" typedef="uint32_t" value="38400"/>
+                </structure>
+            </structure>
+        </structure>
+
         <structure name="counters" typedef="DeviceCounters">
             <structure name="dither" typedef="DeviceCountersDitherLatched">
                 <structure name="settings" typedef="DeviceCountersDitherLatchedSettings">
@@ -1156,7 +1176,6 @@
             
             <structure name="uart[0]" typedef="DeviceUART">
                 <structure name="settings" typedef="DeviceUARTSettings">
-                    <variable name="baudRate" typedef="uint32_t" value="921600"/>
                 </structure>
                 
                 <structure name="state" typedef="DeviceUARTState">
@@ -1169,7 +1188,6 @@
             
             <structure name="uart[1]" typedef="DeviceUART">
                 <structure name="settings" typedef="DeviceUARTSettings">
-                    <variable name="baudRate" typedef="uint32_t" value="38400"/>
                 </structure>
                 
                 <structure name="state" typedef="DeviceUARTState">