Index: www/domoticz/Makefile =================================================================== --- www/domoticz/Makefile +++ www/domoticz/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= domoticz -PORTVERSION= 4.${DOMOTICZ_REL} -PORTREVISION= 1 +PORTVERSION= 2020.2 CATEGORIES= www MAINTAINER= kiwi@oav.net @@ -11,103 +10,107 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/License.txt -LIB_DEPENDS= libcurl.so:ftp/curl \ - libexpat.so:textproc/expat2 +LIB_DEPENDS= libcurl.so:ftp/curl +BUILD_DEPENDS= cereal>=1.2.2:devel/cereal -CONFLICTS_INSTALL?= domoticz-[23]* domoticz-devel-* +USES= cmake pkgconfig ssl lua:53 OPTIONS_SUB= YES -OPTIONS_DEFINE= PYTHON SBOOST SLUA SMINIZIP SMQTT SSQLITE SSSL TELLDUS +OPTIONS_DEFINE= SSSL SBOOST SMQTT SSQLITE SMINIZIP SJSONCPP PYTHON TELLDUS OPENZWAVE PRECOMP +OPTIONS_DEFAULT= PYTHON PRECOMP SBOOST_DESC= Use static Boost instead of dynamic linking SSSL_DESC= Use static OpenSSL library instead of dynamic linking -SLUA_DESC= Use domoticz provided LUA instead of ports one -SMQTT_DESC= Use domoticz mosquitto instead of ports one +SMQTT_DESC= Use domoticz Mosquitto instead of ports one SSQLITE_DESC= Use domoticz SQLLite instead of ports one -SMINIZIP_DESC= Use domoticz minizip instead of ports one -PYTHON_DESC= Enable support for Python Plugins -TELLDUS_DESC= Enable support for Telldus +SMINIZIP_DESC= Use domoticz Minizip instead of ports one +SJSONCPP_DESC= Use domoticz JSonCPP 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 .include -USES= cmake compiler:c++11-lang iconv pkgconfig ssl - -# This hack is to get rid of dependency of git while building -# the package. -DOMOTICZ_REL= 10717 -DOMOTICZ_TS= 1565707487 USE_GITHUB= yes +# see https://github.com/domoticz/domoticz/tree/development/extern for the specific release tag +GH_TUPLE= open-source-parsers:jsoncpp:3beb37e:jsoncpp/extern/jsoncpp \ + domoticz:minizip:f528264:minizip/extern/minizip \ + eclipse:mosquitto:22e0a4b:mosquitto/extern/mosquitto \ + azadkuh:sqlite-amalgamation:cd94546:sqlite_amalgamation/extern/sqlite-amalgamation USE_RC_SUBR= domoticz USERS= domoticz GROUPS= domoticz -CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/domoticz \ - -DUSE_BUILTIN_ZLIB="NO" \ - -DUSE_STATIC_OPENZWAVE="NO" +CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz +CMAKE_OFF+ = GIT_SUBMODULE .if ${PORT_OPTIONS:MSSSL} -CMAKE_ARGS+= -DUSE_OPENSSL_STATIC="YES" +CMAKE_ON+= USE_OPENSSL_STATIC .else -CMAKE_ARGS+= -DUSE_OPENSSL_STATIC="NO" +CMAKE_OFF+= USE_OPENSSL_STATIC .endif .if ${PORT_OPTIONS:MSBOOST} -CMAKE_ARGS+= -DUSE_STATIC_BOOST="YES" +CMAKE_ON+= USE_STATIC_BOOST BUILD_DEPENDS+= boost-libs>=0:devel/boost-libs .else -CMAKE_ARGS+= -DUSE_STATIC_BOOST="NO" +CMAKE_OFF+= USE_STATIC_BOOST LIB_DEPENDS+= libboost_system.so:devel/boost-libs .endif -.if ${PORT_OPTIONS:MSLUA} -CMAKE_ARGS+= -DUSE_BUILTIN_LUA="YES" -.else -CMAKE_ARGS+= -DUSE_BUILTIN_LUA="NO" -USES+= lua:52 -.endif - .if ${PORT_OPTIONS:MSMQTT} -CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="YES" +CMAKE_ON+= USE_BUILTIN_MQTT .else -CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="NO" +CMAKE_OFF+= USE_BUILTIN_MQTT LIB_DEPENDS+= libmosquitto.so:net/mosquitto .endif .if ${PORT_OPTIONS:MSSQLITE} -CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="YES" +CMAKE_ON+= USE_BUILTIN_SQLITE .else -CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="NO" +CMAKE_OFF+= USE_BUILTIN_SQLITE USES+= sqlite .endif .if ${PORT_OPTIONS:MSMINIZIP} -CMAKE_ARGS+= -DUSE_BUILTIN_MINIZIP="YES" +CMAKE_ON+= USE_BUILTIN_MINIZIP .else -CMAKE_ARGS+= -DUSE_BUILTIN_MINIZIP="NO" +CMAKE_OFF+= USE_BUILTIN_MINIZIP LIB_DEPENDS+= libminizip.so:archivers/minizip .endif +.if ${PORT_OPTIONS:MSJSONCPP} +CMAKE_ON+= USE_BUILTIN_JSONCPP +.else +CMAKE_OFF+= USE_BUILTIN_JSONCPP +LIB_DEPENDS+= libjsoncpp.so:devel/jsoncpp +.endif + .if ${PORT_OPTIONS:MPYTHON} -CMAKE_ARGS+= -DUSE_PYTHON="YES" -USES+= python:3.6 +CMAKE_ON+= USE_PYTHON +USES+= python:3.7 .else -CMAKE_ARGS+= -DUSE_PYTHON="NO" +CMAKE_OFF+= USE_PYTHON .endif .if ${PORT_OPTIONS:MTELLDUS} LIB_DEPENDS+= libtelldus-core.so:comms/telldus-core .endif -post-patch: - @${REINPLACE_CMD} -e "s,\/opt,${PREFIX},g" ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e "/^ADD_PRECOMPILED_HEADER/ d" ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e "s/\(#define APPVERSION\)\(.*\)/\1 ${DOMOTICZ_REL}/" ${WRKSRC}/appversion.default - @${REINPLACE_CMD} -e "s/\(#define APPHASH\)\(.*\)/\1 \"be79a17\"/" ${WRKSRC}/appversion.default - @${REINPLACE_CMD} -e "s/\(#define APPDATE\)\(.*\)/\1 ${DOMOTICZ_TS}/" ${WRKSRC}/appversion.default +.if ${PORT_OPTIONS:MPRECOMP} +CMAKE_ON+= USE_PRECOMPILED_HEADER +.else +CMAKE_OFF+= USE_PRECOMPILED_HEADER +.endif + +.if ${PORT_OPTIONS:MOPENZWAVE} +CMAKE_OFF+= USE_STATIC_OPENZWAVE +LIB_DEPENDS+= libopenzwave.so:comms/openzwave-devel +.endif post-install: - @${MKDIR} ${STAGEDIR}/var/db/domoticz ${STAGEDIR}/var/run/domoticz + ${MKDIR} ${STAGEDIR}/var/db/domoticz ${STAGEDIR}/var/run/domoticz .include Index: www/domoticz/distinfo =================================================================== --- www/domoticz/distinfo +++ www/domoticz/distinfo @@ -1,3 +1,11 @@ -TIMESTAMP = 1565790643 -SHA256 (domoticz-domoticz-4.10717_GH0.tar.gz) = c053a2161942529f56b748945ec297dcd67f449e68029fc886893a528891ad86 -SIZE (domoticz-domoticz-4.10717_GH0.tar.gz) = 38159517 +TIMESTAMP = 1590325090 +SHA256 (domoticz-domoticz-2020.2_GH0.tar.gz) = a02f589daad4eebff1f5e93815c1acd1864cf068f8f5c3185bcdd20207ae395e +SIZE (domoticz-domoticz-2020.2_GH0.tar.gz) = 14588401 +SHA256 (open-source-parsers-jsoncpp-3beb37e_GH0.tar.gz) = 0268be4bdabdfa167ccd1e49a3a190c249eae481d1669b854dff8d1a34692967 +SIZE (open-source-parsers-jsoncpp-3beb37e_GH0.tar.gz) = 212420 +SHA256 (domoticz-minizip-f528264_GH0.tar.gz) = 58d0d718bb55db6e77ab56dc432eee9993a7230fe74dbd56589c72d8f6c225e0 +SIZE (domoticz-minizip-f528264_GH0.tar.gz) = 45932 +SHA256 (eclipse-mosquitto-22e0a4b_GH0.tar.gz) = b00ac0b59ad01f1fa8049a4dd2b526675ca9acd367436272678d22fe43358c27 +SIZE (eclipse-mosquitto-22e0a4b_GH0.tar.gz) = 2042301 +SHA256 (azadkuh-sqlite-amalgamation-cd94546_GH0.tar.gz) = 05461cbed5bd16a7abc824302ef4f40744185f42d1070834f349d7df72be99ab +SIZE (azadkuh-sqlite-amalgamation-cd94546_GH0.tar.gz) = 2392999 Index: www/domoticz/files/patch-CMakeLists.txt =================================================================== --- www/domoticz/files/patch-CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ ---- CMakeLists.txt.orig 2018-06-23 14:18:06 UTC -+++ CMakeLists.txt -@@ -279,7 +279,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ENDMACRO() - --FIND_PROGRAM(GIT_EXECUTABLE git -+FIND_PROGRAM(GIT_EXECUTABLE NOgitNO - DOC "git command line client") - - -@@ -753,7 +753,6 @@ else() - target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${EXECINFO_LIBRARIES}) - ENDIF() - --ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h") - - IF(CMAKE_COMPILER_IS_GNUCXX) - option(USE_STATIC_LIBSTDCXX "Build with static libgcc/libstdc++ libraries" YES) -@@ -788,7 +787,7 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "domoticz") - - SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${domoticz}-dev") - SET(CPACK_PACKAGING_INSTALL_PREFIX "/") --SET(CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}") -+SET(CPACK_PACKAGE_DEFAULT_LOCATION "%%PREFIX%%/domoticz/${CPACK_PACKAGE_NAME}") - SET(CPACK_PACKAGE_EXECUTABLES "domoticz;Home Automation System (Domotica).") - - #set(CPACK_DEB_COMPONENT_INSTALL TRUE) -@@ -797,16 +796,15 @@ SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR - INCLUDE(CPack) - - IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -- set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) -+ set(CMAKE_INSTALL_PREFIX "%%PREFIX%%/domoticz/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) - ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - --install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dzVents DESTINATION ${CMAKE_INSTALL_PREFIX}) --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ) -+install(TARGETS domoticz DESTINATION "%%PREFIX%%/domoticz") -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION "%%PREFIX%%/domoticz") -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION "%%PREFIX%%/domoticz") -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION "%%PREFIX%%/domoticz") -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION "%%PREFIX%%/domoticz") -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION "%%PREFIX%%/domoticz" USE_SOURCE_PERMISSIONS) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION "%%PREFIX%%/domoticz") -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION "%%PREFIX%%/domoticz") -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dzVents DESTINATION "%%PREFIX%%/domoticz") Index: www/domoticz/files/patch-extern_minizip_minizip_ioapi.h =================================================================== --- /dev/null +++ www/domoticz/files/patch-extern_minizip_minizip_ioapi.h @@ -0,0 +1,14 @@ +--- extern/minizip/minizip/ioapi.h.orig 2020-05-24 23:10:58 UTC ++++ extern/minizip/minizip/ioapi.h +@@ -49,6 +49,11 @@ + #define ftello64 ftell + #define fseeko64 fseek + #else ++#ifdef __FreeBSD__ ++#define fopen64 fopen ++#define ftello64 ftello ++#define fseeko64 fseeko ++#endif + #ifdef _MSC_VER + #define fopen64 fopen + #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC))) Index: www/domoticz/files/patch-extern_mosquitto_CMakeLists.txt =================================================================== --- /dev/null +++ www/domoticz/files/patch-extern_mosquitto_CMakeLists.txt @@ -0,0 +1,31 @@ +--- extern/mosquitto/CMakeLists.txt.orig 2020-03-19 15:45:18 UTC ++++ extern/mosquitto/CMakeLists.txt +@@ -5,6 +5,7 @@ + # line utility including the "-i" option. + + set(CMAKE_LEGACY_CYGWIN_WIN32 0) ++set(WITH_BUNDLED_DEPS ON) + + project(mosquitto) + +@@ -77,7 +78,7 @@ else (WITH_THREADING) + set (PTHREAD_INCLUDE_DIR "") + endif (WITH_THREADING) + +-option(DOCUMENTATION "Build documentation?" ON) ++option(DOCUMENTATION "Build documentation?" OFF) + + option(WITH_DLT "Include DLT support?" OFF) + message(STATUS "WITH_DLT = ${WITH_DLT}") +@@ -111,9 +112,9 @@ install(FILES mosquitto.conf aclfile.example pskfile.e + # ======================================== + + configure_file(libmosquitto.pc.in libmosquitto.pc @ONLY) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + configure_file(libmosquittopp.pc.in libmosquittopp.pc @ONLY) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + # ======================================== + # Testing Index: www/domoticz/files/patch-extern_mosquitto_lib_CMakeLists.txt =================================================================== --- /dev/null +++ www/domoticz/files/patch-extern_mosquitto_lib_CMakeLists.txt @@ -0,0 +1,11 @@ +--- extern/mosquitto/lib/CMakeLists.txt.orig 2020-05-25 08:19:49 UTC ++++ extern/mosquitto/lib/CMakeLists.txt +@@ -91,8 +91,6 @@ set_target_properties(libmosquitto PROPERTIES + SOVERSION 1 + ) + +-install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") +- + if (WITH_STATIC_LIBRARIES) + add_library(libmosquitto_static STATIC ${C_SRC}) + if (WITH_PIC) Index: www/domoticz/files/patch-extern_mosquitto_lib_cpp_CMakeLists.txt =================================================================== --- /dev/null +++ www/domoticz/files/patch-extern_mosquitto_lib_cpp_CMakeLists.txt @@ -0,0 +1,10 @@ +--- extern/mosquitto/lib/cpp/CMakeLists.txt.orig 2020-05-25 08:21:03 UTC ++++ extern/mosquitto/lib/cpp/CMakeLists.txt +@@ -13,7 +13,6 @@ set_target_properties(mosquittopp PROPERTIES + VERSION ${VERSION} + SOVERSION 1 + ) +-install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + + if (WITH_STATIC_LIBRARIES) + add_library(mosquittopp_static STATIC Index: www/domoticz/files/patch-getgit.cmake =================================================================== --- www/domoticz/files/patch-getgit.cmake +++ www/domoticz/files/patch-getgit.cmake @@ -1,70 +1,17 @@ ---- getgit.cmake.orig 2018-06-23 14:18:06 UTC +--- getgit.cmake.orig 2020-05-24 12:30:37 UTC +++ getgit.cmake -@@ -1,66 +1,7 @@ - # this macro gets called as a custom build step by running make +@@ -2,10 +2,10 @@ # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller --# the git.cmake module is part of the standard distribution + # the git.cmake module is part of the standard distribution -find_package(Git) -if(NOT GIT_FOUND) - MESSAGE(FATAL_ERROR "Git not found!.") -endif() -- --MACRO(Gitversion_GET_REVISION dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_GET_REVISION) -- --MACRO(Gitversion_GET_HASH dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_GET_HASH) -- --MACRO(Gitversion_GET_DATE dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_GET_DATE) -- --MACRO(Gitversion_CHECK_DIRTY dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_CHECK_DIRTY) -- --Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision) --IF(NOT ProjectRevision) -- MESSAGE(STATUS "Failed to get ProjectRevision from git, set it to 0") -- set (ProjectRevision 0) --ELSE(NOT ProjectRevision) -- MATH(EXPR ProjectRevision "${ProjectRevision}+2107") --ENDIF(NOT ProjectRevision) --Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash) --IF(NOT ProjectHash) -- MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0") -- set (ProjectHash 0) --ENDIF(NOT ProjectHash) --Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate) --IF(NOT ProjectDate) -- MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0") -- set (ProjectDate 0) --ENDIF(NOT ProjectDate) --Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty) --IF(ProjectDirty) -- MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash") -- set (ProjectHash "${ProjectHash}-modified") --ENDIF(ProjectDirty) -- --# write a file with the APPVERSION define --file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n") -- -+set (ProjectDate 0) - # if ProjectDate is 0, create appversion.h.txt from a copy of appversion.default - IF(NOT ProjectDate AND EXISTS ${SOURCE_DIR}/appversion.default) - MESSAGE(STATUS "ProjectDate is 0 and appversion.default exists, copy it") ++#find_package(Git) ++#if(NOT GIT_FOUND) ++# MESSAGE(FATAL_ERROR "Git not found!.") ++#endif() + + MACRO(History_GET_REVISION variable) + IF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) Index: www/domoticz/files/patch-main_mainworker.cpp =================================================================== --- /dev/null +++ www/domoticz/files/patch-main_mainworker.cpp @@ -0,0 +1,12 @@ +--- 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,3 +1,4 @@ +domoticz/updatedomo domoticz/Config/2gig/ct100.xml domoticz/Config/2gig/ct101.xml domoticz/Config/2gig/ct30.xml @@ -19,19 +20,32 @@ domoticz/Config/BeNext/SceneController.xml domoticz/Config/BeNext/TagReader.xml domoticz/Config/BeNext/TagReader500.xml +domoticz/Config/BeNext/mydisplay.xml +domoticz/Config/BeNext/mygate.xml +domoticz/Config/Localization.xml +domoticz/Config/Localization.xsd +domoticz/Config/NotificationCCTypes.xml +domoticz/Config/NotificationCCTypes.xsd +domoticz/Config/SensorMultiLevelCCTypes.xml +domoticz/Config/SensorMultiLevelCCTypes.xsd domoticz/Config/act/lfm20.xml domoticz/Config/act/zdm230.xml +domoticz/Config/act/zdp100.xml domoticz/Config/act/zdw103.xml domoticz/Config/act/zdw232.xml domoticz/Config/act/zir010.xml +domoticz/Config/act/zrm230.xml +domoticz/Config/act/zrp100.xml domoticz/Config/act/zrp110.xml domoticz/Config/act/zrw103.xml +domoticz/Config/act/zrw230.xml domoticz/Config/aeotec/dsa03202.xml domoticz/Config/aeotec/dsa22.xml domoticz/Config/aeotec/dsa38.xml domoticz/Config/aeotec/dsb04100.xml domoticz/Config/aeotec/dsb05.xml domoticz/Config/aeotec/dsb09104.xml +domoticz/Config/aeotec/dsb28-zweu.xml domoticz/Config/aeotec/dsb28.xml domoticz/Config/aeotec/dsb29.xml domoticz/Config/aeotec/dsb45.xml @@ -79,12 +93,20 @@ domoticz/Config/aeotec/zw140.xml domoticz/Config/aeotec/zw141.xml domoticz/Config/aeotec/zw162.xml +domoticz/Config/aeotec/zw164.xml +domoticz/Config/aeotec/zw175.xml +domoticz/Config/aeotec/zw187.xml +domoticz/Config/aeotec/zw189.xml domoticz/Config/aeotec/zwa001.xml domoticz/Config/aeotec/zwa002.xml domoticz/Config/aeotec/zwa003.xml domoticz/Config/aeotec/zwa004.xml domoticz/Config/aeotec/zwa005.xml domoticz/Config/aeotec/zwa006.xml +domoticz/Config/aeotec/zwa008.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 @@ -94,12 +116,17 @@ domoticz/Config/assa_abloy/TouchLever.xml domoticz/Config/assa_abloy/nexTouch.xml domoticz/Config/august/asl-03.xml +domoticz/Config/buffalo/hw-100v15a-zw.xml +domoticz/Config/comfort/ucm.xml +domoticz/Config/config-template.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/RFWC5.xml +domoticz/Config/cooper/rf9534.xml domoticz/Config/danfoss/living.xml domoticz/Config/danfoss/rsroom.xml domoticz/Config/danfoss/z.xml @@ -118,6 +145,7 @@ domoticz/Config/devolo/mt2653.xml domoticz/Config/devolo/mt2756.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-z510.xml @@ -143,12 +171,18 @@ domoticz/Config/duwi/05458.xml domoticz/Config/duwi/ZWES1000.xml domoticz/Config/duwi/ZWESJ300.xml +domoticz/Config/duwi/zw-edan-300.xml +domoticz/Config/duwi/zw-zdan-300.xml domoticz/Config/duwi/zwfb.xml +domoticz/Config/duwi/zwws.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/electronicsolutions/dbmz.xml +domoticz/Config/enblink/ss201-us-w_1308.xml domoticz/Config/enerwave/zw15rmplus.xml domoticz/Config/enerwave/zw15s.xml domoticz/Config/enerwave/zw20r.xml @@ -164,13 +198,17 @@ domoticz/Config/everspring/ad146.xml domoticz/Config/everspring/ad147.xml domoticz/Config/everspring/an145.xml +domoticz/Config/everspring/an157.xml domoticz/Config/everspring/an158.xml domoticz/Config/everspring/an163.xml domoticz/Config/everspring/an179.xml domoticz/Config/everspring/an180.xml domoticz/Config/everspring/an181.xml domoticz/Config/everspring/hac01.xml +domoticz/Config/everspring/han01.xml +domoticz/Config/everspring/han02-1.xml domoticz/Config/everspring/hsp02.xml +domoticz/Config/everspring/lptdm1u.xml domoticz/Config/everspring/se812.xml domoticz/Config/everspring/sf812.xml domoticz/Config/everspring/sm103.xml @@ -183,14 +221,17 @@ domoticz/Config/everspring/st815.xml domoticz/Config/everspring/tse03.xml domoticz/Config/everspringct/hsm02.xml +domoticz/Config/evolve/lfm-20.xml domoticz/Config/evolve/lrm-as.xml domoticz/Config/evolve/lsm-15.xml domoticz/Config/evolve/ltm-5.xml +domoticz/Config/fakro/arz.xml domoticz/Config/fakro/zwp10.xml domoticz/Config/fakro/zwrs.xml domoticz/Config/fakro/zws12.xml domoticz/Config/fakro/zws230.xml domoticz/Config/fibaro/fgbs001.xml +domoticz/Config/fibaro/fgbs222.xml domoticz/Config/fibaro/fgcd001.xml domoticz/Config/fibaro/fgd211.xml domoticz/Config/fibaro/fgd212.xml @@ -217,22 +258,32 @@ 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/fgwoe.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.xml +domoticz/Config/followgood/swz-1002.xml domoticz/Config/forest/fs2z5232000002.xml domoticz/Config/fortrezz/fmi.xml +domoticz/Config/fortrezz/gdc1_fortrezz_1501.xml domoticz/Config/fortrezz/mimo2plus.xml domoticz/Config/fortrezz/mimolite.xml domoticz/Config/fortrezz/ssa2.xml domoticz/Config/fortrezz/ssa3.xml domoticz/Config/fortrezz/wv01.xml +domoticz/Config/fortrezz/wwa-01aa.xml domoticz/Config/fortrezz/wwa02.xml +domoticz/Config/frostdale/fdn2311.xml domoticz/Config/frostdale/fdn2nxx.xml domoticz/Config/ge/12719-plugin-switch.xml domoticz/Config/ge/12724-dimmer.xml +domoticz/Config/ge/12727.xml domoticz/Config/ge/14282-plugin-switch.xml +domoticz/Config/ge/14284.xml domoticz/Config/ge/14288-outlet.xml domoticz/Config/ge/14291-switch.xml domoticz/Config/ge/14292-toggle-switch.xml @@ -242,6 +293,9 @@ 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/46203-dimmer.xml domoticz/Config/ge/dimmer.xml domoticz/Config/ge/dimmer_module.xml domoticz/Config/ge/hinge-pin.xml @@ -251,16 +305,23 @@ domoticz/Config/ge/zw4001-switch.xml domoticz/Config/ge/zw6302.xml domoticz/Config/gocontrol/GC-TBZ48L.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/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/hank/hkzw-dws01.xml domoticz/Config/hank/hkzw-fld01.xml domoticz/Config/hank/hkzw-ms01.xml -domoticz/Config/hank/hkzw-ms02.xml +domoticz/Config/hank/hkzw-ms02-200.xml +domoticz/Config/hank/hkzw-ms02-300.xml domoticz/Config/hank/hkzw-rgb01.xml domoticz/Config/hank/hkzw-so01-smartplug.xml domoticz/Config/hank/hkzw-so03.xml @@ -275,10 +336,15 @@ domoticz/Config/heiman/HS1SA-Z.xml domoticz/Config/heiman/HS1WL-Z.xml domoticz/Config/heiman/HS2SK-Z.xml +domoticz/Config/heiman/HS2WD-Z.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 domoticz/Config/homeseer/ezmotionplus.xml +domoticz/Config/homeseer/hs-ds100plus.xml domoticz/Config/homeseer/hs-fc200plus.xml domoticz/Config/homeseer/hs-fls100plus.xml +domoticz/Config/homeseer/hs-fs100plus.xml domoticz/Config/homeseer/hs-ls100plus.xml domoticz/Config/homeseer/hs-ms100plus.xml domoticz/Config/homeseer/hs-wd100plus.xml @@ -288,12 +354,15 @@ domoticz/Config/homeseer/hsm100.xml domoticz/Config/homeseer/hsm200.xml domoticz/Config/homeseer/ztroller.xml +domoticz/Config/honeywell/39348-zw4008.xml domoticz/Config/honeywell/39351-ZW3005.xml domoticz/Config/honeywell/lynx-touch-l5100.xml +domoticz/Config/honeywell/th6320zw2003.xml domoticz/Config/honeywell/th8320zw1000.xml domoticz/Config/horstmann/asrzw.xml domoticz/Config/horstmann/hrt4zw.xml domoticz/Config/horstmann/scsc17.xml +domoticz/Config/horstmann/ses301.xml domoticz/Config/horstmann/ses302.xml domoticz/Config/horstmann/ses303.xml domoticz/Config/horstmann/sir321.xml @@ -301,9 +370,12 @@ domoticz/Config/horstmann/srt323.xml domoticz/Config/horstmann/ssr302.xml domoticz/Config/horstmann/ssr303.xml +domoticz/Config/icare/zw-66.xml domoticz/Config/idlock/idlock101.xml domoticz/Config/idlock/idlock150.xml domoticz/Config/ingersoll/dwzwave1.xml +domoticz/Config/inovelli/lzw30-sn.xml +domoticz/Config/inovelli/lzw30.xml domoticz/Config/inovelli/nzw1201.xml domoticz/Config/inovelli/nzw30.xml domoticz/Config/inovelli/nzw31.xml @@ -315,18 +387,25 @@ domoticz/Config/inovelli/simple_module.xml domoticz/Config/intermatic/ca8900.xml domoticz/Config/iris/rangeextender.xml +domoticz/Config/iwatsu/ne-4ct-2p.xml +domoticz/Config/iwatsu/ne-4ct.xml +domoticz/Config/jasco/45601.xml domoticz/Config/kaipule/im20.xml domoticz/Config/kaipule/ix32.xml +domoticz/Config/kwikset/914c.xml domoticz/Config/kwikset/smartcode.xml domoticz/Config/leviton/dz15s.xml domoticz/Config/leviton/dz6hd.xml domoticz/Config/leviton/dzpd3.xml domoticz/Config/leviton/rzi10.xml domoticz/Config/leviton/vrcpg.xml +domoticz/Config/leviton/vrcs2.xml +domoticz/Config/leviton/vrcz4.xml domoticz/Config/leviton/vre06.xml domoticz/Config/leviton/vrf01.xml domoticz/Config/leviton/vri06.xml domoticz/Config/leviton/vri10.xml +domoticz/Config/leviton/vrs15.xml domoticz/Config/linear/GC-TBZ48.xml domoticz/Config/linear/LB60Z-1.xml domoticz/Config/linear/PD300Z-2.xml @@ -338,6 +417,8 @@ domoticz/Config/linear/WD500Z5-1.xml domoticz/Config/linear/WS15Z-1.xml domoticz/Config/linear/WT00Z-1.xml +domoticz/Config/linear/gd00z-7.xml +domoticz/Config/linear/ngd00z.xml domoticz/Config/logicsoft/ZHC5002.xml domoticz/Config/logicsoft/ZHC5010.xml domoticz/Config/manufacturer_specific.xml @@ -347,14 +428,21 @@ domoticz/Config/mcohome/mh8fceu.xml domoticz/Config/mcohome/mh9co2.xml domoticz/Config/mcohome/mhp210.xml +domoticz/Config/mcohome/mhp220.xml +domoticz/Config/mcohome/mhp511.xml domoticz/Config/mcohome/mhs311.xml domoticz/Config/mcohome/mhs312.xml domoticz/Config/mcohome/mhs314.xml domoticz/Config/mcohome/mhs411.xml domoticz/Config/mcohome/mhs412.xml domoticz/Config/mcohome/mhs513.xml +domoticz/Config/merten/5044xx.xml +domoticz/Config/merten/5046xx.xml +domoticz/Config/merten/506004.xml domoticz/Config/merten/507801.xml +domoticz/Config/merten/508244.xml domoticz/Config/merten/50x5xx.xml +domoticz/Config/miyakawaelectric/me-d101.xml domoticz/Config/nexia/db100z.xml domoticz/Config/nodon/asp3100SmartPlug.xml domoticz/Config/nodon/crc3100OctanRemote.xml @@ -368,12 +456,16 @@ domoticz/Config/oomi/ft111.xml domoticz/Config/options.xml domoticz/Config/options.xsd +domoticz/Config/permundo/psc132zw.xml +domoticz/Config/permundo/psc234zw.xml domoticz/Config/philio/pad02.xml domoticz/Config/philio/pan03.xml domoticz/Config/philio/pan04.xml +domoticz/Config/philio/pan05.xml domoticz/Config/philio/pan06.xml domoticz/Config/philio/pan07.xml domoticz/Config/philio/pan08.xml +domoticz/Config/philio/pan11-1.xml domoticz/Config/philio/pan11.xml domoticz/Config/philio/pan16.xml domoticz/Config/philio/phpab01.xml @@ -402,9 +494,13 @@ domoticz/Config/popp/123658.xml domoticz/Config/popp/700045.xml domoticz/Config/popp/700168.xml +domoticz/Config/popp/700397.xml +domoticz/Config/popp/700793.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/qees/reto-dimmer-plus.xml domoticz/Config/qees/reto-plugin-switch.xml domoticz/Config/qubino/ZMNHAA2.xml @@ -415,6 +511,7 @@ domoticz/Config/qubino/ZMNHCDx.xml domoticz/Config/qubino/ZMNHDA2.xml domoticz/Config/qubino/ZMNHDDx.xml +domoticz/Config/qubino/ZMNHHDx.xml domoticz/Config/qubino/ZMNHIA2.xml domoticz/Config/qubino/ZMNHIDxS1.xml domoticz/Config/qubino/ZMNHIDxS2.xml @@ -425,6 +522,7 @@ domoticz/Config/qubino/ZMNHLDx.xml domoticz/Config/qubino/ZMNHNDx.xml domoticz/Config/qubino/ZMNHODx.xml +domoticz/Config/qubino/ZMNHQDx.xml domoticz/Config/qubino/ZMNHSDx.xml domoticz/Config/qubino/ZMNHTDx.xml domoticz/Config/qubino/ZMNHTDxS3.xml @@ -434,25 +532,34 @@ domoticz/Config/qubino/ZMNHXDx.xml domoticz/Config/qubino/ZMNHYDx.xml domoticz/Config/qubino/ZMNHZDx.xml +domoticz/Config/qubino/ZMNKIDx.xml +domoticz/Config/quby/qb2.xml domoticz/Config/rcs/em52-zw.xml domoticz/Config/rcs/pm12-zw.xml domoticz/Config/rcs/therm0005.xml domoticz/Config/rcs/therm0007.xml domoticz/Config/rcs/therm0009.xml +domoticz/Config/remotec/bw8120eu.xml domoticz/Config/remotec/zfm-80.xml +domoticz/Config/remotec/zrc-100eu.xml domoticz/Config/remotec/zrc-90.xml domoticz/Config/remotec/zts-110.xml domoticz/Config/remotec/zts-500.xml domoticz/Config/remotec/zurc.xml domoticz/Config/remotec/zxt-120.xml +domoticz/Config/remotec/zxt-310.xml domoticz/Config/remotec/zxt-600.xml domoticz/Config/schlage/BE468.xml +domoticz/Config/schlage/BE468ZP.xml domoticz/Config/schlage/BE469.xml domoticz/Config/schlage/BE469ZP.xml +domoticz/Config/schlage/fe599.xml +domoticz/Config/schlagelink/41.xml domoticz/Config/schlagelink/itemp.xml domoticz/Config/schlagelink/minikeypad.xml domoticz/Config/sensative/strips.xml domoticz/Config/sensative/stripscomfort.xml +domoticz/Config/sercomm/sw-clp01-eu.xml domoticz/Config/shenzen_neo/ls01ch.xml domoticz/Config/shenzen_neo/ls02ch.xml domoticz/Config/shenzen_neo/nas-ab01z.xml @@ -465,39 +572,63 @@ domoticz/Config/shenzen_neo/nas-ws02z.xml domoticz/Config/simon/10002034-13X.xml domoticz/Config/simon/10002041-13X.xml +domoticz/Config/smartthings/pgc401m.xml +domoticz/Config/smartthings/sth-eth200.xml +domoticz/Config/somfy/1811265_ZRTSI.xml domoticz/Config/steinel/is140-2.xml domoticz/Config/steinel/l810-led-ihf.xml domoticz/Config/steinel/rs-led-d2.xml domoticz/Config/steinel/xled-home-2.xml domoticz/Config/stelpro/stzw402.xml +domoticz/Config/sunricher/srzv9001k8.xml +domoticz/Config/sunricher/srzv9001t4dimeu.xml +domoticz/Config/sunricher/srzv9003t4rgbweu.xml +domoticz/Config/sunricher/srzv9101sachpeu.xml +domoticz/Config/sunricher/zv9101.xml domoticz/Config/swiid/swiidinter.xml domoticz/Config/swiid/swiidplug.xml domoticz/Config/telldus/TZWP102.xml domoticz/Config/telldus/tzdw100.xml domoticz/Config/telldus/tzwp100.xml +domoticz/Config/there/800z.xml domoticz/Config/thermofloor/heatit021.xml -domoticz/Config/thermofloor/heatit033.xml domoticz/Config/thermofloor/heatit056.xml domoticz/Config/trane/TZEMT400AB32MAA.xml domoticz/Config/trane/TZEMT400BB32MAA.xml domoticz/Config/trane/TZEMT524AA21MA.xml -domoticz/Config/tronika/zsc01d.xml +domoticz/Config/vera/vera2.xml +domoticz/Config/vision/1701.xml +domoticz/Config/vision/brg1-433.xml domoticz/Config/vision/zd2102.xml domoticz/Config/vision/zd2105us5.xml domoticz/Config/vision/zd2201.xml domoticz/Config/vision/zd2301.xml domoticz/Config/vision/zf5201.xml domoticz/Config/vision/zg8101.xml +domoticz/Config/vision/zl7101us.xml +domoticz/Config/vision/zl7201us.xml domoticz/Config/vision/zl7261.xml domoticz/Config/vision/zl7431.xml +domoticz/Config/vision/zl7432us.xml domoticz/Config/vision/zm1601eu.xml domoticz/Config/vision/zm1601eu5.xml domoticz/Config/vision/zm1602eu.xml domoticz/Config/vision/zm1602eu5.xml domoticz/Config/vision/zp3102.xml domoticz/Config/vision/zp3111.xml +domoticz/Config/vision/zr1202us.xml domoticz/Config/vision/zs5101eu.xml -domoticz/Config/vitrum/vitrumBS.xml +domoticz/Config/vision/zs610eu.xml +domoticz/Config/vision/zu1401jp.xml +domoticz/Config/vitrum/vitrumI-Dimmer.xml +domoticz/Config/vitrum/vitrumI-Switch.xml +domoticz/Config/vitrum/vitrumII-Dimmer.xml +domoticz/Config/vitrum/vitrumII-RollerBlind.xml +domoticz/Config/vitrum/vitrumII-Switch.xml +domoticz/Config/vitrum/vitrumIII-Dimmer.xml +domoticz/Config/vitrum/vitrumIII-Switch.xml +domoticz/Config/vitrum/vitrumIV-Switch.xml +domoticz/Config/vitrum/vitrumVI-Switch.xml domoticz/Config/waynedalton/WDTC-20.xml domoticz/Config/wenzhou/sm103.xml domoticz/Config/wenzhou/tsp01.xml @@ -513,6 +644,7 @@ domoticz/Config/wenzhou/tz74.xml domoticz/Config/wenzhou/tz79.xml domoticz/Config/wenzhou/tz88.xml +domoticz/Config/widom/DRY.xml domoticz/Config/widom/UBS104.xml domoticz/Config/widom/UME304C_S.xml domoticz/Config/widom/WDS.xml @@ -528,19 +660,23 @@ domoticz/Config/zooz/zen20.xml domoticz/Config/zooz/zen20v2.xml domoticz/Config/zooz/zen21.xml +domoticz/Config/zooz/zen21v2.xml domoticz/Config/zooz/zen22.xml domoticz/Config/zooz/zen22v2.xml domoticz/Config/zooz/zen23.xml domoticz/Config/zooz/zen24.xml +domoticz/Config/zooz/zen25.xml domoticz/Config/zooz/zen26.xml domoticz/Config/zooz/zen27.xml domoticz/Config/zooz/zse08.xml domoticz/Config/zooz/zse09.xml domoticz/Config/zooz/zse18.xml domoticz/Config/zooz/zse19.xml +domoticz/Config/zooz/zse29.xml domoticz/Config/zooz/zse30.xml domoticz/Config/zooz/zse33.xml domoticz/Config/zooz/zse40.xml +domoticz/Config/zwave.me/004001.xml domoticz/Config/zwave.me/ZME_05431.xml domoticz/Config/zwave.me/ZME_05461.xml domoticz/Config/zwave.me/ZME_06433.xml @@ -555,10 +691,40 @@ domoticz/Config/zwave.me/iTemp.xml domoticz/Config/zwave.me/kfob.xml domoticz/Config/zwave.me/popp_kfob-c.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 @@ -569,18 +735,21 @@ domoticz/dzVents/documentation/history.md domoticz/dzVents/documentation/pandoc.md domoticz/dzVents/runtime/Camera.lua +domoticz/dzVents/runtime/CustomEvent.lua domoticz/dzVents/runtime/Device.lua domoticz/dzVents/runtime/Domoticz.lua domoticz/dzVents/runtime/EventHelpers.lua domoticz/dzVents/runtime/HTTPResponse.lua domoticz/dzVents/runtime/HistoricalStorage.lua domoticz/dzVents/runtime/Security.lua +domoticz/dzVents/runtime/SystemEvent.lua domoticz/dzVents/runtime/Time.lua domoticz/dzVents/runtime/TimedCommand.lua domoticz/dzVents/runtime/TimedCommandOptions.lua domoticz/dzVents/runtime/Timer.lua domoticz/dzVents/runtime/Utils.lua domoticz/dzVents/runtime/Variable.lua +domoticz/dzVents/runtime/constants.lua domoticz/dzVents/runtime/device-adapters/Adapters.lua domoticz/dzVents/runtime/device-adapters/airquality_device.lua domoticz/dzVents/runtime/device-adapters/alert_device.lua @@ -611,6 +780,7 @@ domoticz/dzVents/runtime/device-adapters/scaleweight_device.lua domoticz/dzVents/runtime/device-adapters/scene_device.lua domoticz/dzVents/runtime/device-adapters/security_device.lua +domoticz/dzVents/runtime/device-adapters/smoke_detector_device.lua domoticz/dzVents/runtime/device-adapters/soilmoisture_device.lua domoticz/dzVents/runtime/device-adapters/solar_radiation_device.lua domoticz/dzVents/runtime/device-adapters/soundlevel_device.lua @@ -628,8 +798,9 @@ domoticz/dzVents/runtime/device-adapters/wind_device.lua domoticz/dzVents/runtime/device-adapters/youless_device.lua domoticz/dzVents/runtime/device-adapters/zone_heating_device.lua -domoticz/dzVents/runtime/device-adapters/zwave_thermostat_mode_device.lua +domoticz/dzVents/runtime/device-adapters/zwave_mode_type_device.lua domoticz/dzVents/runtime/dzVents.lua +domoticz/dzVents/runtime/eventItemIdentifier.lua domoticz/dzVents/runtime/integration-tests/File.lua domoticz/dzVents/runtime/integration-tests/IconScript.lua domoticz/dzVents/runtime/integration-tests/README.md @@ -638,12 +809,18 @@ domoticz/dzVents/runtime/integration-tests/global_data.lua domoticz/dzVents/runtime/integration-tests/httpResponseScript.lua domoticz/dzVents/runtime/integration-tests/package.json +domoticz/dzVents/runtime/integration-tests/quiet.lua domoticz/dzVents/runtime/integration-tests/scCancelledScene.lua domoticz/dzVents/runtime/integration-tests/scScene.lua domoticz/dzVents/runtime/integration-tests/scriptContactDoorLockInvertedSwitch.lua domoticz/dzVents/runtime/integration-tests/scriptDelayedVariableScene.lua domoticz/dzVents/runtime/integration-tests/scriptSelectorSwitch.lua +domoticz/dzVents/runtime/integration-tests/scriptTestCustomAndSystemEventsScript.lua domoticz/dzVents/runtime/integration-tests/scriptTestEventState.lua +domoticz/dzVents/runtime/integration-tests/scriptTestProtect.lua +domoticz/dzVents/runtime/integration-tests/scriptTestRename.lua +domoticz/dzVents/runtime/integration-tests/scriptTestUpdatedDocumentation.lua +domoticz/dzVents/runtime/integration-tests/scriptTestWildcards.lua domoticz/dzVents/runtime/integration-tests/secArmedAway.lua domoticz/dzVents/runtime/integration-tests/server.js domoticz/dzVents/runtime/integration-tests/silent.lua @@ -655,6 +832,7 @@ domoticz/dzVents/runtime/integration-tests/testEventState.lua domoticz/dzVents/runtime/integration-tests/testIntegration.lua domoticz/dzVents/runtime/integration-tests/testSelectorSwitch.lua +domoticz/dzVents/runtime/integration-tests/testSystemAndCustomEvents.lua domoticz/dzVents/runtime/integration-tests/varCancelled.lua domoticz/dzVents/runtime/integration-tests/varString.lua domoticz/dzVents/runtime/integration-tests/vdCancelledRepeatSwitch.lua @@ -710,6 +888,7 @@ domoticz/dzVents/runtime/tests/scripts/script_variable3.lua domoticz/dzVents/runtime/tests/scripts/script_wildcard1.lua domoticz/dzVents/runtime/tests/scripts/script_wildcard2.lua +domoticz/dzVents/runtime/tests/scripts/script_wildcard3.lua domoticz/dzVents/runtime/tests/scripts/script_with_active_method.lua domoticz/dzVents/runtime/tests/scripts/script_with_time-contrained_device.lua domoticz/dzVents/runtime/tests/testDevice.lua @@ -717,6 +896,7 @@ domoticz/dzVents/runtime/tests/testEventHelpers.lua domoticz/dzVents/runtime/tests/testEventHelpersStorage.lua domoticz/dzVents/runtime/tests/testHTTPResponse.lua +domoticz/dzVents/runtime/tests/testLodash.lua domoticz/dzVents/runtime/tests/testScriptdzVentsDispatching.lua domoticz/dzVents/runtime/tests/testTime.lua domoticz/dzVents/runtime/tests/testTimedCommand.lua @@ -746,6 +926,7 @@ domoticz/scripts/domoticz.conf domoticz/scripts/download_update.sh domoticz/scripts/dzVents/data/README.md +domoticz/scripts/dzVents/dumps/.gitignore domoticz/scripts/dzVents/examples/calc temp delta.lua domoticz/scripts/dzVents/examples/check battery levels.lua domoticz/scripts/dzVents/examples/check dead devices by desc.lua @@ -765,21 +946,29 @@ 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/bare.lua -domoticz/scripts/dzVents/examples/templates/complete.lua -domoticz/scripts/dzVents/examples/templates/device.lua domoticz/scripts/dzVents/examples/templates/global_data.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/timer.lua -domoticz/scripts/dzVents/examples/templates/variable.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 @@ -795,6 +984,7 @@ domoticz/scripts/templates/All.Python domoticz/scripts/templates/All.dzVents domoticz/scripts/templates/Bare.dzVents +domoticz/scripts/templates/CustomEvents.dzVents domoticz/scripts/templates/Device.Lua domoticz/scripts/templates/Device.dzVents domoticz/scripts/templates/Group.dzVents @@ -802,8 +992,9 @@ domoticz/scripts/templates/Scene.dzVents domoticz/scripts/templates/Security.Lua domoticz/scripts/templates/Security.dzVents +domoticz/scripts/templates/System.dzVents domoticz/scripts/templates/Time.Lua -domoticz/scripts/templates/Timer.dzvents +domoticz/scripts/templates/Timer.dzVents domoticz/scripts/templates/UserVariable.Lua domoticz/scripts/templates/UserVariable.dzVents domoticz/scripts/templates/global_data.dzVents @@ -833,7 +1024,6 @@ domoticz/www/app/OfflineController.js domoticz/www/app/RFXComFirmwareController.js domoticz/www/app/RestoreDatabaseController.js -domoticz/www/app/RoomplanController.js domoticz/www/app/ScenesController.js domoticz/www/app/SetupController.js domoticz/www/app/TemperatureController.js @@ -847,6 +1037,7 @@ domoticz/www/app/ZWaveTopologyController.js domoticz/www/app/app.constants.js domoticz/www/app/app.js +domoticz/www/app/app.notifications.js domoticz/www/app/app.permissions.js domoticz/www/app/app.routes.js domoticz/www/app/components/rgbw-picker/RgbwPicker.html @@ -886,6 +1077,9 @@ domoticz/www/app/hardware/setup/WakeOnLan.js 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/DeviceLog.html domoticz/www/app/log/DeviceLog.js domoticz/www/app/log/GraphLog.js @@ -904,6 +1098,8 @@ domoticz/www/app/notifications/DeviceNotifications.js domoticz/www/app/notifications/constants.js domoticz/www/app/notifications/factories.js +domoticz/www/app/plans/RoomPlans.html +domoticz/www/app/plans/RoomPlans.js domoticz/www/app/report/CounterReport.html domoticz/www/app/report/CounterReport.js domoticz/www/app/report/DeviceReport.html @@ -1096,10 +1292,15 @@ domoticz/www/images/RGB48_Off.png domoticz/www/images/RGB48_On.png domoticz/www/images/RGB48_Sel.png +domoticz/www/images/Rain48_Off.png +domoticz/www/images/Rain48_On.png domoticz/www/images/Speaker.png domoticz/www/images/Speaker48_Off.png domoticz/www/images/Speaker48_On.png domoticz/www/images/Stop48.png +domoticz/www/images/Sun.png +domoticz/www/images/Sun48_Off.png +domoticz/www/images/Sun48_On.png domoticz/www/images/TV.png domoticz/www/images/TV48_Off.png domoticz/www/images/TV48_On.png @@ -1200,6 +1401,7 @@ domoticz/www/images/evohome/HeatingOff.png domoticz/www/images/evohome/HeatingOffInv.png domoticz/www/images/evohome/Off.png +domoticz/www/images/evohome/Offline.png domoticz/www/images/evohome/On.png domoticz/www/images/evohome/OpenWindow.png domoticz/www/images/evohome/PermanentOverride.png @@ -1233,6 +1435,7 @@ domoticz/www/images/leaf48.png domoticz/www/images/lightbulb.png domoticz/www/images/lightbulboff.png +domoticz/www/images/location.png domoticz/www/images/lock_closed.png domoticz/www/images/lock_open.png domoticz/www/images/log.png @@ -1285,7 +1488,6 @@ domoticz/www/images/radiation.png domoticz/www/images/radiation48.png domoticz/www/images/rain.png -domoticz/www/images/rain48.png domoticz/www/images/rainraining.png domoticz/www/images/remote.png domoticz/www/images/remote48.png @@ -1430,13 +1632,13 @@ domoticz/www/js/angular.min.js.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 domoticz/www/js/blockly/blockly_compressed.js domoticz/www/js/blockly/blocks_compressed.js domoticz/www/js/blockly/msg/en.js domoticz/www/js/bootbox.min.js.gz domoticz/www/js/bootstrap.min.js.gz domoticz/www/js/colpick.js.gz -domoticz/www/js/d3.min.js.gz domoticz/www/js/data-tables/dataTables.select.min.js.gz domoticz/www/js/data-tables/dataTables.tableTools.min.js.gz domoticz/www/js/data-tables/jquery.dataTables.min.js.gz @@ -1446,23 +1648,15 @@ domoticz/www/js/export-csv.js.gz domoticz/www/js/highcharts-ng.min.js.gz 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/exporting.js -domoticz/www/js/highcharts/modules/exporting.js.map -domoticz/www/js/highcharts/modules/exporting.src.js +domoticz/www/js/highcharts/modules/sankey.js domoticz/www/js/highcharts/modules/xrange.js -domoticz/www/js/highcharts/modules/xrange.js.map -domoticz/www/js/highcharts/modules/xrange.src.js domoticz/www/js/highcharts/themes/dark-unica.js -domoticz/www/js/highcharts/themes/dark-unica.js.map -domoticz/www/js/highcharts/themes/dark-unica.src.js domoticz/www/js/html5shiv.js.gz domoticz/www/js/i18next-1.8.0.min.js.gz -domoticz/www/js/jquery-3.3.1.min.js.gz +domoticz/www/js/jquery-3.4.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 @@ -1477,21 +1671,9 @@ domoticz/www/js/ng-grid.min.js.gz domoticz/www/js/ngDraggable.js.gz domoticz/www/js/ngload.min.js.gz -domoticz/www/js/noty/jquery.noty.js.gz -domoticz/www/js/noty/layouts/bottom.js.gz -domoticz/www/js/noty/layouts/bottomCenter.js.gz -domoticz/www/js/noty/layouts/bottomLeft.js.gz -domoticz/www/js/noty/layouts/bottomRight.js.gz -domoticz/www/js/noty/layouts/center.js.gz -domoticz/www/js/noty/layouts/centerLeft.js.gz -domoticz/www/js/noty/layouts/centerRight.js.gz -domoticz/www/js/noty/layouts/inline.js.gz -domoticz/www/js/noty/layouts/top.js.gz -domoticz/www/js/noty/layouts/topCenter.js.gz -domoticz/www/js/noty/layouts/topLeft.js.gz -domoticz/www/js/noty/layouts/topRight.js.gz -domoticz/www/js/noty/promise.js.gz -domoticz/www/js/noty/themes/default.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/respond.min.js.gz domoticz/www/js/ui-bootstrap.min.js.gz @@ -1517,7 +1699,6 @@ domoticz/www/media/tree.png domoticz/www/ozwcp/cp.html domoticz/www/ozwcp/cp.js -domoticz/www/ozwcp/ozwcp.html domoticz/www/robots.txt domoticz/www/secpanel/css/style.css domoticz/www/secpanel/font/Audiowide.eot @@ -1594,8 +1775,6 @@ domoticz/www/views/history.html domoticz/www/views/lights.html domoticz/www/views/log.html -domoticz/www/views/log/device_graph_log.html -domoticz/www/views/log/device_temperature_log.html domoticz/www/views/login.html domoticz/www/views/logout.html domoticz/www/views/mobile_notifications.html @@ -1604,7 +1783,6 @@ domoticz/www/views/offline.html domoticz/www/views/restoredatabase.html domoticz/www/views/rfxcomfirmware.html -domoticz/www/views/roomplan.html domoticz/www/views/scenes.html domoticz/www/views/setup.html domoticz/www/views/temperature.html @@ -1618,6 +1796,39 @@ domoticz/www/views/utility.html domoticz/www/views/weather.html domoticz/www/views/weather_widget.html -domoticz/www/zwavetopology.html +%%SMQTT%%domoticz/bin/mosquitto_passwd +%%SMQTT%%domoticz/bin/mosquitto_pub +%%SMQTT%%domoticz/bin/mosquitto_rr +%%SMQTT%%domoticz/bin/mosquitto_sub +%%SMQTT%%domoticz/etc/mosquitto/aclfile.example +%%SMQTT%%domoticz/etc/mosquitto/mosquitto.conf +%%SMQTT%%domoticz/etc/mosquitto/pskfile.example +%%SMQTT%%domoticz/etc/mosquitto/pwfile.example +%%SMQTT%%domoticz/include/mosquitto.h +%%SMQTT%%domoticz/include/mosquitto_broker.h +%%SMQTT%%domoticz/include/mosquitto_plugin.h +%%SMQTT%%domoticz/include/mosquittopp.h +%%SMQTT%%domoticz/lib/libmosquitto_static.a +%%SMQTT%%domoticz/lib/libmosquittopp_static.a +%%SMQTT%%domoticz/sbin/mosquitto +%%SJSONCPP%%domoticz/include/json/allocator.h +%%SJSONCPP%%domoticz/include/json/assertions.h +%%SJSONCPP%%domoticz/include/json/config.h +%%SJSONCPP%%domoticz/include/json/forwards.h +%%SJSONCPP%%domoticz/include/json/json.h +%%SJSONCPP%%domoticz/include/json/json_features.h +%%SJSONCPP%%domoticz/include/json/reader.h +%%SJSONCPP%%domoticz/include/json/value.h +%%SJSONCPP%%domoticz/include/json/version.h +%%SJSONCPP%%domoticz/include/json/writer.h +%%SJSONCPP%%domoticz/lib/cmake/jsoncpp/jsoncppConfig-%%CMAKE_BUILD_TYPE%%.cmake +%%SJSONCPP%%domoticz/lib/cmake/jsoncpp/jsoncppConfig.cmake +%%SJSONCPP%%domoticz/lib/cmake/jsoncpp/jsoncppConfigVersion.cmake +%%SJSONCPP%%domoticz/lib/libjsoncpp.a +%%SSQLITE%%domoticz/cmake/SQLite3Config-%%CMAKE_BUILD_TYPE%%.cmake +%%SSQLITE%%domoticz/cmake/SQLite3Config.cmake +%%SSQLITE%%domoticz/include/sqlite3.h +%%SSQLITE%%domoticz/include/sqlite3_config.h +%%SSQLITE%%domoticz/lib/libsqlite3.a @dir(domoticz,domoticz) /var/db/domoticz @dir(domoticz,domoticz) /var/run/domoticz