Index: www/domoticz/Makefile =================================================================== --- www/domoticz/Makefile +++ www/domoticz/Makefile @@ -1,6 +1,5 @@ PORTNAME= domoticz -PORTVERSION= 2020.2 -PORTREVISION= 2 +PORTVERSION= 2021.1 CATEGORIES= www MAINTAINER= kiwi@oav.net @@ -16,13 +15,14 @@ USES= cmake compiler:c++11-lang cpe pkgconfig ssl lua:53 sqlite OPTIONS_SUB= YES -OPTIONS_DEFINE= SMQTT PYTHON TELLDUS OPENZWAVE PRECOMP +OPTIONS_DEFINE= SMQTT PYTHON TELLDUS OPENZWAVE PRECOMP LIBFMT OPTIONS_DEFAULT= PYTHON PRECOMP SMQTT_DESC= Use domoticz Mosquitto instead of ports one PYTHON_DESC= Enable Python for Plugins and Event-Scripts TELLDUS_DESC= Enable Tellstick Telldus support OPENZWAVE_DESC= Enable OpenZWave support PRECOMP_DESC= Enable usage of precompiled header to speed build time +LIBFMT_DESC= Use domoticz libfmt instead of ports one .include @@ -30,7 +30,8 @@ # allow to build port with MQQT version recommended by the upstream # see https://github.com/domoticz/domoticz/tree/development/extern for the # specific release tag -GH_TUPLE= eclipse:mosquitto:22e0a4b:mosquitto/extern/mosquitto +GH_TUPLE= eclipse:mosquitto:22e0a4b:mosquitto/extern/mosquitto \ + fmtlib:fmt:a1c6bfd:fmtlib/extern/fmtlib USE_RC_SUBR= domoticz @@ -48,6 +49,13 @@ LIB_DEPENDS+= libmosquitto.so:net/mosquitto .endif +.if ${PORT_OPTIONS:MLIBFMT} +CMAKE_ON+= USE_BUILTIN_LIBFMT +.else +CMAKE_OFF+= USE_BUILTIN_LIBFMT +LIB_DEPENDS+= libfmt.so:devel/libfmt +.endif + .if ${PORT_OPTIONS:MPYTHON} CMAKE_ON+= USE_PYTHON USES+= python:3.7 Index: www/domoticz/distinfo =================================================================== --- www/domoticz/distinfo +++ www/domoticz/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1590483320 -SHA256 (domoticz-domoticz-2020.2_GH0.tar.gz) = a02f589daad4eebff1f5e93815c1acd1864cf068f8f5c3185bcdd20207ae395e -SIZE (domoticz-domoticz-2020.2_GH0.tar.gz) = 14588401 +TIMESTAMP = 1639044050 +SHA256 (domoticz-domoticz-2021.1_GH0.tar.gz) = c4dc3455edae8bf00d2e950002f70d5b90ac577b1559ef7ada6870d970069fbb +SIZE (domoticz-domoticz-2021.1_GH0.tar.gz) = 16531348 SHA256 (eclipse-mosquitto-22e0a4b_GH0.tar.gz) = b00ac0b59ad01f1fa8049a4dd2b526675ca9acd367436272678d22fe43358c27 SIZE (eclipse-mosquitto-22e0a4b_GH0.tar.gz) = 2042301 +SHA256 (fmtlib-fmt-a1c6bfd_GH0.tar.gz) = 4ab26f551da611f5fcf01fe7c7b1532bfec2a14809c13cfddcb619a00193efa6 +SIZE (fmtlib-fmt-a1c6bfd_GH0.tar.gz) = 778282 Index: www/domoticz/files/patch-main_mainworker.cpp =================================================================== --- www/domoticz/files/patch-main_mainworker.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- main/mainworker.cpp.orig 2020-04-26 13:49:25 UTC -+++ main/mainworker.cpp -@@ -125,7 +125,9 @@ - #include "../hardware/ZiBlueTCP.h" - #include "../hardware/Yeelight.h" - #include "../hardware/XiaomiGateway.h" -+#ifdef ENABLE_PYTHON - #include "../hardware/plugins/Plugins.h" -+#endif - #include "../hardware/Arilux.h" - #include "../hardware/OpenWebNetUSB.h" - #include "../hardware/InComfort.h" Index: www/domoticz/pkg-plist =================================================================== --- www/domoticz/pkg-plist +++ www/domoticz/pkg-plist @@ -1,6 +1,6 @@ -domoticz/updatedomo domoticz/Config/2gig/ct100.xml domoticz/Config/2gig/ct101.xml +domoticz/Config/2gig/ct200.xml domoticz/Config/2gig/ct30.xml domoticz/Config/2gig/ct32.xml domoticz/Config/2gig/ct50e.xml @@ -28,6 +28,7 @@ domoticz/Config/NotificationCCTypes.xsd domoticz/Config/SensorMultiLevelCCTypes.xml domoticz/Config/SensorMultiLevelCCTypes.xsd +domoticz/Config/abus/SHRM10000.xml domoticz/Config/act/lfm20.xml domoticz/Config/act/zdm230.xml domoticz/Config/act/zdp100.xml @@ -104,27 +105,37 @@ domoticz/Config/aeotec/zwa005.xml domoticz/Config/aeotec/zwa006.xml domoticz/Config/aeotec/zwa008.xml +domoticz/Config/aeotec/zwa009.xml +domoticz/Config/aeotec/zwa011.xml +domoticz/Config/aeotec/zwa012.xml +domoticz/Config/aeotec/zwa019.xml domoticz/Config/aeotec/zwa021.xml domoticz/Config/airlinemechanical/zds-ud10.xml domoticz/Config/alfred/DB2.xml domoticz/Config/assa_abloy/ConexisL1.xml domoticz/Config/assa_abloy/KeyfreeConnected-plus.xml domoticz/Config/assa_abloy/KeyfreeConnected.xml +domoticz/Config/assa_abloy/ProSLKey-FreeDeadbolt.xml domoticz/Config/assa_abloy/PushButtonDeadbolt.xml domoticz/Config/assa_abloy/PushButtonLever.xml domoticz/Config/assa_abloy/TouchDeadbolt.xml domoticz/Config/assa_abloy/TouchLever.xml domoticz/Config/assa_abloy/nexTouch.xml +domoticz/Config/assa_abloy/yrd1x0.xml +domoticz/Config/assa_abloy/yrm276.xml domoticz/Config/august/asl-03.xml domoticz/Config/buffalo/hw-100v15a-zw.xml +domoticz/Config/building36/b36-t10.xml domoticz/Config/comfort/ucm.xml domoticz/Config/config-template.xml +domoticz/Config/connecthome/ch-201.xml domoticz/Config/cooper/RF9501.xml domoticz/Config/cooper/RF9505-T.xml domoticz/Config/cooper/RF9505-T.xml.zip domoticz/Config/cooper/RF9517.xml domoticz/Config/cooper/RF9540-N.xml domoticz/Config/cooper/RF9542-Z.xml +domoticz/Config/cooper/RF9601.xml domoticz/Config/cooper/RFWC5.xml domoticz/Config/cooper/rf9534.xml domoticz/Config/danfoss/living.xml @@ -144,10 +155,14 @@ domoticz/Config/devolo/mt2652.xml domoticz/Config/devolo/mt2653.xml domoticz/Config/devolo/mt2756.xml +domoticz/Config/devolo/mt2759.xml +domoticz/Config/devolo/mt2760.xml +domoticz/Config/devolo/mt2761.xml domoticz/Config/devolo/rs014G0159.xml domoticz/Config/diehlcontrols/766366.xml domoticz/Config/dlink/dch-z110.xml domoticz/Config/dlink/dch-z120.xml +domoticz/Config/dlink/dch-z210.xml domoticz/Config/dlink/dch-z510.xml domoticz/Config/dome/0002.xml domoticz/Config/dome/0083.xml @@ -156,7 +171,9 @@ domoticz/Config/dome/0087.xml domoticz/Config/dome/0088.xml domoticz/Config/dome/0101.xml +domoticz/Config/dome/0104.xml domoticz/Config/dome/0201.xml +domoticz/Config/dome/dmex1.xml domoticz/Config/domitech/zb22uk.xml domoticz/Config/domitech/ze27eu.xml domoticz/Config/domux/DX1CA-Z.xml @@ -168,6 +185,8 @@ domoticz/Config/domux/DX1WL-Z.xml domoticz/Config/domux/DX2SK-Z.xml domoticz/Config/dragontech/wd-100.xml +domoticz/Config/duco/DucoBox.xml +domoticz/Config/duco/Ducotronic_CO-RH_sensor.xml domoticz/Config/duwi/05458.xml domoticz/Config/duwi/ZWES1000.xml domoticz/Config/duwi/ZWESJ300.xml @@ -175,12 +194,14 @@ domoticz/Config/duwi/zw-zdan-300.xml domoticz/Config/duwi/zwfb.xml domoticz/Config/duwi/zwws.xml +domoticz/Config/ecodim/0.7.xml domoticz/Config/ecolink/doorwindow.xml domoticz/Config/ecolink/firefighter.xml domoticz/Config/ecolink/floodfreeze.xml domoticz/Config/ecolink/motion.xml domoticz/Config/ecolink/sensor.xml domoticz/Config/ecolink/tiltsensor.xml +domoticz/Config/econet/ezw1204.xml domoticz/Config/electronicsolutions/dbmz.xml domoticz/Config/enblink/ss201-us-w_1308.xml domoticz/Config/enerwave/zw15rmplus.xml @@ -192,9 +213,11 @@ domoticz/Config/enerwave/zwn-sc7.xml domoticz/Config/enerwave/zwnrsm1plus.xml domoticz/Config/enerwave/zwnrsm2plus.xml +domoticz/Config/eurotronic/eur_airquality.xml domoticz/Config/eurotronic/eur_cometz.xml domoticz/Config/eurotronic/eur_spiritz.xml domoticz/Config/eurotronic/eur_stellaz.xml +domoticz/Config/eurotronic/eur_temphumin.xml domoticz/Config/everspring/ad146.xml domoticz/Config/everspring/ad147.xml domoticz/Config/everspring/an145.xml @@ -225,7 +248,10 @@ domoticz/Config/evolve/lrm-as.xml domoticz/Config/evolve/lsm-15.xml domoticz/Config/evolve/ltm-5.xml +domoticz/Config/evolve/t-100.xml domoticz/Config/fakro/arz.xml +domoticz/Config/fakro/arzsolar.xml +domoticz/Config/fakro/zrh12.xml domoticz/Config/fakro/zwp10.xml domoticz/Config/fakro/zwrs.xml domoticz/Config/fakro/zws12.xml @@ -247,28 +273,36 @@ domoticz/Config/fibaro/fgpb101.xml domoticz/Config/fibaro/fgr221.xml domoticz/Config/fibaro/fgr223.xml +domoticz/Config/fibaro/fgrgbw442.xml domoticz/Config/fibaro/fgrgbwm441.xml domoticz/Config/fibaro/fgrm222.xml domoticz/Config/fibaro/fgs211.xml domoticz/Config/fibaro/fgs212.xml domoticz/Config/fibaro/fgs213.xml +domoticz/Config/fibaro/fgs214.xml domoticz/Config/fibaro/fgs221.xml domoticz/Config/fibaro/fgs222.xml domoticz/Config/fibaro/fgs223.xml +domoticz/Config/fibaro/fgs224.xml domoticz/Config/fibaro/fgsd002.xml domoticz/Config/fibaro/fgss101.xml domoticz/Config/fibaro/fgt001.xml domoticz/Config/fibaro/fgwd111.xml domoticz/Config/fibaro/fgwds221.xml +domoticz/Config/fibaro/fgwds221ss.xml domoticz/Config/fibaro/fgwoe.xml +domoticz/Config/fibaro/fgwpb121.xml domoticz/Config/fibaro/fgwpe.xml domoticz/Config/fibaro/fgwpfzw5.xml domoticz/Config/fibaro/fgwpg111.xml domoticz/Config/fibaro/fgwr111.xml +domoticz/Config/firstalert/zcombo-g.xml domoticz/Config/firstalert/zcombo.xml +domoticz/Config/firstalert/zsmoke.xml domoticz/Config/followgood/swz-1002.xml domoticz/Config/forest/fs2z5232000002.xml domoticz/Config/fortrezz/fmi.xml +domoticz/Config/fortrezz/fts05p.xml domoticz/Config/fortrezz/gdc1_fortrezz_1501.xml domoticz/Config/fortrezz/mimo2plus.xml domoticz/Config/fortrezz/mimolite.xml @@ -280,22 +314,30 @@ domoticz/Config/frostdale/fdn2311.xml domoticz/Config/frostdale/fdn2nxx.xml domoticz/Config/ge/12719-plugin-switch.xml +domoticz/Config/ge/12720.xml domoticz/Config/ge/12724-dimmer.xml domoticz/Config/ge/12727.xml +domoticz/Config/ge/14280-plugin-dimmer.xml domoticz/Config/ge/14282-plugin-switch.xml domoticz/Config/ge/14284.xml +domoticz/Config/ge/14285.xml domoticz/Config/ge/14288-outlet.xml domoticz/Config/ge/14291-switch.xml domoticz/Config/ge/14292-toggle-switch.xml domoticz/Config/ge/14294-dimmer.xml domoticz/Config/ge/14295-dimmer-toggle.xml +domoticz/Config/ge/14298.xml +domoticz/Config/ge/14322-dimmer-toggle.xml domoticz/Config/ge/26931-motion-switch.xml +domoticz/Config/ge/26932-motion-dimmer.xml domoticz/Config/ge/26933-motion-dimmer.xml domoticz/Config/ge/28167-plugin-dimmer.xml domoticz/Config/ge/28169-plugin-switch.xml domoticz/Config/ge/45604.xml domoticz/Config/ge/46201-switch.xml +domoticz/Config/ge/46202-switch.xml domoticz/Config/ge/46203-dimmer.xml +domoticz/Config/ge/46204-dimmer-toggle.xml domoticz/Config/ge/dimmer.xml domoticz/Config/ge/dimmer_module.xml domoticz/Config/ge/hinge-pin.xml @@ -305,18 +347,22 @@ domoticz/Config/ge/zw4001-switch.xml domoticz/Config/ge/zw6302.xml domoticz/Config/gocontrol/GC-TBZ48L.xml +domoticz/Config/goodway/td14010.xml domoticz/Config/gr/gr-302n.xml domoticz/Config/gr/gr105.xml domoticz/Config/gr/gr105n.xml domoticz/Config/gr/grb3.xml domoticz/Config/graber/brz1.xml domoticz/Config/graber/csz1.xml +domoticz/Config/graber/mcz1.xml domoticz/Config/graber/rsz1.xml domoticz/Config/graber/vcz1.xml domoticz/Config/greenwave/gs1110-1-gr-1.xml domoticz/Config/greenwave/powernode1.xml domoticz/Config/greenwave/powernode6.xml domoticz/Config/guardtec/gkw2000d.xml +domoticz/Config/hab/iblindsV2.xml +domoticz/Config/hab/iblindsV3.xml domoticz/Config/hank/hkzw-dws01.xml domoticz/Config/hank/hkzw-fld01.xml domoticz/Config/hank/hkzw-ms01.xml @@ -337,6 +383,8 @@ domoticz/Config/heiman/HS1WL-Z.xml domoticz/Config/heiman/HS2SK-Z.xml domoticz/Config/heiman/HS2WD-Z.xml +domoticz/Config/heltun/he-ft01.xml +domoticz/Config/heltun/he-ht01.xml domoticz/Config/heltun/he-zw-sw-5a-1.xml domoticz/Config/heltun/he-zw-therm-fc1.xml domoticz/Config/heltun/he-zw-therm-fl2.xml @@ -354,8 +402,16 @@ domoticz/Config/homeseer/hsm100.xml domoticz/Config/homeseer/hsm200.xml domoticz/Config/homeseer/ztroller.xml +domoticz/Config/honeywell/2681-plugin-dimmer.xml +domoticz/Config/honeywell/3830-zw3107.xml +domoticz/Config/honeywell/39348-ZW4005.xml domoticz/Config/honeywell/39348-zw4008.xml +domoticz/Config/honeywell/39349-ZW1002.xml domoticz/Config/honeywell/39351-ZW3005.xml +domoticz/Config/honeywell/39351-ZW3010.xml +domoticz/Config/honeywell/39357-ZW3004.xml +domoticz/Config/honeywell/39358-ZW4002.xml +domoticz/Config/honeywell/39449-ZW4106.xml domoticz/Config/honeywell/lynx-touch-l5100.xml domoticz/Config/honeywell/th6320zw2003.xml domoticz/Config/honeywell/th8320zw1000.xml @@ -376,6 +432,14 @@ domoticz/Config/ingersoll/dwzwave1.xml domoticz/Config/inovelli/lzw30-sn.xml domoticz/Config/inovelli/lzw30.xml +domoticz/Config/inovelli/lzw31-sn.xml +domoticz/Config/inovelli/lzw31.xml +domoticz/Config/inovelli/lzw36.xml +domoticz/Config/inovelli/lzw40.xml +domoticz/Config/inovelli/lzw41.xml +domoticz/Config/inovelli/lzw42.xml +domoticz/Config/inovelli/lzw45.xml +domoticz/Config/inovelli/lzw60.xml domoticz/Config/inovelli/nzw1201.xml domoticz/Config/inovelli/nzw30.xml domoticz/Config/inovelli/nzw31.xml @@ -392,10 +456,14 @@ domoticz/Config/jasco/45601.xml domoticz/Config/kaipule/im20.xml domoticz/Config/kaipule/ix32.xml +domoticz/Config/kwikset/888.xml +domoticz/Config/kwikset/910.xml domoticz/Config/kwikset/914c.xml +domoticz/Config/kwikset/916.xml domoticz/Config/kwikset/smartcode.xml domoticz/Config/leviton/dz15s.xml domoticz/Config/leviton/dz6hd.xml +domoticz/Config/leviton/dzpa1.xml domoticz/Config/leviton/dzpd3.xml domoticz/Config/leviton/rzi10.xml domoticz/Config/leviton/vrcpg.xml @@ -405,7 +473,11 @@ domoticz/Config/leviton/vrf01.xml domoticz/Config/leviton/vri06.xml domoticz/Config/leviton/vri10.xml +domoticz/Config/leviton/vrpa1.xml +domoticz/Config/leviton/vrpd3.xml domoticz/Config/leviton/vrs15.xml +domoticz/Config/leviton/zw15r.xml +domoticz/Config/leviton/zw4sf.xml domoticz/Config/linear/GC-TBZ48.xml domoticz/Config/linear/LB60Z-1.xml domoticz/Config/linear/PD300Z-2.xml @@ -417,19 +489,25 @@ domoticz/Config/linear/WD500Z5-1.xml domoticz/Config/linear/WS15Z-1.xml domoticz/Config/linear/WT00Z-1.xml +domoticz/Config/linear/WT00Z5-1.xml domoticz/Config/linear/gd00z-7.xml domoticz/Config/linear/ngd00z.xml +domoticz/Config/logicsoft/ZDB5100.xml domoticz/Config/logicsoft/ZHC5002.xml domoticz/Config/logicsoft/ZHC5010.xml domoticz/Config/manufacturer_specific.xml domoticz/Config/manufacturer_specific.xsd domoticz/Config/mcohome/a8-9.xml +domoticz/Config/mcohome/mh10pm25wd.xml domoticz/Config/mcohome/mh7h.xml domoticz/Config/mcohome/mh8fceu.xml +domoticz/Config/mcohome/mh8fceu0803.xml domoticz/Config/mcohome/mh9co2.xml +domoticz/Config/mcohome/mhdt411.xml domoticz/Config/mcohome/mhp210.xml domoticz/Config/mcohome/mhp220.xml domoticz/Config/mcohome/mhp511.xml +domoticz/Config/mcohome/mhs220.xml domoticz/Config/mcohome/mhs311.xml domoticz/Config/mcohome/mhs312.xml domoticz/Config/mcohome/mhs314.xml @@ -443,7 +521,16 @@ domoticz/Config/merten/508244.xml domoticz/Config/merten/50x5xx.xml domoticz/Config/miyakawaelectric/me-d101.xml +domoticz/Config/namron/1402756.xml +domoticz/Config/namron/4512710.xml +domoticz/Config/namron/4512712.xml +domoticz/Config/namron/4512714.xml +domoticz/Config/namron/4512715.xml +domoticz/Config/namron/4512720.xml +domoticz/Config/namron/4512724.xml +domoticz/Config/nei/ms11z.xml domoticz/Config/nexia/db100z.xml +domoticz/Config/nexia/th100nx.xml domoticz/Config/nodon/asp3100SmartPlug.xml domoticz/Config/nodon/crc3100OctanRemote.xml domoticz/Config/nodon/crc360xSofremote.xml @@ -454,6 +541,8 @@ domoticz/Config/northq/nq92021.xml domoticz/Config/oomi/ft100.xml domoticz/Config/oomi/ft111.xml +domoticz/Config/oomi/ft112.xml +domoticz/Config/oomi/ft118.xml domoticz/Config/options.xml domoticz/Config/options.xsd domoticz/Config/permundo/psc132zw.xml @@ -494,15 +583,21 @@ domoticz/Config/popp/123658.xml domoticz/Config/popp/700045.xml domoticz/Config/popp/700168.xml +domoticz/Config/popp/700342.xml domoticz/Config/popp/700397.xml domoticz/Config/popp/700793.xml +domoticz/Config/popp/701202.xml domoticz/Config/popp/dwt.xml domoticz/Config/popp/smoke-detector.xml domoticz/Config/popp/solar-siren.xml domoticz/Config/popp/zweather.xml domoticz/Config/prowell/zw-702.xml +domoticz/Config/q-light/q-light_puck.xml +domoticz/Config/q-light/q-light_zerodim.xml +domoticz/Config/q-light/q-light_zerodim_2pol.xml domoticz/Config/qees/reto-dimmer-plus.xml domoticz/Config/qees/reto-plugin-switch.xml +domoticz/Config/qolsys/qz2140-840.xml domoticz/Config/qubino/ZMNHAA2.xml domoticz/Config/qubino/ZMNHADx.xml domoticz/Config/qubino/ZMNHBA2.xml @@ -520,6 +615,7 @@ domoticz/Config/qubino/ZMNHKDx.xml domoticz/Config/qubino/ZMNHLAx.xml domoticz/Config/qubino/ZMNHLDx.xml +domoticz/Config/qubino/ZMNHMDx.xml domoticz/Config/qubino/ZMNHNDx.xml domoticz/Config/qubino/ZMNHODx.xml domoticz/Config/qubino/ZMNHQDx.xml @@ -532,6 +628,7 @@ domoticz/Config/qubino/ZMNHXDx.xml domoticz/Config/qubino/ZMNHYDx.xml domoticz/Config/qubino/ZMNHZDx.xml +domoticz/Config/qubino/ZMNKADx.xml domoticz/Config/qubino/ZMNKIDx.xml domoticz/Config/quby/qb2.xml domoticz/Config/rcs/em52-zw.xml @@ -549,6 +646,9 @@ domoticz/Config/remotec/zxt-120.xml domoticz/Config/remotec/zxt-310.xml domoticz/Config/remotec/zxt-600.xml +domoticz/Config/ring/PIR-SS.xml +domoticz/Config/ring/contact-sensor-v2.xml +domoticz/Config/ring/motion-detector-v2.xml domoticz/Config/schlage/BE468.xml domoticz/Config/schlage/BE468ZP.xml domoticz/Config/schlage/BE469.xml @@ -562,16 +662,23 @@ domoticz/Config/sercomm/sw-clp01-eu.xml domoticz/Config/shenzen_neo/ls01ch.xml domoticz/Config/shenzen_neo/ls02ch.xml +domoticz/Config/shenzen_neo/ls03ch.xml domoticz/Config/shenzen_neo/nas-ab01z.xml +domoticz/Config/shenzen_neo/nas-cs01z.xml domoticz/Config/shenzen_neo/nas-ds01z.xml domoticz/Config/shenzen_neo/nas-pd01z.xml domoticz/Config/shenzen_neo/nas-pd02z.xml +domoticz/Config/shenzen_neo/nas-pd03z.xml domoticz/Config/shenzen_neo/nas-rc01z.xml +domoticz/Config/shenzen_neo/nas-sc03ze.xml domoticz/Config/shenzen_neo/nas-wr01z.xml domoticz/Config/shenzen_neo/nas-wr01ze.xml domoticz/Config/shenzen_neo/nas-ws02z.xml +domoticz/Config/shenzen_saykey/sk-3007-05.xml +domoticz/Config/simon/10002020-13X.xml domoticz/Config/simon/10002034-13X.xml domoticz/Config/simon/10002041-13X.xml +domoticz/Config/simon/10002080-13X.xml domoticz/Config/smartthings/pgc401m.xml domoticz/Config/smartthings/sth-eth200.xml domoticz/Config/somfy/1811265_ZRTSI.xml @@ -580,19 +687,39 @@ domoticz/Config/steinel/rs-led-d2.xml domoticz/Config/steinel/xled-home-2.xml domoticz/Config/stelpro/stzw402.xml +domoticz/Config/sunricher/srzv9001k12dimz4.xml +domoticz/Config/sunricher/srzv9001k12dimz5.xml +domoticz/Config/sunricher/srzv9001k2dim.xml +domoticz/Config/sunricher/srzv9001k4dim.xml +domoticz/Config/sunricher/srzv9001k4dimg2.xml domoticz/Config/sunricher/srzv9001k8.xml domoticz/Config/sunricher/srzv9001t4dimeu.xml +domoticz/Config/sunricher/srzv9001tccteu.xml domoticz/Config/sunricher/srzv9003t4rgbweu.xml +domoticz/Config/sunricher/srzv9100aa.xml domoticz/Config/sunricher/srzv9101sachpeu.xml +domoticz/Config/sunricher/srzv9101sachpswitch.xml +domoticz/Config/sunricher/zv2835rac.xml domoticz/Config/sunricher/zv9101.xml +domoticz/Config/sunricher/zv9101fa.xml domoticz/Config/swiid/swiidinter.xml domoticz/Config/swiid/swiidplug.xml +domoticz/Config/technisat/03009496.xml +domoticz/Config/technisat/03009497.xml +domoticz/Config/technisat/03009499.xml domoticz/Config/telldus/TZWP102.xml domoticz/Config/telldus/tzdw100.xml domoticz/Config/telldus/tzwp100.xml domoticz/Config/there/800z.xml +domoticz/Config/thermofloor/heatit-zdim.xml +domoticz/Config/thermofloor/heatit021-v1.92.xml domoticz/Config/thermofloor/heatit021.xml domoticz/Config/thermofloor/heatit056.xml +domoticz/Config/thermofloor/heatit058.xml +domoticz/Config/thermofloor/heatit204.xml +domoticz/Config/thermofloor/heatit20a.xml +domoticz/Config/thermofloor/heatitz4.xml +domoticz/Config/thermofloor/heatitz8.xml domoticz/Config/trane/TZEMT400AB32MAA.xml domoticz/Config/trane/TZEMT400BB32MAA.xml domoticz/Config/trane/TZEMT524AA21MA.xml @@ -642,32 +769,54 @@ domoticz/Config/wenzhou/tz68.xml domoticz/Config/wenzhou/tz69.xml domoticz/Config/wenzhou/tz74.xml +domoticz/Config/wenzhou/tz77.xml +domoticz/Config/wenzhou/tz78.xml domoticz/Config/wenzhou/tz79.xml domoticz/Config/wenzhou/tz88.xml +domoticz/Config/wenzhou/tze96.xml domoticz/Config/widom/DRY.xml domoticz/Config/widom/UBS104.xml domoticz/Config/widom/UME304C_S.xml +domoticz/Config/widom/UMS2.xml domoticz/Config/widom/WDS.xml +domoticz/Config/widom/WDS2.xml +domoticz/Config/widom/WSP.xml +domoticz/Config/widom/WTED.xml +domoticz/Config/wink/wnk-mot1.xml +domoticz/Config/wink/wnk-sir1p.xml domoticz/Config/zipato/MiniKeypad.xml domoticz/Config/zipato/RGBBulb.xml domoticz/Config/zipato/RGBBulb2.xml +domoticz/Config/zipato/ne-nas-ab02z.xml domoticz/Config/zipato/pan04.xml domoticz/Config/zipato/vszd2102.xml domoticz/Config/zipato/zp3102.xml domoticz/Config/zooz/zen06.xml domoticz/Config/zooz/zen07.xml domoticz/Config/zooz/zen15.xml +domoticz/Config/zooz/zen16.xml +domoticz/Config/zooz/zen17.xml domoticz/Config/zooz/zen20.xml domoticz/Config/zooz/zen20v2.xml domoticz/Config/zooz/zen21.xml -domoticz/Config/zooz/zen21v2.xml +domoticz/Config/zooz/zen21v3.xml domoticz/Config/zooz/zen22.xml domoticz/Config/zooz/zen22v2.xml domoticz/Config/zooz/zen23.xml +domoticz/Config/zooz/zen23v3.xml domoticz/Config/zooz/zen24.xml +domoticz/Config/zooz/zen24v2.xml domoticz/Config/zooz/zen25.xml domoticz/Config/zooz/zen26.xml domoticz/Config/zooz/zen27.xml +domoticz/Config/zooz/zen30.xml +domoticz/Config/zooz/zen31.xml +domoticz/Config/zooz/zen32.xml +domoticz/Config/zooz/zen34.xml +domoticz/Config/zooz/zen71.xml +domoticz/Config/zooz/zen72.xml +domoticz/Config/zooz/zen76.xml +domoticz/Config/zooz/zen77.xml domoticz/Config/zooz/zse08.xml domoticz/Config/zooz/zse09.xml domoticz/Config/zooz/zse18.xml @@ -691,40 +840,13 @@ domoticz/Config/zwave.me/iTemp.xml domoticz/Config/zwave.me/kfob.xml domoticz/Config/zwave.me/popp_kfob-c.xml +domoticz/Config/zwave.me/razberry.xml domoticz/Config/zwave.me/zme_raz5.xml domoticz/Config/zwave.me/zweather.xml domoticz/Config/zwcfg.xsd domoticz/Config/zwp/PA-100.xml domoticz/Config/zwp/WD-100.xml domoticz/Config/zwscene.xsd -domoticz/Config/eurotronic/eur_airquality.xml -domoticz/Config/eurotronic/eur_temphumin.xml -domoticz/Config/fortrezz/fts05p.xml -domoticz/Config/heltun/he-ft01.xml -domoticz/Config/heltun/he-ht01.xml -domoticz/Config/honeywell/39348-ZW4005.xml -domoticz/Config/honeywell/39351-ZW3010.xml -domoticz/Config/honeywell/39357-ZW3004.xml -domoticz/Config/inovelli/lzw31-sn.xml -domoticz/Config/inovelli/lzw31.xml -domoticz/Config/inovelli/lzw40.xml -domoticz/Config/inovelli/lzw41.xml -domoticz/Config/inovelli/lzw42.xml -domoticz/Config/logicsoft/ZDB5100.xml -domoticz/Config/popp/700342.xml -domoticz/Config/popp/701202.xml -domoticz/Config/qubino/ZMNKADx.xml -domoticz/Config/thermofloor/heatit-zdim.xml -domoticz/Config/thermofloor/heatitz8.xml -domoticz/Config/wenzhou/tz78.xml -domoticz/Config/widom/UMS2.xml -domoticz/Config/widom/WDS2.xml -domoticz/Config/widom/WSP.xml -domoticz/Config/widom/WTED.xml -domoticz/Config/zipato/ne-nas-ab02z.xml -domoticz/Config/zooz/zen16.xml -domoticz/Config/zooz/zen30.xml -domoticz/Config/zooz/zen31.xml domoticz/History.txt domoticz/License.txt domoticz/domoticz @@ -733,6 +855,7 @@ domoticz/dzVents/documentation/README.wiki domoticz/dzVents/documentation/dzvents-smoothing.png domoticz/dzVents/documentation/history.md +domoticz/dzVents/documentation/history.wiki domoticz/dzVents/documentation/pandoc.md domoticz/dzVents/runtime/Camera.lua domoticz/dzVents/runtime/CustomEvent.lua @@ -741,7 +864,9 @@ domoticz/dzVents/runtime/EventHelpers.lua domoticz/dzVents/runtime/HTTPResponse.lua domoticz/dzVents/runtime/HistoricalStorage.lua +domoticz/dzVents/runtime/JSON.lua domoticz/dzVents/runtime/Security.lua +domoticz/dzVents/runtime/ShellCommandResponse.lua domoticz/dzVents/runtime/SystemEvent.lua domoticz/dzVents/runtime/Time.lua domoticz/dzVents/runtime/TimedCommand.lua @@ -749,6 +874,7 @@ domoticz/dzVents/runtime/Timer.lua domoticz/dzVents/runtime/Utils.lua domoticz/dzVents/runtime/Variable.lua +domoticz/dzVents/runtime/XmlParser.lua domoticz/dzVents/runtime/constants.lua domoticz/dzVents/runtime/device-adapters/Adapters.lua domoticz/dzVents/runtime/device-adapters/airquality_device.lua @@ -764,6 +890,7 @@ domoticz/dzVents/runtime/device-adapters/gas_device.lua domoticz/dzVents/runtime/device-adapters/generic_device.lua domoticz/dzVents/runtime/device-adapters/group_device.lua +domoticz/dzVents/runtime/device-adapters/hardware_device.lua domoticz/dzVents/runtime/device-adapters/humidity_device.lua domoticz/dzVents/runtime/device-adapters/kodi_device.lua domoticz/dzVents/runtime/device-adapters/kwh_device.lua @@ -790,7 +917,9 @@ domoticz/dzVents/runtime/device-adapters/temperature_humidity_barometer_device.lua domoticz/dzVents/runtime/device-adapters/temperature_humidity_device.lua domoticz/dzVents/runtime/device-adapters/text_device.lua +domoticz/dzVents/runtime/device-adapters/thermostat_operating_state_device.lua domoticz/dzVents/runtime/device-adapters/thermostat_setpoint_device.lua +domoticz/dzVents/runtime/device-adapters/thermostat_type_3_device.lua domoticz/dzVents/runtime/device-adapters/uv_device.lua domoticz/dzVents/runtime/device-adapters/visibility_device.lua domoticz/dzVents/runtime/device-adapters/voltage_device.lua @@ -905,6 +1034,10 @@ domoticz/dzVents/runtime/tests/testfile domoticz/dzVents/runtime/tests/tstData.lua domoticz/dzVents/runtime/todo.md +domoticz/dzVents/runtime/xml2lua.lua +domoticz/dzVents/runtime/xmlhandler/dom.lua +domoticz/dzVents/runtime/xmlhandler/print.lua +domoticz/dzVents/runtime/xmlhandler/tree.lua domoticz/plugins/AwoxSMP/lib/__init__.py domoticz/plugins/AwoxSMP/lib/pySmartPlugSmpB16.py domoticz/plugins/AwoxSMP/plugin.py @@ -945,30 +1078,13 @@ domoticz/scripts/dzVents/examples/schedule fish pond pump.lua domoticz/scripts/dzVents/examples/simple room heating with hysteresis control.lua domoticz/scripts/dzVents/examples/sunscreen.lua -domoticz/scripts/dzVents/examples/templates/HTTPRequest.lua -domoticz/scripts/dzVents/examples/templates/global_data.lua -domoticz/scripts/dzVents/examples/templates/All.lua -domoticz/scripts/dzVents/examples/templates/Bare.lua -domoticz/scripts/dzVents/examples/templates/CustomEvents.lua -domoticz/scripts/dzVents/examples/templates/Device.lua -domoticz/scripts/dzVents/examples/templates/Group.lua -domoticz/scripts/dzVents/examples/templates/Scene.lua -domoticz/scripts/dzVents/examples/templates/Security.lua -domoticz/scripts/dzVents/examples/templates/System.lua -domoticz/scripts/dzVents/examples/templates/Timer.lua -domoticz/scripts/dzVents/examples/templates/UserVariable.lua domoticz/scripts/dzVents/generated_scripts/README.md domoticz/scripts/dzVents/scripts/README.md domoticz/scripts/install.sh domoticz/scripts/logrotate/domoticz domoticz/scripts/lua/JSON.lua -domoticz/scripts/lua/XmlParser.lua domoticz/scripts/lua/script_device_demo.lua domoticz/scripts/lua/script_time_demo.lua -domoticz/scripts/lua/xml2lua.lua -domoticz/scripts/lua/xmlhandler/dom.lua -domoticz/scripts/lua/xmlhandler/print.lua -domoticz/scripts/lua/xmlhandler/tree.lua domoticz/scripts/lua_parsers/example.lua domoticz/scripts/lua_parsers/example_json.lua domoticz/scripts/lua_parsers/example_owm.lua @@ -987,6 +1103,7 @@ domoticz/scripts/templates/CustomEvents.dzVents domoticz/scripts/templates/Device.Lua domoticz/scripts/templates/Device.dzVents +domoticz/scripts/templates/ExecuteShellCommand.dzVents domoticz/scripts/templates/Group.dzVents domoticz/scripts/templates/HTTPRequest.dzVents domoticz/scripts/templates/Scene.dzVents @@ -1000,6 +1117,7 @@ domoticz/scripts/templates/global_data.dzVents domoticz/scripts/update_domoticz domoticz/server_cert.pem +domoticz/updatedomo domoticz/www/app/AboutController.js domoticz/www/app/CamController.js domoticz/www/app/CustomIconsController.js @@ -1078,18 +1196,37 @@ domoticz/www/app/hardware/setup/ZWave.html domoticz/www/app/hardware/setup/ZWave.js domoticz/www/app/livesocket.js -domoticz/www/app/log/GraphLog.html -domoticz/www/app/log/TemperatureLog.html +domoticz/www/app/log/AngularBase.js +domoticz/www/app/log/Base.js +domoticz/www/app/log/Chart.js +domoticz/www/app/log/ChartLoader.js +domoticz/www/app/log/ChartZoomer.js +domoticz/www/app/log/CounterLog.html +domoticz/www/app/log/CounterLog.js +domoticz/www/app/log/CounterLogEnergySeriesSuppliers.js +domoticz/www/app/log/CounterLogInstantAndCounter.js +domoticz/www/app/log/CounterLogP1Energy.js +domoticz/www/app/log/CounterLogParams.js +domoticz/www/app/log/CounterLogSeriesSupplier.js +domoticz/www/app/log/DataLoader.js domoticz/www/app/log/DeviceLog.html domoticz/www/app/log/DeviceLog.js +domoticz/www/app/log/DomoticzBase.js +domoticz/www/app/log/GraphLog.html domoticz/www/app/log/GraphLog.js domoticz/www/app/log/LightLog.html domoticz/www/app/log/LightLog.js +domoticz/www/app/log/RefreshingChart.js domoticz/www/app/log/SceneLog.html domoticz/www/app/log/SceneLog.js +domoticz/www/app/log/TemperatureLog.html domoticz/www/app/log/TemperatureLog.js domoticz/www/app/log/TextLog.html domoticz/www/app/log/TextLog.js +domoticz/www/app/log/chart-day.html +domoticz/www/app/log/chart-month.html +domoticz/www/app/log/chart-week.html +domoticz/www/app/log/chart-year.html domoticz/www/app/log/components/DeviceLevelChart.js domoticz/www/app/log/components/DeviceOnOffChart.js domoticz/www/app/log/components/DeviceTextLogTable.js @@ -1171,6 +1308,7 @@ domoticz/www/css/ui-darkness/images/ui-icons_cccccc_256x240.png domoticz/www/css/ui-darkness/images/ui-icons_ffffff_256x240.png domoticz/www/css/ui-darkness/jquery-ui.min.css +domoticz/www/css/ui-grid.min.css domoticz/www/css/wheelcolorpicker.css domoticz/www/favicon.ico domoticz/www/html5.appcache @@ -1398,6 +1536,8 @@ domoticz/www/images/evohome/CustomInv.png domoticz/www/images/evohome/DayOff.png domoticz/www/images/evohome/DayOffInv.png +domoticz/www/images/evohome/DayOffWithEco.png +domoticz/www/images/evohome/DayOffWithEcoInv.png domoticz/www/images/evohome/HeatingOff.png domoticz/www/images/evohome/HeatingOffInv.png domoticz/www/images/evohome/Off.png @@ -1419,9 +1559,12 @@ domoticz/www/images/forward_enabled_hover.png domoticz/www/images/gauge.png domoticz/www/images/gauge48.png +domoticz/www/images/gdown.png domoticz/www/images/general.png +domoticz/www/images/gequal.png domoticz/www/images/glyphicons-halflings-white.png domoticz/www/images/glyphicons-halflings.png +domoticz/www/images/gup.png domoticz/www/images/handle.png domoticz/www/images/hardware.png domoticz/www/images/heal.png @@ -1622,14 +1765,19 @@ domoticz/www/js/ace/theme-xcode.js domoticz/www/js/ace/worker-lua.js.gz domoticz/www/js/angular-animate.min.js.gz -domoticz/www/js/angular-md5-min.js.gz +domoticz/www/js/angular-animate.min.js.map.gz +domoticz/www/js/angular-md5.min.js.gz +domoticz/www/js/angular-md5.min.js.map.gz domoticz/www/js/angular-round-progress-directive.js.gz domoticz/www/js/angular-route.min.js.gz +domoticz/www/js/angular-route.min.js.map.gz domoticz/www/js/angular-sanitize.min.js.gz +domoticz/www/js/angular-sanitize.min.js.map.gz domoticz/www/js/angular-scrollglue.js.gz domoticz/www/js/angular-tree-control.js.gz domoticz/www/js/angular-websocket.js.gz domoticz/www/js/angular.min.js.gz +domoticz/www/js/angular.min.js.map.gz domoticz/www/js/angularAMD.min.js.gz domoticz/www/js/babel-polyfill-6.26.0.js.gz domoticz/www/js/base64.min.js.gz @@ -1645,18 +1793,29 @@ domoticz/www/js/date.format.js.gz domoticz/www/js/domoticz.js domoticz/www/js/domoticzdevices.js -domoticz/www/js/export-csv.js.gz domoticz/www/js/highcharts-ng.min.js.gz +domoticz/www/js/highcharts/highcharts-8.2.2-patch.9612.src.js domoticz/www/js/highcharts/highcharts-more.js +domoticz/www/js/highcharts/highcharts-more.js.map +domoticz/www/js/highcharts/highcharts-more.src.js domoticz/www/js/highcharts/highcharts.js +domoticz/www/js/highcharts/highcharts.js.map +domoticz/www/js/highcharts/highcharts.src.js domoticz/www/js/highcharts/modules/dependency-wheel.js +domoticz/www/js/highcharts/modules/dependency-wheel.js.map +domoticz/www/js/highcharts/modules/export-data.js +domoticz/www/js/highcharts/modules/export-data.js.map domoticz/www/js/highcharts/modules/exporting.js +domoticz/www/js/highcharts/modules/exporting.js.map domoticz/www/js/highcharts/modules/sankey.js +domoticz/www/js/highcharts/modules/sankey.js.map domoticz/www/js/highcharts/modules/xrange.js +domoticz/www/js/highcharts/modules/xrange.js.map domoticz/www/js/highcharts/themes/dark-unica.js +domoticz/www/js/highcharts/themes/dark-unica.js.map domoticz/www/js/html5shiv.js.gz domoticz/www/js/i18next-1.8.0.min.js.gz -domoticz/www/js/jquery-3.4.1.min.js.gz +domoticz/www/js/jquery-3.5.1.min.js.gz domoticz/www/js/jquery-ui-timepicker-addon.js.gz domoticz/www/js/jquery-ui.min.js.gz domoticz/www/js/jquery.ddslick.min.js.gz @@ -1665,18 +1824,21 @@ domoticz/www/js/jquery.ui.touch-punch.min.js.gz domoticz/www/js/jquery.uix.multiselect.min.js.gz domoticz/www/js/jquery.wheelcolorpicker.js.gz +domoticz/www/js/lodash-custom.merge.js +domoticz/www/js/lodash-custom.merge.min.js.gz domoticz/www/js/luxon.min.js domoticz/www/js/md5.js.gz -domoticz/www/js/ng-grid-flexible-height.js.gz -domoticz/www/js/ng-grid.min.js.gz +domoticz/www/js/moment-timezone-with-data.min.js.gz +domoticz/www/js/moment-with-locales.min.js.gz domoticz/www/js/ngDraggable.js.gz domoticz/www/js/ngload.min.js.gz domoticz/www/js/noty/noty.css domoticz/www/js/noty/noty.min.js.gz domoticz/www/js/noty/relax.css -domoticz/www/js/require.js.gz +domoticz/www/js/require.min.js.gz domoticz/www/js/respond.min.js.gz domoticz/www/js/ui-bootstrap.min.js.gz +domoticz/www/js/ui-grid.min.js.gz domoticz/www/js/wow.min.js.gz domoticz/www/media/1x1.gif domoticz/www/media/click.mp3 @@ -1724,6 +1886,7 @@ domoticz/www/secpanel/media/wrongcode.aac domoticz/www/secpanel/media/wrongcode.mp3 domoticz/www/secpanel/media/wrongcode.ogg +domoticz/www/styles/dark-th3me/base.css domoticz/www/styles/dark-th3me/custom.css domoticz/www/styles/dark-th3me/custom.js domoticz/www/styles/dark-th3me/fonts/Ubuntu.ttf