.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index f0de5c5621ae3b079d20cea9f2ff0c343c008571..93f61a555352a013bcd3afce3548e9d95a15c94f 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-241.18034.62">
+  <component name="dataSourceStorageLocal" created-in="IU-242.23339.11">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml
index ab2ff579f019bc8881cf39b094cb9150576a6302..cafda2ba84f69f90cef253591cdb77ada0a3094b 100644 (file)
--- a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml
+++ b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="LFY_ZiGate.db">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.52">
+  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.53">
     <root id="1"/>
     <collation id="2" parent="1" name="BINARY"/>
     <collation id="3" parent="1" name="NOCASE"/>
@@ -67,56 +67,56 @@
     </table>
     <table id="61" parent="5" name="sqlite_stat1"/>
     <column id="62" parent="6" name="Key">
-      <DasType>VARCHAR(50)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>VARCHAR(50)|0s</StoredType>
     </column>
     <column id="63" parent="6" name="nValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="64" parent="7" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="65" parent="7" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="66" parent="7" name="Enabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="67" parent="7" name="Address">
-      <DasType>VARCHAR(200)|0s</DasType>
       <Position>4</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="68" parent="7" name="Port">
-      <DasType>INTEGER|0s</DasType>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="69" parent="7" name="Protocol">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="70" parent="7" name="Username">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>7</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="71" parent="7" name="Password">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>8</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="72" parent="7" name="ImageURL">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>9</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <key id="73" parent="7">
       <ColNames>ID</ColNames>
@@ -124,33 +124,33 @@
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="74" parent="8" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="75" parent="8" name="CameraRowID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="76" parent="8" name="DevSceneType">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="77" parent="8" name="DevSceneRowID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="78" parent="8" name="DevSceneWhen">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="79" parent="8" name="DevSceneDelay">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="80" parent="8">
       <ColNames>ID</ColNames>
@@ -158,35 +158,35 @@
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="81" parent="9" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="82" parent="9" name="Base">
-      <DasType>VARCHAR(80)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(80)|0s</StoredType>
     </column>
     <column id="83" parent="9" name="Name">
-      <DasType>VARCHAR(80)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>VARCHAR(80)|0s</StoredType>
     </column>
     <column id="84" parent="9" name="Description">
-      <DasType>VARCHAR(80)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>VARCHAR(80)|0s</StoredType>
     </column>
     <column id="85" parent="9" name="IconSmall">
-      <DasType>BLOB|0s</DasType>
       <Position>5</Position>
+      <StoredType>BLOB|0s</StoredType>
     </column>
     <column id="86" parent="9" name="IconOn">
-      <DasType>BLOB|0s</DasType>
       <Position>6</Position>
+      <StoredType>BLOB|0s</StoredType>
     </column>
     <column id="87" parent="9" name="IconOff">
-      <DasType>BLOB|0s</DasType>
       <Position>7</Position>
+      <StoredType>BLOB|0s</StoredType>
     </column>
     <key id="88" parent="9">
       <ColNames>ID</ColNames>
@@ -194,143 +194,143 @@
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="89" parent="10" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="90" parent="10" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="91" parent="10" name="DeviceID">
-      <DasType>VARCHAR(25)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>VARCHAR(25)|0s</StoredType>
     </column>
     <column id="92" parent="10" name="Unit">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="93" parent="10" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>5</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="94" parent="10" name="Used">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="95" parent="10" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="96" parent="10" name="SubType">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="97" parent="10" name="SwitchType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="98" parent="10" name="Favorite">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="99" parent="10" name="SignalLevel">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="100" parent="10" name="BatteryLevel">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="101" parent="10" name="nValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="102" parent="10" name="sValue">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>null</DefaultExpression>
       <Position>14</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="103" parent="10" name="LastUpdate">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>15</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <column id="104" parent="10" name="Order">
-      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>16</Position>
+      <StoredType>INTEGER BIGINT(10)|0s</StoredType>
     </column>
     <column id="105" parent="10" name="AddjValue">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>17</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="106" parent="10" name="AddjMulti">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>18</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="107" parent="10" name="AddjValue2">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>19</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="108" parent="10" name="AddjMulti2">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>20</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="109" parent="10" name="StrParam1">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>21</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="110" parent="10" name="StrParam2">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>22</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="111" parent="10" name="LastLevel">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>23</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="112" parent="10" name="Protected">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>24</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="113" parent="10" name="CustomImage">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>25</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="114" parent="10" name="Description">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>26</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="115" parent="10" name="Options">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>null</DefaultExpression>
       <Position>27</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="116" parent="10" name="Color">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>NULL</DefaultExpression>
       <Position>28</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <index id="117" parent="10" name="ds_hduts_idx">
       <ColNames>HardwareID
@@ -349,38 +349,38 @@ SubType</ColNames>
       <SourceTextLength>181</SourceTextLength>
     </trigger>
     <column id="120" parent="11" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="121" parent="11" name="DeviceRowID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="122" parent="11" name="DevSceneType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="123" parent="11" name="PlanID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="124" parent="11" name="Order">
-      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER BIGINT(10)|0s</StoredType>
     </column>
     <column id="125" parent="11" name="XOffset">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="126" parent="11" name="YOffset">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="127" parent="11">
       <ColNames>ID</ColNames>
@@ -392,33 +392,33 @@ SubType</ColNames>
       <SourceTextLength>200</SourceTextLength>
     </trigger>
     <column id="129" parent="12" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="130" parent="12" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="131" parent="12" name="DeviceID">
-      <DasType>VARCHAR(25)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>VARCHAR(25)|0s</StoredType>
     </column>
     <column id="132" parent="12" name="Manufacturer">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="133" parent="12" name="Profile">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="134" parent="12" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="135" parent="12">
       <ColNames>ID</ColNames>
@@ -426,33 +426,33 @@ SubType</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="136" parent="13" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="137" parent="13" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="138" parent="13" name="Interpreter">
-      <DasType>VARCHAR(10)|0s</DasType>
       <DefaultExpression>&apos;Blockly&apos;</DefaultExpression>
       <Position>3</Position>
+      <StoredType>VARCHAR(10)|0s</StoredType>
     </column>
     <column id="139" parent="13" name="Type">
-      <DasType>VARCHAR(10)|0s</DasType>
       <DefaultExpression>&apos;All&apos;</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(10)|0s</StoredType>
     </column>
     <column id="140" parent="13" name="XMLStatement">
-      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="141" parent="13" name="Status">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="142" parent="13">
       <ColNames>ID</ColNames>
@@ -460,27 +460,27 @@ SubType</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="143" parent="14" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="144" parent="14" name="EMID">
-      <DasType>INTEGER|0s</DasType>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="145" parent="14" name="Conditions">
-      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="146" parent="14" name="Actions">
-      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="147" parent="14" name="SequenceNo">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <foreign-key id="148" parent="14">
       <ColNames>EMID</ColNames>
@@ -493,19 +493,19 @@ SubType</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="150" parent="15" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="151" parent="15" name="Speed">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="152" parent="15" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="153" parent="15" name="f_id_date_idx">
       <ColNames>DeviceRowID
@@ -515,29 +515,29 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="155" parent="16" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="156" parent="16" name="Speed_Min">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="157" parent="16" name="Speed_Max">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="158" parent="16" name="Speed_Avg">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="159" parent="16" name="Date">
-      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <index id="160" parent="16" name="fc_id_date_idx">
       <ColNames>DeviceRowID
@@ -547,45 +547,45 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="162" parent="17" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="163" parent="17" name="DeviceID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="164" parent="17" name="DelimitedValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="165" parent="17" name="TargetType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="166" parent="17" name="TargetVariable">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>5</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="167" parent="17" name="TargetDeviceID">
-      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="168" parent="17" name="TargetProperty">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>7</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="169" parent="17" name="Enabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="170" parent="17" name="IncludeUnit">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="171" parent="17">
       <ColNames>ID</ColNames>
@@ -593,27 +593,27 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="172" parent="18" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="173" parent="18" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="174" parent="18" name="Image">
-      <DasType>BLOB|0s</DasType>
       <Position>3</Position>
+      <StoredType>BLOB|0s</StoredType>
     </column>
     <column id="175" parent="18" name="ScaleFactor">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>1.0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="176" parent="18" name="Order">
-      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER BIGINT(10)|0s</StoredType>
     </column>
     <key id="177" parent="18">
       <ColNames>ID</ColNames>
@@ -625,45 +625,45 @@ Date</ColNames>
       <SourceTextLength>176</SourceTextLength>
     </trigger>
     <column id="179" parent="19" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="180" parent="19" name="DeviceID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="181" parent="19" name="DelimitedValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="182" parent="19" name="TargetType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="183" parent="19" name="TargetVariable">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>5</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="184" parent="19" name="TargetDeviceID">
-      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="185" parent="19" name="TargetProperty">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>7</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="186" parent="19" name="Enabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="187" parent="19" name="IncludeUnit">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="188" parent="19">
       <ColNames>ID</ColNames>
@@ -671,89 +671,89 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="189" parent="20" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="190" parent="20" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="191" parent="20" name="Enabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="192" parent="20" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="193" parent="20" name="Address">
-      <DasType>VARCHAR(200)|0s</DasType>
       <Position>5</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="194" parent="20" name="Port">
-      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="195" parent="20" name="SerialPort">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>7</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="196" parent="20" name="Username">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>8</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="197" parent="20" name="Password">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>9</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="198" parent="20" name="Extra">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>10</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="199" parent="20" name="Mode1">
-      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
+      <StoredType>CHAR|0s</StoredType>
     </column>
     <column id="200" parent="20" name="Mode2">
-      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
+      <StoredType>CHAR|0s</StoredType>
     </column>
     <column id="201" parent="20" name="Mode3">
-      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
+      <StoredType>CHAR|0s</StoredType>
     </column>
     <column id="202" parent="20" name="Mode4">
-      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>14</Position>
+      <StoredType>CHAR|0s</StoredType>
     </column>
     <column id="203" parent="20" name="Mode5">
-      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>15</Position>
+      <StoredType>CHAR|0s</StoredType>
     </column>
     <column id="204" parent="20" name="Mode6">
-      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>16</Position>
+      <StoredType>CHAR|0s</StoredType>
     </column>
     <column id="205" parent="20" name="DataTimeout">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>17</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="206" parent="20" name="Configuration">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>18</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <key id="207" parent="20">
       <ColNames>ID</ColNames>
@@ -761,45 +761,45 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="208" parent="21" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="209" parent="21" name="DeviceID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="210" parent="21" name="DelimitedValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="211" parent="21" name="TargetType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="212" parent="21" name="TargetVariable">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>5</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="213" parent="21" name="TargetDeviceID">
-      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="214" parent="21" name="TargetProperty">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>7</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="215" parent="21" name="Enabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="216" parent="21" name="IncludeUnit">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="217" parent="21">
       <ColNames>ID</ColNames>
@@ -807,18 +807,18 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="218" parent="22" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="219" parent="22" name="DeviceRowID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="220" parent="22" name="ParentID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="221" parent="22">
       <ColNames>ID</ColNames>
@@ -826,28 +826,28 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="222" parent="23" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="223" parent="23" name="nValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="224" parent="23" name="sValue">
-      <DasType>VARCHAR(200)|0s</DasType>
       <Position>3</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="225" parent="23" name="User">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="226" parent="23" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>5</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="227" parent="23" name="ll_id_date_idx">
       <ColNames>DeviceRowID
@@ -857,24 +857,24 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="229" parent="24" name="DeviceRowID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="230" parent="24" name="Value">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="231" parent="24" name="Usage">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="232" parent="24" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>4</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="233" parent="24" name="m_id_date_idx">
       <ColNames>DeviceRowID
@@ -884,24 +884,24 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="235" parent="25" name="DeviceRowID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="236" parent="25" name="Value">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="237" parent="25" name="Counter">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="238" parent="25" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>4</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="239" parent="25" name="mc_id_date_idx">
       <ColNames>DeviceRowID
@@ -911,38 +911,38 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="241" parent="26" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="242" parent="26" name="Active">
-      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>false</DefaultExpression>
       <Position>2</Position>
+      <StoredType>BOOLEAN|0s</StoredType>
     </column>
     <column id="243" parent="26" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>3</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="244" parent="26" name="DeviceType">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="245" parent="26" name="SenderID">
-      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="246" parent="26" name="UUID">
-      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="247" parent="26" name="LastUpdate">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;, &apos;localtime&apos;)</DefaultExpression>
       <Position>7</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <key id="248" parent="26">
       <ColNames>ID</ColNames>
@@ -950,44 +950,44 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="249" parent="27" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="250" parent="27" name="Value1">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="251" parent="27" name="Value2">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="252" parent="27" name="Value3">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="253" parent="27" name="Value4">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="254" parent="27" name="Value5">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="255" parent="27" name="Value6">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="256" parent="27" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>8</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="257" parent="27" name="mm_id_date_idx">
       <ColNames>DeviceRowID
@@ -997,64 +997,64 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="259" parent="28" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="260" parent="28" name="Value1">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="261" parent="28" name="Value2">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="262" parent="28" name="Value3">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="263" parent="28" name="Value4">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="264" parent="28" name="Value5">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="265" parent="28" name="Value6">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="266" parent="28" name="Counter1">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="267" parent="28" name="Counter2">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="268" parent="28" name="Counter3">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="269" parent="28" name="Counter4">
-      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="270" parent="28" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>12</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="271" parent="28" name="mmc_id_date_idx">
       <ColNames>DeviceRowID
@@ -1064,127 +1064,127 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="273" parent="29" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="274" parent="29" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="275" parent="29" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>3</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="276" parent="29" name="SketchName">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="277" parent="29" name="SketchVersion">
-      <DasType>VARCHAR(40)|0s</DasType>
       <DefaultExpression>1.0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>VARCHAR(40)|0s</StoredType>
     </column>
     <column id="278" parent="30" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="279" parent="30" name="NodeID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="280" parent="30" name="ChildID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="281" parent="30" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="282" parent="30" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="283" parent="30" name="UseAck">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="284" parent="30" name="AckTimeout">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1200</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="285" parent="31" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="286" parent="31" name="NodeID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="287" parent="31" name="ChildID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="288" parent="31" name="VarID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="289" parent="31" name="Value">
-      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="290" parent="32" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="291" parent="32" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="292" parent="32" name="Params">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>3</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="293" parent="32" name="CustomMessage">
-      <DasType>VARCHAR(300)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(300)|0s</StoredType>
     </column>
     <column id="294" parent="32" name="ActiveSystems">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>5</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="295" parent="32" name="Priority">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="296" parent="32" name="SendAlways">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="297" parent="32" name="LastSend">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <key id="298" parent="32">
       <ColNames>ID</ColNames>
@@ -1192,19 +1192,19 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="299" parent="33" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="300" parent="33" name="Percentage">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="301" parent="33" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="302" parent="33" name="p_id_date_idx">
       <ColNames>DeviceRowID
@@ -1214,29 +1214,29 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="304" parent="34" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="305" parent="34" name="Percentage_Min">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="306" parent="34" name="Percentage_Max">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="307" parent="34" name="Percentage_Avg">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="308" parent="34" name="Date">
-      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <index id="309" parent="34" name="pc_id_date_idx">
       <ColNames>DeviceRowID
@@ -1246,28 +1246,28 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="311" parent="35" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="312" parent="35" name="Order">
-      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
+      <StoredType>INTEGER BIGINT(10)|0s</StoredType>
     </column>
     <column id="313" parent="35" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="314" parent="35" name="FloorplanID">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="315" parent="35" name="Area">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>5</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <key id="316" parent="35">
       <ColNames>ID</ColNames>
@@ -1279,63 +1279,63 @@ Date</ColNames>
       <SourceTextLength>151</SourceTextLength>
     </trigger>
     <column id="318" parent="36" name="Key">
-      <DasType>VARCHAR(50)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>VARCHAR(50)|0s</StoredType>
     </column>
     <column id="319" parent="36" name="nValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="320" parent="36" name="sValue">
-      <DasType>VARCHAR(200)|0s</DasType>
       <Position>3</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="321" parent="37" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="322" parent="37" name="PushType">
-      <DasType>INTEGER|0s</DasType>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="323" parent="37" name="DeviceID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="324" parent="37" name="DelimitedValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="325" parent="37" name="TargetType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="326" parent="37" name="TargetVariable">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>6</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="327" parent="37" name="TargetDeviceID">
-      <DasType>INTEGER|0s</DasType>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="328" parent="37" name="TargetProperty">
-      <DasType>VARCHAR(100)|0s</DasType>
       <Position>8</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="329" parent="37" name="Enabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="330" parent="37" name="IncludeUnit">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="331" parent="37">
       <ColNames>ID</ColNames>
@@ -1343,24 +1343,24 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="332" parent="38" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="333" parent="38" name="Total">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="334" parent="38" name="Rate">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="335" parent="38" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>4</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="336" parent="38" name="r_id_date_idx">
       <ColNames>DeviceRowID
@@ -1370,24 +1370,24 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="338" parent="39" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="339" parent="39" name="Total">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="340" parent="39" name="Rate">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="341" parent="39" name="Date">
-      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <index id="342" parent="39" name="rc_id_date_idx">
       <ColNames>DeviceRowID
@@ -1397,48 +1397,48 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="344" parent="40" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="345" parent="40" name="Order">
-      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
+      <StoredType>INTEGER BIGINT(10)|0s</StoredType>
     </column>
     <column id="346" parent="40" name="SceneRowID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="347" parent="40" name="DeviceRowID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="348" parent="40" name="Cmd">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="349" parent="40" name="Level">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>100</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="350" parent="40" name="Color">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>NULL</DefaultExpression>
       <Position>7</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="351" parent="40" name="OnDelay">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="352" parent="40" name="OffDelay">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="353" parent="40">
       <ColNames>ID</ColNames>
@@ -1450,19 +1450,19 @@ Date</ColNames>
       <SourceTextLength>181</SourceTextLength>
     </trigger>
     <column id="355" parent="41" name="SceneRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="356" parent="41" name="nValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="357" parent="41" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="358" parent="41" name="sl_id_date_idx">
       <ColNames>SceneRowID
@@ -1472,73 +1472,73 @@ Date</ColNames>
       <ColNames>SceneRowID</ColNames>
     </index>
     <column id="360" parent="42" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="361" parent="42" name="Active">
-      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>true</DefaultExpression>
       <Position>2</Position>
+      <StoredType>BOOLEAN|0s</StoredType>
     </column>
     <column id="362" parent="42" name="SceneRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="363" parent="42" name="Date">
-      <DasType>DATE|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <column id="364" parent="42" name="Time">
-      <DasType>TIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>TIME|0s</StoredType>
     </column>
     <column id="365" parent="42" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="366" parent="42" name="Cmd">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="367" parent="42" name="Level">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>15</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="368" parent="42" name="UseRandomness">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="369" parent="42" name="TimerPlan">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="370" parent="42" name="Days">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>11</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="371" parent="42" name="Month">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="372" parent="42" name="MDay">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="373" parent="42" name="Occurence">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>14</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="374" parent="42">
       <ColNames>ID</ColNames>
@@ -1546,63 +1546,63 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="375" parent="43" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="376" parent="43" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="377" parent="43" name="Favorite">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="378" parent="43" name="Order">
-      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER BIGINT(10)|0s</StoredType>
     </column>
     <column id="379" parent="43" name="nValue">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="380" parent="43" name="SceneType">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="381" parent="43" name="Protected">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="382" parent="43" name="OnAction">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>8</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="383" parent="43" name="OffAction">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>9</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="384" parent="43" name="Description">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>10</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="385" parent="43" name="Activators">
-      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>11</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="386" parent="43" name="LastUpdate">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>12</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <key id="387" parent="43">
       <ColNames>ID</ColNames>
@@ -1614,63 +1614,63 @@ Date</ColNames>
       <SourceTextLength>151</SourceTextLength>
     </trigger>
     <column id="389" parent="44" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="390" parent="44" name="Active">
-      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>true</DefaultExpression>
       <Position>2</Position>
+      <StoredType>BOOLEAN|0s</StoredType>
     </column>
     <column id="391" parent="44" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="392" parent="44" name="Date">
-      <DasType>DATE|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <column id="393" parent="44" name="Time">
-      <DasType>TIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>TIME|0s</StoredType>
     </column>
     <column id="394" parent="44" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="395" parent="44" name="Temperature">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="396" parent="44" name="TimerPlan">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="397" parent="44" name="Days">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>9</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="398" parent="44" name="Month">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="399" parent="44" name="MDay">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="400" parent="44" name="Occurence">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="401" parent="44">
       <ColNames>ID</ColNames>
@@ -1678,18 +1678,18 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="402" parent="45" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="403" parent="45" name="SharedUserID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <column id="404" parent="45" name="DeviceRowID">
-      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT|0s</StoredType>
     </column>
     <key id="405" parent="45">
       <ColNames>ID</ColNames>
@@ -1697,44 +1697,44 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="406" parent="46" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="407" parent="46" name="Temperature">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="408" parent="46" name="Chill">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="409" parent="46" name="Humidity">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="410" parent="46" name="Barometer">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="411" parent="46" name="DewPoint">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="412" parent="46" name="SetPoint">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="413" parent="46" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>8</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="414" parent="46" name="t_id_date_idx">
       <ColNames>DeviceRowID
@@ -1744,68 +1744,68 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="416" parent="47" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="417" parent="47" name="Temp_Min">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="418" parent="47" name="Temp_Max">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="419" parent="47" name="Temp_Avg">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="420" parent="47" name="Chill_Min">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="421" parent="47" name="Chill_Max">
-      <DasType>FLOAT|0s</DasType>
       <Position>6</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="422" parent="47" name="Humidity">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="423" parent="47" name="Barometer">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="424" parent="47" name="DewPoint">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="425" parent="47" name="SetPoint_Min">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="426" parent="47" name="SetPoint_Max">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="427" parent="47" name="SetPoint_Avg">
-      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="428" parent="47" name="Date">
-      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>13</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <index id="429" parent="47" name="tc_id_date_idx">
       <ColNames>DeviceRowID
@@ -1815,13 +1815,13 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="431" parent="48" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="432" parent="48" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <key id="433" parent="48">
       <ColNames>ID</ColNames>
@@ -1829,78 +1829,78 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="434" parent="49" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="435" parent="49" name="Active">
-      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>true</DefaultExpression>
       <Position>2</Position>
+      <StoredType>BOOLEAN|0s</StoredType>
     </column>
     <column id="436" parent="49" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="437" parent="49" name="Date">
-      <DasType>DATE|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <column id="438" parent="49" name="Time">
-      <DasType>TIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>TIME|0s</StoredType>
     </column>
     <column id="439" parent="49" name="Type">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="440" parent="49" name="Cmd">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="441" parent="49" name="Level">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>15</DefaultExpression>
       <Position>8</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="442" parent="49" name="Color">
-      <DasType>TEXT|0s</DasType>
       <DefaultExpression>NULL</DefaultExpression>
       <Position>9</Position>
+      <StoredType>TEXT|0s</StoredType>
     </column>
     <column id="443" parent="49" name="UseRandomness">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="444" parent="49" name="TimerPlan">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="445" parent="49" name="Days">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>12</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="446" parent="49" name="Month">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="447" parent="49" name="MDay">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>14</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="448" parent="49" name="Occurence">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>15</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="449" parent="49">
       <ColNames>ID</ColNames>
@@ -1908,29 +1908,29 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="450" parent="50" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="451" parent="50" name="UUID">
-      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="452" parent="51" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="453" parent="51" name="Level">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="454" parent="51" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="455" parent="51" name="u_id_date_idx">
       <ColNames>DeviceRowID
@@ -1940,18 +1940,18 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="457" parent="52" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="458" parent="52" name="Level">
-      <DasType>FLOAT|0s</DasType>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="459" parent="52" name="Date">
-      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <index id="460" parent="52" name="uv_id_date_idx">
       <ColNames>DeviceRowID
@@ -1961,34 +1961,34 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="462" parent="53" name="SessionID">
-      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="463" parent="53" name="Username">
-      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="464" parent="53" name="AuthToken">
-      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="465" parent="53" name="ExpirationDate">
-      <DasType>DATETIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <column id="466" parent="53" name="RemoteHost">
-      <DasType>VARCHAR(50)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>VARCHAR(50)|0s</StoredType>
     </column>
     <column id="467" parent="53" name="LastUpdate">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;, &apos;localtime&apos;)</DefaultExpression>
       <Position>6</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="468" parent="53" name="sqlite_autoindex_UserSessions_2">
       <ColNames>SessionID</ColNames>
@@ -2010,26 +2010,26 @@ Date</ColNames>
       <UnderlyingIndexName>sqlite_autoindex_UserSessions_1</UnderlyingIndexName>
     </key>
     <column id="472" parent="54" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="473" parent="54" name="Name">
-      <DasType>VARCHAR(200)|0s</DasType>
       <Position>2</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="474" parent="54" name="ValueType">
-      <DasType>INT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INT|0s</StoredType>
     </column>
     <column id="475" parent="54" name="Value">
-      <DasType>VARCHAR(200)|0s</DasType>
       <Position>4</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="476" parent="54" name="LastUpdate">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;, &apos;localtime&apos;)</DefaultExpression>
       <Position>5</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <key id="477" parent="54">
       <ColNames>ID</ColNames>
@@ -2037,39 +2037,39 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="478" parent="55" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="479" parent="55" name="Active">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="480" parent="55" name="Username">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="481" parent="55" name="Password">
-      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>VARCHAR(200)|0s</StoredType>
     </column>
     <column id="482" parent="55" name="Rights">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>255</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="483" parent="55" name="TabsEnabled">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>255</DefaultExpression>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="484" parent="55" name="RemoteSharing">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="485" parent="55">
       <ColNames>ID</ColNames>
@@ -2077,28 +2077,28 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="486" parent="56" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="487" parent="56" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="488" parent="56" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>3</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="489" parent="56" name="MacAddress">
-      <DasType>VARCHAR(50)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>4</Position>
+      <StoredType>VARCHAR(50)|0s</StoredType>
     </column>
     <column id="490" parent="56" name="Timeout">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>5</DefaultExpression>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="491" parent="56">
       <ColNames>ID</ColNames>
@@ -2106,29 +2106,29 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="492" parent="57" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="493" parent="57" name="Direction">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="494" parent="57" name="Speed">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="495" parent="57" name="Gust">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="496" parent="57" name="Date">
-      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>5</Position>
+      <StoredType>DATETIME|0s</StoredType>
     </column>
     <index id="497" parent="57" name="w_id_date_idx">
       <ColNames>DeviceRowID
@@ -2138,39 +2138,39 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="499" parent="58" name="DeviceRowID">
-      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
+      <StoredType>BIGINT(10)|0s</StoredType>
     </column>
     <column id="500" parent="58" name="Direction">
-      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>FLOAT|0s</StoredType>
     </column>
     <column id="501" parent="58" name="Speed_Min">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="502" parent="58" name="Speed_Max">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="503" parent="58" name="Gust_Min">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="504" parent="58" name="Gust_Max">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="505" parent="58" name="Date">
-      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
+      <StoredType>DATE|0s</StoredType>
     </column>
     <index id="506" parent="58" name="wc_id_date_idx">
       <ColNames>DeviceRowID
@@ -2180,38 +2180,38 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="508" parent="59" name="ID">
-      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="509" parent="59" name="HardwareID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="510" parent="59" name="HomeID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="511" parent="59" name="NodeID">
-      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <column id="512" parent="59" name="Name">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>5</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="513" parent="59" name="ProductDescription">
-      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>6</Position>
+      <StoredType>VARCHAR(100)|0s</StoredType>
     </column>
     <column id="514" parent="59" name="PollTime">
-      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
+      <StoredType>INTEGER|0s</StoredType>
     </column>
     <key id="515" parent="59">
       <ColNames>ID</ColNames>
@@ -2219,24 +2219,24 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="516" parent="60" name="type">
-      <DasType>text|0s</DasType>
       <Position>1</Position>
+      <StoredType>text|0s</StoredType>
     </column>
     <column id="517" parent="60" name="name">
-      <DasType>text|0s</DasType>
       <Position>2</Position>
+      <StoredType>text|0s</StoredType>
     </column>
     <column id="518" parent="60" name="tbl_name">
-      <DasType>text|0s</DasType>
       <Position>3</Position>
+      <StoredType>text|0s</StoredType>
     </column>
     <column id="519" parent="60" name="rootpage">
-      <DasType>int|0s</DasType>
       <Position>4</Position>
+      <StoredType>int|0s</StoredType>
     </column>
     <column id="520" parent="60" name="sql">
-      <DasType>text|0s</DasType>
       <Position>5</Position>
+      <StoredType>text|0s</StoredType>
     </column>
     <column id="521" parent="61" name="tbl">
       <Position>1</Position>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0ada1b8a30506798dd6d6b73434ed96d76f95611..d7620507e5ba4f88d19b85346e0b944c6f43853f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,19 +5,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/lib/simplemode.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/bureau.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureau.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/litvincent.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/litvincent.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/media.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/media.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/dnsmasq.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/dnsmasq.conf" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/switch.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/switch.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/shield.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/simplemode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/simplemode.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -426,8 +421,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.18034.62" />
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.18034.62" />
+        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
+        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
       </set>
     </attachedChunks>
   </component>
@@ -1337,7 +1332,10 @@
       <workItem from="1718896067904" duration="2628000" />
       <workItem from="1718921308389" duration="1420000" />
       <workItem from="1721025519094" duration="4050000" />
-      <workItem from="1721977403266" duration="1275000" />
+      <workItem from="1721977403266" duration="1931000" />
+      <workItem from="1723070986479" duration="239000" />
+      <workItem from="1727248399195" duration="2492000" />
+      <workItem from="1727812356049" duration="116000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1682,7 +1680,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="620" />
+    <option name="localTasksCounter" value="621" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf
index 36ce5bb4ef9bbe113b3604405b31f76a3bf2617f..bc864544e629bd1de30084919bb7101e423a8dac 100644 (file)
--- a/config/dnsmasq.conf
+++ b/config/dnsmasq.conf
@@ -20,25 +20,13 @@ address=/chambre.home.tortuga.enhydra.fr/192.168.13.64
 address=/balcon.home.tortuga.enhydra.fr/192.168.13.64
 address=/cour.home.tortuga.enhydra.fr/192.168.13.64
 address=/bureausun.home.tortuga.enhydra.fr/192.168.13.64
-address=/cave.home.tortuga.enhydra.fr/192.168.13.64
-address=/kodidb.home.tortuga.enhydra.fr/192.168.13.64
-address=/kodi.home.tortuga.enhydra.fr/192.168.13.64
 # Mediaserver
 address=/squeezebox.home.tortuga.enhydra.fr/192.168.13.67
-address=/plex.home.tortuga.enhydra.fr/192.168.13.66
 # Backup
 address=/dockerbackup.home.tortuga.enhydra.fr/192.168.13.70
-# Servarr
-address=/transmission.home.tortuga.enhydra.fr/192.168.13.9
-address=/servarr.home.tortuga.enhydra.fr/192.168.13.9
 # Home Assistant
 address=/homeassistant.home.tortuga.enhydra.fr/192.168.13.8
 address=/homeassistant.tortuga.enhydra.fr/192.168.13.8
 # Cloud server
 address=/cloud.home.tortuga.enhydra.fr/192.168.13.6
-address=/piwigo.home.tortuga.enhydra.fr/192.168.13.6
-# Nextcloud
-address=/nextcloud.home.tortuga.enhydra.fr/141.94.68.154
-address=/nextcloud.enhydra.fr/141.94.68.154
-address=/paperless.home.tortuga.enhydra.fr/141.94.68.154
-address=/paperless.enhydra.fr/141.94.68.154
+address=/piwigo.home.tortuga.enhydra.fr/192.168.13.6
\ No newline at end of file

diff --git a/config/rooms.php b/config/rooms.php
index b1e2f305c1eccd52bce9c617e86bebb8eceed158..e495a85a78ae38f8325770a1f8773034f9c8f9d9 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -82,6 +82,7 @@ function salon()
         ['type' => 'light', 'scene' => 'salon/auto', 'label' => 'Allumer'],
         ['type' => 'light', 'scene' => 'salon/off', 'label' => 'éteindre'],
         ['type' => 'light', 'scene' => 'salon/cinema', 'label' => 'cinéma'],
+        ['type' => 'light', 'scene' => 'salon/lumineux', 'label' => 'lumineux'],
     ];
 
     if (!isSimpleMode()) {

diff --git a/config/salon.php b/config/salon.php
index 19a39cf8c97e0bbdd50683c71d65235fdba4996a..65974b9704e0908b60b2525dc61e9fa9f09278bb 100644 (file)
--- a/config/salon.php
+++ b/config/salon.php
@@ -23,6 +23,10 @@ if (DISPLAYINTERFACE) {
     ];
     $favoriteslights = array_merge($favoriteslights, $c['favorites']);
 
+    if (isSimpleMode()) {
+        $favoriteslights = $c['favorites'];
+    }
+
     include_once "remote.php";
     include "default.php";
     include ROOT . "/config/media.php";

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 792cd70f86ba408cce8f49c85b41a6df0780814e..95762e285c7bd3e632c84b0af9661e99705775bd 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -170,6 +170,9 @@ function shortcutDir($allshortcuts)
             $section .= '<div class="fit">';
         }
         foreach ($shortcuts as $k => $s) {
+            if (!is_array($s)) {
+                continue;
+            }
             if ($s['type'] == 'clear' || $s['type'] == 'accordion' || $s['type'] == 'accordion-end') {
                 if ($i % 2 == 1) {
                     $section .= '</div>';

diff --git a/scripts/lib/simplemode.php b/scripts/lib/simplemode.php
index 2d8444a7fb74b32f035ee94925c1ccba7079b789..e97c524d5b75f0336a415447c76cb2e819a4e850 100644 (file)
--- a/scripts/lib/simplemode.php
+++ b/scripts/lib/simplemode.php
@@ -2,5 +2,5 @@
 
 function isSimpleMode()
 {
-    return true;
+    return false;
 }
\ No newline at end of file