.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 37718e2a1ff55489a35eb2e28bf80cdc48730615..19eb798ff6ee4abff82fa1afc0ce979a65eb58fb 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-222.4459.24">
+  <component name="dataSourceStorageLocal" created-in="IU-223.7571.182">
     <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 a5ac78469b489918f4e2afa7bb938afe3e3a7464..de5d9d2913c4723a2247544d8473a37cfe1b0aea 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.43">
+  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.45">
     <root id="1"/>
     <collation id="2" parent="1" name="BINARY"/>
     <collation id="3" parent="1" name="NOCASE"/>
@@ -67,54 +67,54 @@
     </table>
     <table id="61" parent="5" name="sqlite_stat1"/>
     <column id="62" parent="6" name="Key">
-      <DataType>VARCHAR(50)|0s</DataType>
+      <DasType>VARCHAR(50)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="63" parent="6" name="nValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="64" parent="7" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="65" parent="7" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="66" parent="7" name="Enabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="67" parent="7" name="Address">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <Position>4</Position>
     </column>
     <column id="68" parent="7" name="Port">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="69" parent="7" name="Protocol">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="70" parent="7" name="Username">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="71" parent="7" name="Password">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="72" parent="7" name="ImageURL">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>9</Position>
     </column>
@@ -124,31 +124,31 @@
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="74" parent="8" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="75" parent="8" name="CameraRowID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="76" parent="8" name="DevSceneType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="77" parent="8" name="DevSceneRowID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="78" parent="8" name="DevSceneWhen">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="79" parent="8" name="DevSceneDelay">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
@@ -158,34 +158,34 @@
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="81" parent="9" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="82" parent="9" name="Base">
-      <DataType>VARCHAR(80)|0s</DataType>
+      <DasType>VARCHAR(80)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="83" parent="9" name="Name">
-      <DataType>VARCHAR(80)|0s</DataType>
+      <DasType>VARCHAR(80)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="84" parent="9" name="Description">
-      <DataType>VARCHAR(80)|0s</DataType>
+      <DasType>VARCHAR(80)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="85" parent="9" name="IconSmall">
-      <DataType>BLOB|0s</DataType>
+      <DasType>BLOB|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="86" parent="9" name="IconOn">
-      <DataType>BLOB|0s</DataType>
+      <DasType>BLOB|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="87" parent="9" name="IconOff">
-      <DataType>BLOB|0s</DataType>
+      <DasType>BLOB|0s</DasType>
       <Position>7</Position>
     </column>
     <key id="88" parent="9">
@@ -194,141 +194,141 @@
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="89" parent="10" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="90" parent="10" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="91" parent="10" name="DeviceID">
-      <DataType>VARCHAR(25)|0s</DataType>
+      <DasType>VARCHAR(25)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="92" parent="10" name="Unit">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="93" parent="10" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="94" parent="10" name="Used">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="95" parent="10" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
     </column>
     <column id="96" parent="10" name="SubType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>8</Position>
     </column>
     <column id="97" parent="10" name="SwitchType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="98" parent="10" name="Favorite">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="99" parent="10" name="SignalLevel">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="100" parent="10" name="BatteryLevel">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
     </column>
     <column id="101" parent="10" name="nValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
     </column>
     <column id="102" parent="10" name="sValue">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>null</DefaultExpression>
       <Position>14</Position>
     </column>
     <column id="103" parent="10" name="LastUpdate">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>15</Position>
     </column>
     <column id="104" parent="10" name="Order">
-      <DataType>INTEGER BIGINT(10)|0s</DataType>
+      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>16</Position>
     </column>
     <column id="105" parent="10" name="AddjValue">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>17</Position>
     </column>
     <column id="106" parent="10" name="AddjMulti">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>18</Position>
     </column>
     <column id="107" parent="10" name="AddjValue2">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>19</Position>
     </column>
     <column id="108" parent="10" name="AddjMulti2">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>20</Position>
     </column>
     <column id="109" parent="10" name="StrParam1">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>21</Position>
     </column>
     <column id="110" parent="10" name="StrParam2">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>22</Position>
     </column>
     <column id="111" parent="10" name="LastLevel">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>23</Position>
     </column>
     <column id="112" parent="10" name="Protected">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>24</Position>
     </column>
     <column id="113" parent="10" name="CustomImage">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>25</Position>
     </column>
     <column id="114" parent="10" name="Description">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>26</Position>
     </column>
     <column id="115" parent="10" name="Options">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>null</DefaultExpression>
       <Position>27</Position>
     </column>
     <column id="116" parent="10" name="Color">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>NULL</DefaultExpression>
       <Position>28</Position>
     </column>
@@ -350,36 +350,36 @@ SubType</ColNames>
       <Turn>after-row</Turn>
     </trigger>
     <column id="120" parent="11" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="121" parent="11" name="DeviceRowID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="122" parent="11" name="DevSceneType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="123" parent="11" name="PlanID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="124" parent="11" name="Order">
-      <DataType>INTEGER BIGINT(10)|0s</DataType>
+      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="125" parent="11" name="XOffset">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="126" parent="11" name="YOffset">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
@@ -394,31 +394,31 @@ SubType</ColNames>
       <Turn>after-row</Turn>
     </trigger>
     <column id="129" parent="12" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="130" parent="12" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="131" parent="12" name="DeviceID">
-      <DataType>VARCHAR(25)|0s</DataType>
+      <DasType>VARCHAR(25)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="132" parent="12" name="Manufacturer">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="133" parent="12" name="Profile">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="134" parent="12" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
@@ -428,31 +428,31 @@ SubType</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="136" parent="13" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="137" parent="13" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="138" parent="13" name="Interpreter">
-      <DataType>VARCHAR(10)|0s</DataType>
+      <DasType>VARCHAR(10)|0s</DasType>
       <DefaultExpression>&apos;Blockly&apos;</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="139" parent="13" name="Type">
-      <DataType>VARCHAR(10)|0s</DataType>
+      <DasType>VARCHAR(10)|0s</DasType>
       <DefaultExpression>&apos;All&apos;</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="140" parent="13" name="XMLStatement">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="141" parent="13" name="Status">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
@@ -462,25 +462,25 @@ SubType</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="143" parent="14" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="144" parent="14" name="EMID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>2</Position>
     </column>
     <column id="145" parent="14" name="Conditions">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="146" parent="14" name="Actions">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="147" parent="14" name="SequenceNo">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
@@ -495,17 +495,17 @@ SubType</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="150" parent="15" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="151" parent="15" name="Speed">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="152" parent="15" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
     </column>
@@ -517,27 +517,27 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="155" parent="16" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="156" parent="16" name="Speed_Min">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="157" parent="16" name="Speed_Max">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="158" parent="16" name="Speed_Avg">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="159" parent="16" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
@@ -549,43 +549,43 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="162" parent="17" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="163" parent="17" name="DeviceID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="164" parent="17" name="DelimitedValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="165" parent="17" name="TargetType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="166" parent="17" name="TargetVariable">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="167" parent="17" name="TargetDeviceID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="168" parent="17" name="TargetProperty">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>7</Position>
     </column>
     <column id="169" parent="17" name="Enabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="170" parent="17" name="IncludeUnit">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
@@ -595,25 +595,25 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="172" parent="18" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="173" parent="18" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="174" parent="18" name="Image">
-      <DataType>BLOB|0s</DataType>
+      <DasType>BLOB|0s</DasType>
       <Position>3</Position>
     </column>
     <column id="175" parent="18" name="ScaleFactor">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>1.0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="176" parent="18" name="Order">
-      <DataType>INTEGER BIGINT(10)|0s</DataType>
+      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
@@ -628,43 +628,43 @@ Date</ColNames>
       <Turn>after-row</Turn>
     </trigger>
     <column id="179" parent="19" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="180" parent="19" name="DeviceID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="181" parent="19" name="DelimitedValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="182" parent="19" name="TargetType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="183" parent="19" name="TargetVariable">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="184" parent="19" name="TargetDeviceID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="185" parent="19" name="TargetProperty">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>7</Position>
     </column>
     <column id="186" parent="19" name="Enabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="187" parent="19" name="IncludeUnit">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
@@ -674,87 +674,87 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="189" parent="20" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="190" parent="20" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="191" parent="20" name="Enabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="192" parent="20" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="193" parent="20" name="Address">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="194" parent="20" name="Port">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="195" parent="20" name="SerialPort">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="196" parent="20" name="Username">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>8</Position>
     </column>
     <column id="197" parent="20" name="Password">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>9</Position>
     </column>
     <column id="198" parent="20" name="Extra">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="199" parent="20" name="Mode1">
-      <DataType>CHAR|0s</DataType>
+      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="200" parent="20" name="Mode2">
-      <DataType>CHAR|0s</DataType>
+      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
     </column>
     <column id="201" parent="20" name="Mode3">
-      <DataType>CHAR|0s</DataType>
+      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
     </column>
     <column id="202" parent="20" name="Mode4">
-      <DataType>CHAR|0s</DataType>
+      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>14</Position>
     </column>
     <column id="203" parent="20" name="Mode5">
-      <DataType>CHAR|0s</DataType>
+      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>15</Position>
     </column>
     <column id="204" parent="20" name="Mode6">
-      <DataType>CHAR|0s</DataType>
+      <DasType>CHAR|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>16</Position>
     </column>
     <column id="205" parent="20" name="DataTimeout">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>17</Position>
     </column>
     <column id="206" parent="20" name="Configuration">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>18</Position>
     </column>
@@ -764,43 +764,43 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="208" parent="21" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="209" parent="21" name="DeviceID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="210" parent="21" name="DelimitedValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="211" parent="21" name="TargetType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="212" parent="21" name="TargetVariable">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="213" parent="21" name="TargetDeviceID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="214" parent="21" name="TargetProperty">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>7</Position>
     </column>
     <column id="215" parent="21" name="Enabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="216" parent="21" name="IncludeUnit">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
@@ -810,16 +810,16 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="218" parent="22" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="219" parent="22" name="DeviceRowID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="220" parent="22" name="ParentID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
@@ -829,26 +829,26 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="222" parent="23" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="223" parent="23" name="nValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="224" parent="23" name="sValue">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <Position>3</Position>
     </column>
     <column id="225" parent="23" name="User">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="226" parent="23" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>5</Position>
     </column>
@@ -860,22 +860,22 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="229" parent="24" name="DeviceRowID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="230" parent="24" name="Value">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="231" parent="24" name="Usage">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="232" parent="24" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>4</Position>
     </column>
@@ -887,22 +887,22 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="235" parent="25" name="DeviceRowID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="236" parent="25" name="Value">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="237" parent="25" name="Counter">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="238" parent="25" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>4</Position>
     </column>
@@ -914,36 +914,36 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="241" parent="26" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="242" parent="26" name="Active">
-      <DataType>BOOLEAN|0s</DataType>
+      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>false</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="243" parent="26" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="244" parent="26" name="DeviceType">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="245" parent="26" name="SenderID">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="246" parent="26" name="UUID">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
     <column id="247" parent="26" name="LastUpdate">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;, &apos;localtime&apos;)</DefaultExpression>
       <Position>7</Position>
     </column>
@@ -953,42 +953,42 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="249" parent="27" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="250" parent="27" name="Value1">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="251" parent="27" name="Value2">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="252" parent="27" name="Value3">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="253" parent="27" name="Value4">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="254" parent="27" name="Value5">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="255" parent="27" name="Value6">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="256" parent="27" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>8</Position>
     </column>
@@ -1000,62 +1000,62 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="259" parent="28" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="260" parent="28" name="Value1">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="261" parent="28" name="Value2">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="262" parent="28" name="Value3">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="263" parent="28" name="Value4">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="264" parent="28" name="Value5">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
     <column id="265" parent="28" name="Value6">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
     </column>
     <column id="266" parent="28" name="Counter1">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="267" parent="28" name="Counter2">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="268" parent="28" name="Counter3">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="269" parent="28" name="Counter4">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="270" parent="28" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>12</Position>
     </column>
@@ -1067,125 +1067,125 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="273" parent="29" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="274" parent="29" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="275" parent="29" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="276" parent="29" name="SketchName">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="277" parent="29" name="SketchVersion">
-      <DataType>VARCHAR(40)|0s</DataType>
+      <DasType>VARCHAR(40)|0s</DasType>
       <DefaultExpression>1.0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="278" parent="30" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="279" parent="30" name="NodeID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="280" parent="30" name="ChildID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="281" parent="30" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="282" parent="30" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="283" parent="30" name="UseAck">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="284" parent="30" name="AckTimeout">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1200</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="285" parent="31" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="286" parent="31" name="NodeID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="287" parent="31" name="ChildID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="288" parent="31" name="VarID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="289" parent="31" name="Value">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="290" parent="32" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="291" parent="32" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="292" parent="32" name="Params">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>3</Position>
     </column>
     <column id="293" parent="32" name="CustomMessage">
-      <DataType>VARCHAR(300)|0s</DataType>
+      <DasType>VARCHAR(300)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="294" parent="32" name="ActiveSystems">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="295" parent="32" name="Priority">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="296" parent="32" name="SendAlways">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="297" parent="32" name="LastSend">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
     </column>
@@ -1195,17 +1195,17 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="299" parent="33" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="300" parent="33" name="Percentage">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="301" parent="33" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
     </column>
@@ -1217,27 +1217,27 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="304" parent="34" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="305" parent="34" name="Percentage_Min">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="306" parent="34" name="Percentage_Max">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="307" parent="34" name="Percentage_Avg">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="308" parent="34" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
@@ -1249,26 +1249,26 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="311" parent="35" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="312" parent="35" name="Order">
-      <DataType>INTEGER BIGINT(10)|0s</DataType>
+      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="313" parent="35" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="314" parent="35" name="FloorplanID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="315" parent="35" name="Area">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>5</Position>
     </column>
@@ -1283,61 +1283,61 @@ Date</ColNames>
       <Turn>after-row</Turn>
     </trigger>
     <column id="318" parent="36" name="Key">
-      <DataType>VARCHAR(50)|0s</DataType>
+      <DasType>VARCHAR(50)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="319" parent="36" name="nValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="320" parent="36" name="sValue">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <Position>3</Position>
     </column>
     <column id="321" parent="37" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="322" parent="37" name="PushType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>2</Position>
     </column>
     <column id="323" parent="37" name="DeviceID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="324" parent="37" name="DelimitedValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="325" parent="37" name="TargetType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="326" parent="37" name="TargetVariable">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="327" parent="37" name="TargetDeviceID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>7</Position>
     </column>
     <column id="328" parent="37" name="TargetProperty">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <Position>8</Position>
     </column>
     <column id="329" parent="37" name="Enabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="330" parent="37" name="IncludeUnit">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
@@ -1347,22 +1347,22 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="332" parent="38" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="333" parent="38" name="Total">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="334" parent="38" name="Rate">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="335" parent="38" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>4</Position>
     </column>
@@ -1374,22 +1374,22 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="338" parent="39" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="339" parent="39" name="Total">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="340" parent="39" name="Rate">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="341" parent="39" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
@@ -1401,46 +1401,46 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="344" parent="40" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="345" parent="40" name="Order">
-      <DataType>INTEGER BIGINT(10)|0s</DataType>
+      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="346" parent="40" name="SceneRowID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="347" parent="40" name="DeviceRowID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="348" parent="40" name="Cmd">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>1</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="349" parent="40" name="Level">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>100</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="350" parent="40" name="Color">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>NULL</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="351" parent="40" name="OnDelay">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="352" parent="40" name="OffDelay">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
@@ -1455,17 +1455,17 @@ Date</ColNames>
       <Turn>after-row</Turn>
     </trigger>
     <column id="355" parent="41" name="SceneRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="356" parent="41" name="nValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="357" parent="41" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
     </column>
@@ -1477,71 +1477,71 @@ Date</ColNames>
       <ColNames>SceneRowID</ColNames>
     </index>
     <column id="360" parent="42" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="361" parent="42" name="Active">
-      <DataType>BOOLEAN|0s</DataType>
+      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>true</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="362" parent="42" name="SceneRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="363" parent="42" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="364" parent="42" name="Time">
-      <DataType>TIME|0s</DataType>
+      <DasType>TIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="365" parent="42" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
     <column id="366" parent="42" name="Cmd">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
     </column>
     <column id="367" parent="42" name="Level">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>15</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="368" parent="42" name="UseRandomness">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="369" parent="42" name="TimerPlan">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="370" parent="42" name="Days">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>11</Position>
     </column>
     <column id="371" parent="42" name="Month">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
     </column>
     <column id="372" parent="42" name="MDay">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
     </column>
     <column id="373" parent="42" name="Occurence">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>14</Position>
     </column>
@@ -1551,61 +1551,61 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="375" parent="43" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="376" parent="43" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="377" parent="43" name="Favorite">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="378" parent="43" name="Order">
-      <DataType>INTEGER BIGINT(10)|0s</DataType>
+      <DasType>INTEGER BIGINT(10)|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="379" parent="43" name="nValue">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="380" parent="43" name="SceneType">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="381" parent="43" name="Protected">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="382" parent="43" name="OnAction">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="383" parent="43" name="OffAction">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="384" parent="43" name="Description">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="385" parent="43" name="Activators">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="386" parent="43" name="LastUpdate">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>12</Position>
     </column>
@@ -1620,61 +1620,61 @@ Date</ColNames>
       <Turn>after-row</Turn>
     </trigger>
     <column id="389" parent="44" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="390" parent="44" name="Active">
-      <DataType>BOOLEAN|0s</DataType>
+      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>true</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="391" parent="44" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="392" parent="44" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="393" parent="44" name="Time">
-      <DataType>TIME|0s</DataType>
+      <DasType>TIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="394" parent="44" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
     <column id="395" parent="44" name="Temperature">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="396" parent="44" name="TimerPlan">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="397" parent="44" name="Days">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>9</Position>
     </column>
     <column id="398" parent="44" name="Month">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="399" parent="44" name="MDay">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="400" parent="44" name="Occurence">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
     </column>
@@ -1684,16 +1684,16 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="402" parent="45" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="403" parent="45" name="SharedUserID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="404" parent="45" name="DeviceRowID">
-      <DataType>BIGINT|0s</DataType>
+      <DasType>BIGINT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
@@ -1703,42 +1703,42 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="406" parent="46" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="407" parent="46" name="Temperature">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="408" parent="46" name="Chill">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="409" parent="46" name="Humidity">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="410" parent="46" name="Barometer">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="411" parent="46" name="DewPoint">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="412" parent="46" name="SetPoint">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="413" parent="46" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>8</Position>
     </column>
@@ -1750,66 +1750,66 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="416" parent="47" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="417" parent="47" name="Temp_Min">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="418" parent="47" name="Temp_Max">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="419" parent="47" name="Temp_Avg">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="420" parent="47" name="Chill_Min">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="421" parent="47" name="Chill_Max">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <Position>6</Position>
     </column>
     <column id="422" parent="47" name="Humidity">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
     <column id="423" parent="47" name="Barometer">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="424" parent="47" name="DewPoint">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="425" parent="47" name="SetPoint_Min">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="426" parent="47" name="SetPoint_Max">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="427" parent="47" name="SetPoint_Avg">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>12</Position>
     </column>
     <column id="428" parent="47" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>13</Position>
     </column>
@@ -1821,11 +1821,11 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="431" parent="48" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="432" parent="48" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
@@ -1835,76 +1835,76 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="434" parent="49" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="435" parent="49" name="Active">
-      <DataType>BOOLEAN|0s</DataType>
+      <DasType>BOOLEAN|0s</DasType>
       <DefaultExpression>true</DefaultExpression>
       <Position>2</Position>
     </column>
     <column id="436" parent="49" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="437" parent="49" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="438" parent="49" name="Time">
-      <DataType>TIME|0s</DataType>
+      <DasType>TIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="439" parent="49" name="Type">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
     <column id="440" parent="49" name="Cmd">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
     </column>
     <column id="441" parent="49" name="Level">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>15</DefaultExpression>
       <Position>8</Position>
     </column>
     <column id="442" parent="49" name="Color">
-      <DataType>TEXT|0s</DataType>
+      <DasType>TEXT|0s</DasType>
       <DefaultExpression>NULL</DefaultExpression>
       <Position>9</Position>
     </column>
     <column id="443" parent="49" name="UseRandomness">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>10</Position>
     </column>
     <column id="444" parent="49" name="TimerPlan">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>11</Position>
     </column>
     <column id="445" parent="49" name="Days">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>12</Position>
     </column>
     <column id="446" parent="49" name="Month">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>13</Position>
     </column>
     <column id="447" parent="49" name="MDay">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>14</Position>
     </column>
     <column id="448" parent="49" name="Occurence">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>15</Position>
     </column>
@@ -1914,27 +1914,27 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="450" parent="50" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="451" parent="50" name="UUID">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="452" parent="51" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="453" parent="51" name="Level">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="454" parent="51" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>3</Position>
     </column>
@@ -1946,16 +1946,16 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="457" parent="52" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="458" parent="52" name="Level">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <Position>2</Position>
     </column>
     <column id="459" parent="52" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
@@ -1967,32 +1967,32 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="462" parent="53" name="SessionID">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="463" parent="53" name="Username">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="464" parent="53" name="AuthToken">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="465" parent="53" name="ExpirationDate">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="466" parent="53" name="RemoteHost">
-      <DataType>VARCHAR(50)|0s</DataType>
+      <DasType>VARCHAR(50)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="467" parent="53" name="LastUpdate">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;, &apos;localtime&apos;)</DefaultExpression>
       <Position>6</Position>
     </column>
@@ -2016,24 +2016,24 @@ Date</ColNames>
       <UnderlyingIndexName>sqlite_autoindex_UserSessions_1</UnderlyingIndexName>
     </key>
     <column id="472" parent="54" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="473" parent="54" name="Name">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <Position>2</Position>
     </column>
     <column id="474" parent="54" name="ValueType">
-      <DataType>INT|0s</DataType>
+      <DasType>INT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="475" parent="54" name="Value">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <Position>4</Position>
     </column>
     <column id="476" parent="54" name="LastUpdate">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;, &apos;localtime&apos;)</DefaultExpression>
       <Position>5</Position>
     </column>
@@ -2043,37 +2043,37 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="478" parent="55" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="479" parent="55" name="Active">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="480" parent="55" name="Username">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="481" parent="55" name="Password">
-      <DataType>VARCHAR(200)|0s</DataType>
+      <DasType>VARCHAR(200)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="482" parent="55" name="Rights">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>255</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="483" parent="55" name="TabsEnabled">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>255</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="484" parent="55" name="RemoteSharing">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
@@ -2083,26 +2083,26 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="486" parent="56" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="487" parent="56" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="488" parent="56" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>3</Position>
     </column>
     <column id="489" parent="56" name="MacAddress">
-      <DataType>VARCHAR(50)|0s</DataType>
+      <DasType>VARCHAR(50)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>4</Position>
     </column>
     <column id="490" parent="56" name="Timeout">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>5</DefaultExpression>
       <Position>5</Position>
     </column>
@@ -2112,27 +2112,27 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="492" parent="57" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="493" parent="57" name="Direction">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="494" parent="57" name="Speed">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="495" parent="57" name="Gust">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="496" parent="57" name="Date">
-      <DataType>DATETIME|0s</DataType>
+      <DasType>DATETIME|0s</DasType>
       <DefaultExpression>datetime(&apos;now&apos;,&apos;localtime&apos;)</DefaultExpression>
       <Position>5</Position>
     </column>
@@ -2144,37 +2144,37 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="499" parent="58" name="DeviceRowID">
-      <DataType>BIGINT(10)|0s</DataType>
+      <DasType>BIGINT(10)|0s</DasType>
       <NotNull>1</NotNull>
       <Position>1</Position>
     </column>
     <column id="500" parent="58" name="Direction">
-      <DataType>FLOAT|0s</DataType>
+      <DasType>FLOAT|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="501" parent="58" name="Speed_Min">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="502" parent="58" name="Speed_Max">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="503" parent="58" name="Gust_Min">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>5</Position>
     </column>
     <column id="504" parent="58" name="Gust_Max">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>6</Position>
     </column>
     <column id="505" parent="58" name="Date">
-      <DataType>DATE|0s</DataType>
+      <DasType>DATE|0s</DasType>
       <NotNull>1</NotNull>
       <Position>7</Position>
     </column>
@@ -2186,36 +2186,36 @@ Date</ColNames>
       <ColNames>DeviceRowID</ColNames>
     </index>
     <column id="508" parent="59" name="ID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="509" parent="59" name="HardwareID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>2</Position>
     </column>
     <column id="510" parent="59" name="HomeID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>3</Position>
     </column>
     <column id="511" parent="59" name="NodeID">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <NotNull>1</NotNull>
       <Position>4</Position>
     </column>
     <column id="512" parent="59" name="Name">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>5</Position>
     </column>
     <column id="513" parent="59" name="ProductDescription">
-      <DataType>VARCHAR(100)|0s</DataType>
+      <DasType>VARCHAR(100)|0s</DasType>
       <DefaultExpression>Unknown</DefaultExpression>
       <Position>6</Position>
     </column>
     <column id="514" parent="59" name="PollTime">
-      <DataType>INTEGER|0s</DataType>
+      <DasType>INTEGER|0s</DasType>
       <DefaultExpression>0</DefaultExpression>
       <Position>7</Position>
     </column>
@@ -2225,23 +2225,23 @@ Date</ColNames>
       <UnderlyingIndexColNames>ID</UnderlyingIndexColNames>
     </key>
     <column id="516" parent="60" name="type">
-      <DataType>text|0s</DataType>
+      <DasType>text|0s</DasType>
       <Position>1</Position>
     </column>
     <column id="517" parent="60" name="name">
-      <DataType>text|0s</DataType>
+      <DasType>text|0s</DasType>
       <Position>2</Position>
     </column>
     <column id="518" parent="60" name="tbl_name">
-      <DataType>text|0s</DataType>
+      <DasType>text|0s</DasType>
       <Position>3</Position>
     </column>
     <column id="519" parent="60" name="rootpage">
-      <DataType>int|0s</DataType>
+      <DasType>int|0s</DasType>
       <Position>4</Position>
     </column>
     <column id="520" parent="60" name="sql">
-      <DataType>text|0s</DataType>
+      <DasType>text|0s</DasType>
       <Position>5</Position>
     </column>
     <column id="521" parent="61" name="tbl">

diff --git a/.idea/php.xml b/.idea/php.xml
index 8c805bdae031ad5780ad63c178c11287cd97c7e6..1c633bc7df46fb636ad103bc5b0c9ec94256ecab 100644 (file)
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
   <component name="PhpIncludePathManager">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/composer" />

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3ce24db9947b69db433c5a949d68640780f96dec..d837e8a7aeb471f942f8848ddaca4829fab0964f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <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/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/hotwater.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/hotwater.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/switchbot.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/switchbot.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -229,27 +232,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
-    &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/tortuga-home/node_modules&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.Mappings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
+    "WebServerToolWindowPanel.toolwindow.show.date": "false",
+    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
+    "WebServerToolWindowPanel.toolwindow.show.size": "false",
+    "deletionFromPopupRequiresConfirmation": "false",
+    "last_opened_file_path": "D:/Works/tortuga-home/node_modules",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.2",
+    "ruby.rails.projectView.checked": "true",
+    "settings.editor.selected.configurable": "editor.preferences.fonts.default",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="T:\Drive\Works\home" />
@@ -1177,14 +1180,10 @@
       <workItem from="1668672202122" duration="723000" />
       <workItem from="1668769338986" duration="676000" />
       <workItem from="1669206068222" duration="2217000" />
-      <workItem from="1669377758083" duration="43000" />
-    </task>
-    <task id="LOCAL-00494" summary=".">
-      <created>1639837981727</created>
-      <option name="number" value="00494" />
-      <option name="presentableId" value="LOCAL-00494" />
-      <option name="project" value="LOCAL" />
-      <updated>1639837981727</updated>
+      <workItem from="1669377758083" duration="457000" />
+      <workItem from="1669384803169" duration="746000" />
+      <workItem from="1669880738062" duration="41000" />
+      <workItem from="1669880798666" duration="262000" />
     </task>
     <task id="LOCAL-00495" summary=".">
       <created>1639915732929</created>
@@ -1522,7 +1521,14 @@
       <option name="project" value="LOCAL" />
       <updated>1668415032851</updated>
     </task>
-    <option name="localTasksCounter" value="543" />
+    <task id="LOCAL-00543" summary=".">
+      <created>1669377847531</created>
+      <option name="number" value="00543" />
+      <option name="presentableId" value="LOCAL-00543" />
+      <option name="project" value="LOCAL" />
+      <updated>1669377847531</updated>
+    </task>
+    <option name="localTasksCounter" value="544" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1552,6 +1558,10 @@
     <MESSAGE value="." />
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />

diff --git a/scripts/hotwater.php b/scripts/hotwater.php
index b9e52d2eba41ed2741c6ca6b9f150df8554df4a9..ac956b15542bbd3a62adbdfd97d2be39c5fbcc08 100644 (file)
--- a/scripts/hotwater.php
+++ b/scripts/hotwater.php
@@ -6,4 +6,4 @@ echo "\n\n";
 echo getState('hotwater');
 if (isset($_GET['on'])) {
     echo hotwater($_GET['on']);
-}
\ No newline at end of file
+}

diff --git a/scripts/lib/switchbot.php b/scripts/lib/switchbot.php
index c740f771432fd808dff7175cd566bbf963a6dd00..031d3543266e374765f966f4a0ce6c9471549d53 100644 (file)
--- a/scripts/lib/switchbot.php
+++ b/scripts/lib/switchbot.php
@@ -1,162 +1,153 @@
 <?php
-function switchbot($device, $command = 'press', $rpi = 'sdb')
-{
-    for ($i = 0; $i <= 60; $i++) {
-        $res = sshCommand('/docker/switchbot/run ' . $device . ' ' . $command, $rpi, true, true);
-        if (stristr($res['output'], 'Command execution successful')) {
-            break;
-        }
-        sleep(5);
-    }
-    return $res;
+function switchbot($device, $command = 'press', $rpi = 'sdb') {
+       $res = '';
+       for ($i = 0; $i <= 60; $i++) {
+               //        $res = sshCommand('/docker/switchbot/run ' . $device . ' ' . $command, $rpi, true, true);
+               //        if (stristr($res['output'], 'Command execution successful')) {
+               //            break;
+               //        }
+               //        sleep(5);
+       }
+       return $res;
 }
 
-function hotwaterAutoMode($mode, $force = false)
-{
-    $mode = $mode ? '1' : '0';
-    setState('hotwater_auto_mode', $mode);
-    if ($mode) {
-        hotwaterCheckMode($force);
-    }
+function hotwaterAutoMode($mode, $force = false) {
+       $mode = $mode ? '1' : '0';
+       setState('hotwater_auto_mode', $mode);
+       if ($mode) {
+               hotwaterCheckMode($force);
+       }
 }
 
-function hotwaterCheckMode($force = false)
-{
-    if (getState('hotwater_auto_mode', '1') == '0') {
-        return;
-    }
-
-    $jerome = isJerome(true, $force);
-    $vincent = isVincent($force);
-
-    $h = date('G');
-    $isWeek = isWeekDay();
-
-    $maxLevel = '2';
-
-    $ecomode = (int)getState('ecomode', '0');
-
-    if (!isVincent($force)) {
-        $hot = '1';
-    } else {
-        if (getSqueezePlayerStatus('Salle de bains')) {
-            $hot = $maxLevel;
-        } else {
-            if (isJerome()) {
-                $weekColdHours = [0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 23];
-                if ($ecomode == 0) {
-                    $hot = ($isWeek && in_array($h, $weekColdHours)) ? '0' : '1';
-                } else if ($ecomode == 1) {
-                    $hot = ($isWeek && $h >= 6 && $h <= 7) ? '1' : '0';
-                } else if ($ecomode == 2) {
-                    $hot = '0';
-                }
-            } else {
-                $hot = '0';
-            }
-        }
-    }
-    echo "\n\n" . 'V:' . $vincent . '/J:' . $jerome . '/H:' . $h . '/WD:' . $isWeek . '/W:' . $hot . "\n\n";
-    hotwater($hot);
+function hotwaterCheckMode($force = false) {
+       if (getState('hotwater_auto_mode', '1') == '0') {
+               return;
+       }
+
+       $jerome = isJerome(true, $force);
+       $vincent = isVincent($force);
+
+       $h = date('G');
+       $isWeek = isWeekDay();
+
+       $maxLevel = '2';
+
+       $ecomode = (int)getState('ecomode', '0');
+
+       if (!isVincent($force)) {
+               $hot = '1';
+       } else {
+               if (getSqueezePlayerStatus('Salle de bains')) {
+                       $hot = $maxLevel;
+               } else {
+                       if (isJerome()) {
+                               $weekColdHours = [0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 23];
+                               if ($ecomode == 0) {
+                                       $hot = ($isWeek && in_array($h, $weekColdHours)) ? '0' : '1';
+                               } else if ($ecomode == 1) {
+                                       $hot = ($isWeek && $h >= 6 && $h <= 7) ? '1' : '0';
+                               } else if ($ecomode == 2) {
+                                       $hot = '0';
+                               }
+                       } else {
+                               $hot = '0';
+                       }
+               }
+       }
+       echo "\n\n" . 'V:' . $vincent . '/J:' . $jerome . '/H:' . $h . '/WD:' . $isWeek . '/W:' . $hot . "\n\n";
+       hotwater($hot);
 }
 
-function hotwater($newState)
-{
-    set_time_limit(300);
-    // 0 : OFF
-    // 1 : ECO
-    // 2 : MAX
-
-    echo getState('hotwater_auto_mode', '1') . '::' . getState('hotwater_change', '0') . '::' . getState('hotwater', '1');
-    $changing = getState('hotwater_change', '0');
-    $limit = time() - 300;
-    if ($changing > $limit) {
-        return 'changing';
-    }
-
-    $device = 'C1:F7:66:5E:A2:CF';
-    $state = getState('hotwater', '1');
-    if ($newState == $state) {
-        setState('hotwater_change', '0');
-        return 'no state change';
-    }
-    $clicks = (3 + $newState - $state) % 3;
-    setState('hotwater_change', time());
-
-    $res = '';
-    for ($i = 0; $i < $clicks; $i++) {
-        $res .= ' one click - ';
-        $res .= print_r(switchbot($device, 'press', 'sdb'));
-        if ($i < $clicks - 1) {
-            sleep(2);
-        }
-    }
-    setState('hotwater', $newState);
-    setState('hotwater_change', '0');
-    return $res;
+function hotwater($newState) {
+       set_time_limit(300);
+       // 0 : OFF
+       // 1 : ECO
+       // 2 : MAX
+
+       echo getState('hotwater_auto_mode', '1') . '::' . getState('hotwater_change', '0') . '::' . getState('hotwater', '1');
+       $changing = getState('hotwater_change', '0');
+       $limit = time() - 300;
+       if ($changing > $limit) {
+               return 'changing';
+       }
+
+       $device = 'C1:F7:66:5E:A2:CF';
+       $state = getState('hotwater', '1');
+       if ($newState == $state) {
+               setState('hotwater_change', '0');
+               return 'no state change';
+       }
+       $clicks = (3 + $newState - $state) % 3;
+       setState('hotwater_change', time());
+
+       $res = '';
+       for ($i = 0; $i < $clicks; $i++) {
+               $res .= ' one click - ';
+               $res .= print_r(switchbot($device, 'press', 'sdb'));
+               if ($i < $clicks - 1) {
+                       sleep(2);
+               }
+       }
+       setState('hotwater', $newState);
+       setState('hotwater_change', '0');
+       return $res;
 }
 
-function isWeekDay()
-{
-    $d = date('N');
-    return $d < 6;
+function isWeekDay() {
+       $d = date('N');
+       return $d < 6;
 }
 
-function isWeekEnd()
-{
-    return !isWeekDay();
+function isWeekEnd() {
+       return !isWeekDay();
 }
 
-function isVincent($force = false)
-{
-    return remember('vincent_in_paris', 3600, function () {
-        return _isVincent();
-    }, true, $force);
+function isVincent($force = false) {
+       return remember('vincent_in_paris', 3600, function () {
+               return _isVincent();
+       }, true, $force);
 }
 
-function _isVincent()
-{
-    $today = new DateTime('now');
-    $events = searchIcalEventDay('dplacements-jrme', $today);
-    foreach ($events as $event) {
-        if (stristr($event['data']['SUMMARY'], '(V)')) {
-            return false;
-        }
-    }
-    return true;
+function _isVincent() {
+       $today = new DateTime('now');
+       $events = searchIcalEventDay('dplacements-jrme', $today);
+       foreach ($events as $event) {
+               if (stristr($event['data']['SUMMARY'], '(V)')) {
+                       return false;
+               }
+       }
+       return true;
 }
 
-function isJerome($strict = true, $force = false)
-{
-    $key = 'jerome_in_paris' . ($strict ? '' : '_1');
+function isJerome($strict = true, $force = false) {
+       $key = 'jerome_in_paris' . ($strict ? '' : '_1');
 
-    return remember($key, 3600, function () use ($strict) {
-        return _isJerome($strict);
-    }, true, $force);
+       return remember($key, 3600, function () use ($strict) {
+               return _isJerome($strict);
+       }, true, $force);
 }
 
-function _isJerome($strict = true)
-{
-    $today = new DateTime('now');
-    $yesterday = new DateTime('now');
-    $yesterday->sub(new DateInterval('P1D'));
-    $tomorrow = new DateTime('now');
-    $tomorrow->add(new DateInterval('P1D'));
-
-    $dates = $strict ? [$yesterday, $today, $tomorrow] : [$today];
-
-    foreach ($dates as $date) {
-        $events = searchIcalEventDay('dplacements-jrme', $date);
-        $count = 0;
-        foreach ($events as $event) {
-            if (stristr($event['data']['SUMMARY'], '(V)')) {
-                continue;
-            }
-            $count++;
-        }
-        if (!$count) {
-            return true;
-        }
-    }
-    return false;
+function _isJerome($strict = true) {
+       $today = new DateTime('now');
+       $yesterday = new DateTime('now');
+       $yesterday->sub(new DateInterval('P1D'));
+       $tomorrow = new DateTime('now');
+       $tomorrow->add(new DateInterval('P1D'));
+
+       $dates = $strict ? [$yesterday, $today, $tomorrow] : [$today];
+
+       foreach ($dates as $date) {
+               $events = searchIcalEventDay('dplacements-jrme', $date);
+               $count = 0;
+               foreach ($events as $event) {
+                       if (stristr($event['data']['SUMMARY'], '(V)')) {
+                               continue;
+                       }
+                       $count++;
+               }
+               if (!$count) {
+                       return true;
+               }
+       }
+       return false;
 }
\ No newline at end of file