From: Vincent Vanwaelscappel Date: Tue, 1 Oct 2024 19:54:36 +0000 (+0200) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a62b2fa100247188b3f408abf6b2a132f69f5763;p=tortuga-home.git . --- diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index f0de5c5..93f61a5 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + " diff --git a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml index ab2ff57..cafda2b 100644 --- a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml +++ b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml @@ -1,6 +1,6 @@ - + @@ -67,56 +67,56 @@ - VARCHAR(50)|0s 1 1 + VARCHAR(50)|0s - INTEGER|0s 0 2 + INTEGER|0s - INTEGER|0s 1 + INTEGER|0s - VARCHAR(200)|0s 1 2 + VARCHAR(200)|0s - INTEGER|0s 1 3 + INTEGER|0s - VARCHAR(200)|0s 4 + VARCHAR(200)|0s - INTEGER|0s 5 + INTEGER|0s - INTEGER|0s 0 6 + INTEGER|0s - VARCHAR(100)|0s '' 7 + VARCHAR(100)|0s - VARCHAR(100)|0s '' 8 + VARCHAR(100)|0s - VARCHAR(200)|0s '' 9 + VARCHAR(200)|0s ID @@ -124,33 +124,33 @@ ID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 1 4 + INTEGER|0s - INTEGER|0s 1 5 + INTEGER|0s - INTEGER|0s 1 6 + INTEGER|0s ID @@ -158,35 +158,35 @@ ID - INTEGER|0s 1 + INTEGER|0s - VARCHAR(80)|0s 1 2 + VARCHAR(80)|0s - VARCHAR(80)|0s 1 3 + VARCHAR(80)|0s - VARCHAR(80)|0s 1 4 + VARCHAR(80)|0s - BLOB|0s 5 + BLOB|0s - BLOB|0s 6 + BLOB|0s - BLOB|0s 7 + BLOB|0s ID @@ -194,143 +194,143 @@ ID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - VARCHAR(25)|0s 1 3 + VARCHAR(25)|0s - INTEGER|0s 0 4 + INTEGER|0s - VARCHAR(100)|0s Unknown 5 + VARCHAR(100)|0s - INTEGER|0s 0 6 + INTEGER|0s - INTEGER|0s 1 7 + INTEGER|0s - INTEGER|0s 1 8 + INTEGER|0s - INTEGER|0s 0 9 + INTEGER|0s - INTEGER|0s 0 10 + INTEGER|0s - INTEGER|0s 0 11 + INTEGER|0s - INTEGER|0s 0 12 + INTEGER|0s - INTEGER|0s 0 13 + INTEGER|0s - VARCHAR(200)|0s null 14 + VARCHAR(200)|0s - DATETIME|0s datetime('now','localtime') 15 + DATETIME|0s - INTEGER BIGINT(10)|0s 0 16 + INTEGER BIGINT(10)|0s - FLOAT|0s 0 17 + FLOAT|0s - FLOAT|0s 1 18 + FLOAT|0s - FLOAT|0s 0 19 + FLOAT|0s - FLOAT|0s 1 20 + FLOAT|0s - VARCHAR(200)|0s '' 21 + VARCHAR(200)|0s - VARCHAR(200)|0s '' 22 + VARCHAR(200)|0s - INTEGER|0s 0 23 + INTEGER|0s - INTEGER|0s 0 24 + INTEGER|0s - INTEGER|0s 0 25 + INTEGER|0s - VARCHAR(200)|0s '' 26 + VARCHAR(200)|0s - TEXT|0s null 27 + TEXT|0s - TEXT|0s NULL 28 + TEXT|0s HardwareID @@ -349,38 +349,38 @@ SubType 181 - INTEGER|0s 1 + INTEGER|0s - BIGINT|0s 1 2 + BIGINT|0s - INTEGER|0s 0 3 + INTEGER|0s - BIGINT|0s 1 4 + BIGINT|0s - INTEGER BIGINT(10)|0s 0 5 + INTEGER BIGINT(10)|0s - INTEGER|0s 0 6 + INTEGER|0s - INTEGER|0s 0 7 + INTEGER|0s ID @@ -392,33 +392,33 @@ SubType 200 - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - VARCHAR(25)|0s 1 3 + VARCHAR(25)|0s - INTEGER|0s 1 4 + INTEGER|0s - INTEGER|0s 1 5 + INTEGER|0s - INTEGER|0s 1 6 + INTEGER|0s ID @@ -426,33 +426,33 @@ SubType ID - INTEGER|0s 1 + INTEGER|0s - VARCHAR(200)|0s 1 2 + VARCHAR(200)|0s - VARCHAR(10)|0s 'Blockly' 3 + VARCHAR(10)|0s - VARCHAR(10)|0s 'All' 4 + VARCHAR(10)|0s - TEXT|0s 1 5 + TEXT|0s - INTEGER|0s 0 6 + INTEGER|0s ID @@ -460,27 +460,27 @@ SubType ID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 2 + INTEGER|0s - TEXT|0s 1 3 + TEXT|0s - TEXT|0s 1 4 + TEXT|0s - INTEGER|0s 1 5 + INTEGER|0s EMID @@ -493,19 +493,19 @@ SubType ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - INTEGER|0s 1 2 + INTEGER|0s - DATETIME|0s datetime('now','localtime') 3 + DATETIME|0s DeviceRowID @@ -515,29 +515,29 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - INTEGER|0s 1 2 + INTEGER|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 0 4 + INTEGER|0s - DATE|0s 1 5 + DATE|0s DeviceRowID @@ -547,45 +547,45 @@ Date DeviceRowID - INTEGER|0s 1 + INTEGER|0s - BIGINT|0s 1 2 + BIGINT|0s - INTEGER|0s 0 3 + INTEGER|0s - INTEGER|0s 0 4 + INTEGER|0s - VARCHAR(100)|0s 5 + VARCHAR(100)|0s - INTEGER|0s 6 + INTEGER|0s - VARCHAR(100)|0s 7 + VARCHAR(100)|0s - INTEGER|0s 1 8 + INTEGER|0s - INTEGER|0s 0 9 + INTEGER|0s ID @@ -593,27 +593,27 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - VARCHAR(200)|0s 1 2 + VARCHAR(200)|0s - BLOB|0s 3 + BLOB|0s - FLOAT|0s 1.0 4 + FLOAT|0s - INTEGER BIGINT(10)|0s 0 5 + INTEGER BIGINT(10)|0s ID @@ -625,45 +625,45 @@ Date 176 - INTEGER|0s 1 + INTEGER|0s - BIGINT|0s 1 2 + BIGINT|0s - INTEGER|0s 0 3 + INTEGER|0s - INTEGER|0s 0 4 + INTEGER|0s - VARCHAR(100)|0s 5 + VARCHAR(100)|0s - INTEGER|0s 6 + INTEGER|0s - VARCHAR(100)|0s 7 + VARCHAR(100)|0s - INTEGER|0s 1 8 + INTEGER|0s - INTEGER|0s 0 9 + INTEGER|0s ID @@ -671,89 +671,89 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - VARCHAR(200)|0s 1 2 + VARCHAR(200)|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 1 4 + INTEGER|0s - VARCHAR(200)|0s 5 + VARCHAR(200)|0s - INTEGER|0s 6 + INTEGER|0s - TEXT|0s '' 7 + TEXT|0s - VARCHAR(100)|0s 8 + VARCHAR(100)|0s - VARCHAR(100)|0s 9 + VARCHAR(100)|0s - TEXT|0s '' 10 + TEXT|0s - CHAR|0s 0 11 + CHAR|0s - CHAR|0s 0 12 + CHAR|0s - CHAR|0s 0 13 + CHAR|0s - CHAR|0s 0 14 + CHAR|0s - CHAR|0s 0 15 + CHAR|0s - CHAR|0s 0 16 + CHAR|0s - INTEGER|0s 0 17 + INTEGER|0s - TEXT|0s '' 18 + TEXT|0s ID @@ -761,45 +761,45 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - BIGINT|0s 1 2 + BIGINT|0s - INTEGER|0s 0 3 + INTEGER|0s - INTEGER|0s 0 4 + INTEGER|0s - VARCHAR(100)|0s 5 + VARCHAR(100)|0s - INTEGER|0s 6 + INTEGER|0s - VARCHAR(100)|0s 7 + VARCHAR(100)|0s - INTEGER|0s 1 8 + INTEGER|0s - INTEGER|0s 0 9 + INTEGER|0s ID @@ -807,18 +807,18 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - INTEGER|0s 1 3 + INTEGER|0s ID @@ -826,28 +826,28 @@ Date ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - INTEGER|0s 0 2 + INTEGER|0s - VARCHAR(200)|0s 3 + VARCHAR(200)|0s - VARCHAR(100)|0s '' 4 + VARCHAR(100)|0s - DATETIME|0s datetime('now','localtime') 5 + DATETIME|0s DeviceRowID @@ -857,24 +857,24 @@ Date DeviceRowID - BIGINT|0s 1 1 + BIGINT|0s - BIGINT|0s 1 2 + BIGINT|0s - INTEGER|0s 0 3 + INTEGER|0s - DATETIME|0s datetime('now','localtime') 4 + DATETIME|0s DeviceRowID @@ -884,24 +884,24 @@ Date DeviceRowID - BIGINT|0s 1 1 + BIGINT|0s - BIGINT|0s 1 2 + BIGINT|0s - BIGINT|0s 0 3 + BIGINT|0s - DATETIME|0s datetime('now','localtime') 4 + DATETIME|0s DeviceRowID @@ -911,38 +911,38 @@ Date DeviceRowID - INTEGER|0s 1 + INTEGER|0s - BOOLEAN|0s false 2 + BOOLEAN|0s - VARCHAR(100)|0s '' 3 + VARCHAR(100)|0s - VARCHAR(100)|0s '' 4 + VARCHAR(100)|0s - TEXT|0s 1 5 + TEXT|0s - TEXT|0s 1 6 + TEXT|0s - DATETIME|0s datetime('now', 'localtime') 7 + DATETIME|0s ID @@ -950,44 +950,44 @@ Date ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - BIGINT|0s 1 2 + BIGINT|0s - BIGINT|0s 0 3 + BIGINT|0s - BIGINT|0s 0 4 + BIGINT|0s - BIGINT|0s 0 5 + BIGINT|0s - BIGINT|0s 0 6 + BIGINT|0s - BIGINT|0s 0 7 + BIGINT|0s - DATETIME|0s datetime('now','localtime') 8 + DATETIME|0s DeviceRowID @@ -997,64 +997,64 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - BIGINT|0s 1 2 + BIGINT|0s - BIGINT|0s 1 3 + BIGINT|0s - BIGINT|0s 1 4 + BIGINT|0s - BIGINT|0s 1 5 + BIGINT|0s - BIGINT|0s 1 6 + BIGINT|0s - BIGINT|0s 1 7 + BIGINT|0s - BIGINT|0s 0 8 + BIGINT|0s - BIGINT|0s 0 9 + BIGINT|0s - BIGINT|0s 0 10 + BIGINT|0s - BIGINT|0s 0 11 + BIGINT|0s - DATETIME|0s datetime('now','localtime') 12 + DATETIME|0s DeviceRowID @@ -1064,127 +1064,127 @@ Date DeviceRowID - INTEGER|0s 1 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - VARCHAR(100)|0s Unknown 3 + VARCHAR(100)|0s - VARCHAR(100)|0s Unknown 4 + VARCHAR(100)|0s - VARCHAR(40)|0s 1.0 5 + VARCHAR(40)|0s - INTEGER|0s 1 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - INTEGER|0s 1 3 + INTEGER|0s - VARCHAR(100)|0s '' 4 + VARCHAR(100)|0s - INTEGER|0s 1 5 + INTEGER|0s - INTEGER|0s 0 6 + INTEGER|0s - INTEGER|0s 1200 7 + INTEGER|0s - INTEGER|0s 1 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 1 4 + INTEGER|0s - VARCHAR(100)|0s 1 5 + VARCHAR(100)|0s - INTEGER|0s 1 + INTEGER|0s - BIGINT(10)|0s 1 2 + BIGINT(10)|0s - VARCHAR(100)|0s 3 + VARCHAR(100)|0s - VARCHAR(300)|0s '' 4 + VARCHAR(300)|0s - VARCHAR(200)|0s '' 5 + VARCHAR(200)|0s - INTEGER|0s 0 6 + INTEGER|0s - INTEGER|0s 0 7 + INTEGER|0s - DATETIME|0s 0 8 + DATETIME|0s ID @@ -1192,19 +1192,19 @@ Date ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - DATETIME|0s datetime('now','localtime') 3 + DATETIME|0s DeviceRowID @@ -1214,29 +1214,29 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - FLOAT|0s 1 3 + FLOAT|0s - FLOAT|0s 0 4 + FLOAT|0s - DATE|0s 1 5 + DATE|0s DeviceRowID @@ -1246,28 +1246,28 @@ Date DeviceRowID - INTEGER|0s 1 + INTEGER|0s - INTEGER BIGINT(10)|0s 0 2 + INTEGER BIGINT(10)|0s - VARCHAR(200)|0s 1 3 + VARCHAR(200)|0s - INTEGER|0s 0 4 + INTEGER|0s - VARCHAR(200)|0s '' 5 + VARCHAR(200)|0s ID @@ -1279,63 +1279,63 @@ Date 151 - VARCHAR(50)|0s 1 1 + VARCHAR(50)|0s - INTEGER|0s 0 2 + INTEGER|0s - VARCHAR(200)|0s 3 + VARCHAR(200)|0s - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 2 + INTEGER|0s - BIGINT|0s 1 3 + BIGINT|0s - INTEGER|0s 0 4 + INTEGER|0s - INTEGER|0s 0 5 + INTEGER|0s - VARCHAR(100)|0s 6 + VARCHAR(100)|0s - INTEGER|0s 7 + INTEGER|0s - VARCHAR(100)|0s 8 + VARCHAR(100)|0s - INTEGER|0s 1 9 + INTEGER|0s - INTEGER|0s 0 10 + INTEGER|0s ID @@ -1343,24 +1343,24 @@ Date ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - INTEGER|0s 0 3 + INTEGER|0s - DATETIME|0s datetime('now','localtime') 4 + DATETIME|0s DeviceRowID @@ -1370,24 +1370,24 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - INTEGER|0s 0 3 + INTEGER|0s - DATE|0s 1 4 + DATE|0s DeviceRowID @@ -1397,48 +1397,48 @@ Date DeviceRowID - INTEGER|0s 1 + INTEGER|0s - INTEGER BIGINT(10)|0s 0 2 + INTEGER BIGINT(10)|0s - BIGINT|0s 1 3 + BIGINT|0s - BIGINT|0s 1 4 + BIGINT|0s - INTEGER|0s 1 5 + INTEGER|0s - INTEGER|0s 100 6 + INTEGER|0s - TEXT|0s NULL 7 + TEXT|0s - INTEGER|0s 0 8 + INTEGER|0s - INTEGER|0s 0 9 + INTEGER|0s ID @@ -1450,19 +1450,19 @@ Date 181 - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - INTEGER|0s 0 2 + INTEGER|0s - DATETIME|0s datetime('now','localtime') 3 + DATETIME|0s SceneRowID @@ -1472,73 +1472,73 @@ Date SceneRowID - INTEGER|0s 1 + INTEGER|0s - BOOLEAN|0s true 2 + BOOLEAN|0s - BIGINT(10)|0s 1 3 + BIGINT(10)|0s - DATE|0s 0 4 + DATE|0s - TIME|0s 1 5 + TIME|0s - INTEGER|0s 1 6 + INTEGER|0s - INTEGER|0s 1 7 + INTEGER|0s - INTEGER|0s 15 8 + INTEGER|0s - INTEGER|0s 0 9 + INTEGER|0s - INTEGER|0s 0 10 + INTEGER|0s - INTEGER|0s 1 11 + INTEGER|0s - INTEGER|0s 0 12 + INTEGER|0s - INTEGER|0s 0 13 + INTEGER|0s - INTEGER|0s 0 14 + INTEGER|0s ID @@ -1546,63 +1546,63 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - VARCHAR(100)|0s 1 2 + VARCHAR(100)|0s - INTEGER|0s 0 3 + INTEGER|0s - INTEGER BIGINT(10)|0s 0 4 + INTEGER BIGINT(10)|0s - INTEGER|0s 0 5 + INTEGER|0s - INTEGER|0s 0 6 + INTEGER|0s - INTEGER|0s 0 7 + INTEGER|0s - VARCHAR(200)|0s '' 8 + VARCHAR(200)|0s - VARCHAR(200)|0s '' 9 + VARCHAR(200)|0s - VARCHAR(200)|0s '' 10 + VARCHAR(200)|0s - VARCHAR(200)|0s '' 11 + VARCHAR(200)|0s - DATETIME|0s datetime('now','localtime') 12 + DATETIME|0s ID @@ -1614,63 +1614,63 @@ Date 151 - INTEGER|0s 1 + INTEGER|0s - BOOLEAN|0s true 2 + BOOLEAN|0s - BIGINT(10)|0s 1 3 + BIGINT(10)|0s - DATE|0s 0 4 + DATE|0s - TIME|0s 1 5 + TIME|0s - INTEGER|0s 1 6 + INTEGER|0s - FLOAT|0s 0 7 + FLOAT|0s - INTEGER|0s 0 8 + INTEGER|0s - INTEGER|0s 1 9 + INTEGER|0s - INTEGER|0s 0 10 + INTEGER|0s - INTEGER|0s 0 11 + INTEGER|0s - INTEGER|0s 0 12 + INTEGER|0s ID @@ -1678,18 +1678,18 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - BIGINT|0s 1 2 + BIGINT|0s - BIGINT|0s 1 3 + BIGINT|0s ID @@ -1697,44 +1697,44 @@ Date ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - FLOAT|0s 0 3 + FLOAT|0s - INTEGER|0s 0 4 + INTEGER|0s - INTEGER|0s 0 5 + INTEGER|0s - FLOAT|0s 0 6 + FLOAT|0s - FLOAT|0s 0 7 + FLOAT|0s - DATETIME|0s datetime('now','localtime') 8 + DATETIME|0s DeviceRowID @@ -1744,68 +1744,68 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - FLOAT|0s 1 3 + FLOAT|0s - FLOAT|0s 0 4 + FLOAT|0s - FLOAT|0s 0 5 + FLOAT|0s - FLOAT|0s 6 + FLOAT|0s - INTEGER|0s 0 7 + INTEGER|0s - INTEGER|0s 0 8 + INTEGER|0s - FLOAT|0s 0 9 + FLOAT|0s - FLOAT|0s 0 10 + FLOAT|0s - FLOAT|0s 0 11 + FLOAT|0s - FLOAT|0s 0 12 + FLOAT|0s - DATE|0s 1 13 + DATE|0s DeviceRowID @@ -1815,13 +1815,13 @@ Date DeviceRowID - INTEGER|0s 1 + INTEGER|0s - VARCHAR(200)|0s 1 2 + VARCHAR(200)|0s ID @@ -1829,78 +1829,78 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - BOOLEAN|0s true 2 + BOOLEAN|0s - BIGINT(10)|0s 1 3 + BIGINT(10)|0s - DATE|0s 0 4 + DATE|0s - TIME|0s 1 5 + TIME|0s - INTEGER|0s 1 6 + INTEGER|0s - INTEGER|0s 1 7 + INTEGER|0s - INTEGER|0s 15 8 + INTEGER|0s - TEXT|0s NULL 9 + TEXT|0s - INTEGER|0s 0 10 + INTEGER|0s - INTEGER|0s 0 11 + INTEGER|0s - INTEGER|0s 1 12 + INTEGER|0s - INTEGER|0s 0 13 + INTEGER|0s - INTEGER|0s 0 14 + INTEGER|0s - INTEGER|0s 0 15 + INTEGER|0s ID @@ -1908,29 +1908,29 @@ Date ID - INTEGER|0s 1 1 + INTEGER|0s - VARCHAR(100)|0s 1 2 + VARCHAR(100)|0s - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - DATETIME|0s datetime('now','localtime') 3 + DATETIME|0s DeviceRowID @@ -1940,18 +1940,18 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 2 + FLOAT|0s - DATE|0s 1 3 + DATE|0s DeviceRowID @@ -1961,34 +1961,34 @@ Date DeviceRowID - VARCHAR(100)|0s 1 1 + VARCHAR(100)|0s - VARCHAR(100)|0s 1 2 + VARCHAR(100)|0s - VARCHAR(100)|0s 1 3 + VARCHAR(100)|0s - DATETIME|0s 1 4 + DATETIME|0s - VARCHAR(50)|0s 1 5 + VARCHAR(50)|0s - DATETIME|0s datetime('now', 'localtime') 6 + DATETIME|0s SessionID @@ -2010,26 +2010,26 @@ Date sqlite_autoindex_UserSessions_1 - INTEGER|0s 1 + INTEGER|0s - VARCHAR(200)|0s 2 + VARCHAR(200)|0s - INT|0s 1 3 + INT|0s - VARCHAR(200)|0s 4 + VARCHAR(200)|0s - DATETIME|0s datetime('now', 'localtime') 5 + DATETIME|0s ID @@ -2037,39 +2037,39 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 0 1 2 + INTEGER|0s - VARCHAR(200)|0s 1 3 + VARCHAR(200)|0s - VARCHAR(200)|0s 1 4 + VARCHAR(200)|0s - INTEGER|0s 255 5 + INTEGER|0s - INTEGER|0s 255 6 + INTEGER|0s - INTEGER|0s 0 7 + INTEGER|0s ID @@ -2077,28 +2077,28 @@ Date ID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - VARCHAR(100)|0s Unknown 3 + VARCHAR(100)|0s - VARCHAR(50)|0s Unknown 4 + VARCHAR(50)|0s - INTEGER|0s 5 5 + INTEGER|0s ID @@ -2106,29 +2106,29 @@ Date ID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 1 4 + INTEGER|0s - DATETIME|0s datetime('now','localtime') 5 + DATETIME|0s DeviceRowID @@ -2138,39 +2138,39 @@ Date DeviceRowID - BIGINT(10)|0s 1 1 + BIGINT(10)|0s - FLOAT|0s 1 2 + FLOAT|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 1 4 + INTEGER|0s - INTEGER|0s 1 5 + INTEGER|0s - INTEGER|0s 1 6 + INTEGER|0s - DATE|0s 1 7 + DATE|0s DeviceRowID @@ -2180,38 +2180,38 @@ Date DeviceRowID - INTEGER|0s 1 + INTEGER|0s - INTEGER|0s 1 2 + INTEGER|0s - INTEGER|0s 1 3 + INTEGER|0s - INTEGER|0s 1 4 + INTEGER|0s - VARCHAR(100)|0s Unknown 5 + VARCHAR(100)|0s - VARCHAR(100)|0s Unknown 6 + VARCHAR(100)|0s - INTEGER|0s 0 7 + INTEGER|0s ID @@ -2219,24 +2219,24 @@ Date ID - text|0s 1 + text|0s - text|0s 2 + text|0s - text|0s 3 + text|0s - int|0s 4 + int|0s - text|0s 5 + text|0s 1 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0ada1b8..d762050 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,19 +5,14 @@ - + - - - + - - - + - - + diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf index 36ce5bb..bc86454 100644 --- a/config/dnsmasq.conf +++ b/config/dnsmasq.conf @@ -20,25 +20,13 @@ address=/chambre.home.tortuga.enhydra.fr/192.168.13.64 address=/balcon.home.tortuga.enhydra.fr/192.168.13.64 address=/cour.home.tortuga.enhydra.fr/192.168.13.64 address=/bureausun.home.tortuga.enhydra.fr/192.168.13.64 -address=/cave.home.tortuga.enhydra.fr/192.168.13.64 -address=/kodidb.home.tortuga.enhydra.fr/192.168.13.64 -address=/kodi.home.tortuga.enhydra.fr/192.168.13.64 # Mediaserver address=/squeezebox.home.tortuga.enhydra.fr/192.168.13.67 -address=/plex.home.tortuga.enhydra.fr/192.168.13.66 # Backup address=/dockerbackup.home.tortuga.enhydra.fr/192.168.13.70 -# Servarr -address=/transmission.home.tortuga.enhydra.fr/192.168.13.9 -address=/servarr.home.tortuga.enhydra.fr/192.168.13.9 # Home Assistant address=/homeassistant.home.tortuga.enhydra.fr/192.168.13.8 address=/homeassistant.tortuga.enhydra.fr/192.168.13.8 # Cloud server address=/cloud.home.tortuga.enhydra.fr/192.168.13.6 -address=/piwigo.home.tortuga.enhydra.fr/192.168.13.6 -# Nextcloud -address=/nextcloud.home.tortuga.enhydra.fr/141.94.68.154 -address=/nextcloud.enhydra.fr/141.94.68.154 -address=/paperless.home.tortuga.enhydra.fr/141.94.68.154 -address=/paperless.enhydra.fr/141.94.68.154 +address=/piwigo.home.tortuga.enhydra.fr/192.168.13.6 \ No newline at end of file diff --git a/config/rooms.php b/config/rooms.php index b1e2f30..e495a85 100644 --- a/config/rooms.php +++ b/config/rooms.php @@ -82,6 +82,7 @@ function salon() ['type' => 'light', 'scene' => 'salon/auto', 'label' => 'Allumer'], ['type' => 'light', 'scene' => 'salon/off', 'label' => 'éteindre'], ['type' => 'light', 'scene' => 'salon/cinema', 'label' => 'cinéma'], + ['type' => 'light', 'scene' => 'salon/lumineux', 'label' => 'lumineux'], ]; if (!isSimpleMode()) { diff --git a/config/salon.php b/config/salon.php index 19a39cf..65974b9 100644 --- a/config/salon.php +++ b/config/salon.php @@ -23,6 +23,10 @@ if (DISPLAYINTERFACE) { ]; $favoriteslights = array_merge($favoriteslights, $c['favorites']); + if (isSimpleMode()) { + $favoriteslights = $c['favorites']; + } + include_once "remote.php"; include "default.php"; include ROOT . "/config/media.php"; diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php index 792cd70..95762e2 100644 --- a/scripts/lib/lib.php +++ b/scripts/lib/lib.php @@ -170,6 +170,9 @@ function shortcutDir($allshortcuts) $section .= '
'; } foreach ($shortcuts as $k => $s) { + if (!is_array($s)) { + continue; + } if ($s['type'] == 'clear' || $s['type'] == 'accordion' || $s['type'] == 'accordion-end') { if ($i % 2 == 1) { $section .= '
'; diff --git a/scripts/lib/simplemode.php b/scripts/lib/simplemode.php index 2d8444a..e97c524 100644 --- a/scripts/lib/simplemode.php +++ b/scripts/lib/simplemode.php @@ -2,5 +2,5 @@ function isSimpleMode() { - return true; + return false; } \ No newline at end of file