Skip to content

Commit bd9279c

Browse files
committed
2 parents c09e9a6 + b17ead3 commit bd9279c

File tree

308 files changed

+15351
-9228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+15351
-9228
lines changed

.travis.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ update-alternatives:
1414
sources:
1515
- trusty
1616

17-
18-
# Domoticz ftp server account & encrypted password
19-
env:
20-
global:
21-
- "FTP_HOST=188.166.24.182"
22-
- "FTP_USER=uploads@domoticz.com"
23-
2417
# What to install before the build
2518
before_install:
2619
# Domoticz needs the full history to be able to calculate the version string
@@ -66,11 +59,11 @@ matrix:
6659
- make
6760
# Apple OSX
6861
- os: osx
62+
osx_image: xcode6.2
6963
compiler:
7064
- gcc
7165
env: TARGET_ARCHITECTURE=x86_64
7266
install:
73-
- brew install cmake
7467
- brew install boost|| true
7568
- brew install boost-python|| true
7669
- brew install libusb
@@ -79,8 +72,7 @@ matrix:
7972
- brew install openssl
8073
- brew link openssl --force
8174
- brew install md5sha1sum
82-
- export LDFLAGS=-L/usr/local/opt/openssl/lib
83-
- export CPPFLAGS=-I/usr/local/opt/openssl/include
75+
- export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
8476
script:
8577
- cmake -DCMAKE_BUILD_TYPE=Release
8678
- make

CMakeLists.txt

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,21 @@ SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL
6161
"Where to put the executables for Domoticz"
6262
)
6363

64+
INCLUDE(CheckIncludeFile)
65+
CHECK_INCLUDE_FILE (execinfo.h HAVE_EXECINFO_H)
66+
67+
IF(HAVE_EXECINFO_H)
68+
# FreeBSD have to include libexeinfo
69+
IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
70+
find_library(EXECINFO_LIBRARIES NAMES libexecinfo.so)
71+
IF(EXECINFO_LIBRARIES)
72+
ADD_DEFINITIONS(-DHAVE_EXECINFO_H)
73+
ENDIF()
74+
ELSE()
75+
ADD_DEFINITIONS(-DHAVE_EXECINFO_H)
76+
ENDIF()
77+
ENDIF(HAVE_EXECINFO_H)
78+
6479
#set(CMAKE_EXE_LINKER_FLAGS "-static")
6580

6681
# Macro for setting up precompiled headers. Usage:
@@ -227,12 +242,15 @@ hardware/AnnaThermostat.cpp
227242
hardware/ASyncSerial.cpp
228243
hardware/ASyncTCP.cpp
229244
hardware/AtagOne.cpp
245+
hardware/BleBox.cpp
230246
hardware/Comm5TCP.cpp
231247
hardware/Comm5Serial.cpp
232248
hardware/csocket.cpp
233249
hardware/CurrentCostMeterBase.cpp
234250
hardware/CurrentCostMeterSerial.cpp
235251
hardware/CurrentCostMeterTCP.cpp
252+
hardware/Daikin.cpp
253+
hardware/DarkSky.cpp
236254
hardware/DavisLoggerSerial.cpp
237255
hardware/DenkoviSmartdenLan.cpp
238256
hardware/DomoticzHardware.cpp
@@ -242,15 +260,17 @@ hardware/Dummy.cpp
242260
hardware/EcoDevices.cpp
243261
hardware/EnOceanESP2.cpp
244262
hardware/EnOceanESP3.cpp
263+
hardware/Ec3kMeterTCP.cpp
245264
hardware/evohome.cpp
246265
hardware/ETH8020.cpp
247266
hardware/Fitbit.cpp
248-
hardware/ForecastIO.cpp
249267
hardware/FritzboxTCP.cpp
268+
hardware/GoodweAPI.cpp
250269
hardware/Gpio.cpp
251270
hardware/GpioPin.cpp
252271
hardware/HardwareMonitor.cpp
253272
hardware/HarmonyHub.cpp
273+
hardware/HEOS.cpp
254274
hardware/I2C.cpp
255275
hardware/ICYThermostat.cpp
256276
hardware/KMTronicBase.cpp
@@ -263,13 +283,15 @@ hardware/LogitechMediaServer.cpp
263283
hardware/Meteostick.cpp
264284
hardware/MochadTCP.cpp
265285
hardware/MQTT.cpp
286+
hardware/MultiFun.cpp
266287
hardware/MySensorsBase.cpp
267288
hardware/MySensorsSerial.cpp
268289
hardware/MySensorsTCP.cpp
269290
hardware/NefitEasy.cpp
270291
hardware/Nest.cpp
271292
hardware/Netatmo.cpp
272293
hardware/HttpPoller.cpp
294+
hardware/OpenWeatherMap.cpp
273295
hardware/OpenWebNet.cpp
274296
hardware/openwebnet/bt_openwebnet.cpp
275297
hardware/OpenZWave.cpp
@@ -317,7 +339,11 @@ hardware/Winddelen.cpp
317339
hardware/WOL.cpp
318340
hardware/Wunderground.cpp
319341
hardware/YouLess.cpp
342+
hardware/ZiBlueBase.cpp
343+
hardware/ZiBlueSerial.cpp
344+
hardware/ZiBlueTCP.cpp
320345
hardware/ZWaveBase.cpp
346+
hardware/Yeelight.cpp
321347
notifications/NotificationBase.cpp
322348
notifications/NotificationEmail.cpp
323349
notifications/NotificationGCM.cpp
@@ -329,6 +355,7 @@ notifications/NotificationNma.cpp
329355
notifications/NotificationPushbullet.cpp
330356
notifications/NotificationProwl.cpp
331357
notifications/NotificationPushover.cpp
358+
notifications/NotificationPushsafer.cpp
332359
notifications/NotificationPushalot.cpp
333360
notifications/NotificationSMS.cpp
334361
smtpclient/SMTPClient.cpp
@@ -573,26 +600,10 @@ else()
573600
message(STATUS "Not found telldus-core (telldus-core.h), not adding tellstick support")
574601
endif (TELLDUSCORE_INCLUDE)
575602

576-
# Under FreeBSD sys/sysinfo?h exist using a separate pkg
577-
IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
578-
find_path(SYSINFO_INCLUDE NAMES sys/sysinfo.h)
579-
if (SYSINFO_INCLUDE)
580-
message(STATUS "Found sys/sysinfo.h at : ${SYSINFO_INCLUDE}")
581-
find_library(SYSINFO_LIBRARIES NAMES libsysinfo.so)
582-
if(SYSINFO_LIBRARIES)
583-
message(STATUS "Found libsysinfo.so at : ${SYSINFO_LIBRARIES}")
584-
else(SYSINFO_LIBRARIES)
585-
message(FATAL_ERROR "Cannot find libsysinfo, please install it with 'pkg install libsysinfo'")
586-
endif(SYSINFO_LIBRARIES)
587-
else()
588-
message(FATAL_ERROR "Cannot find sysinfo.h, please install it with 'pkg install libsysinfo'")
589-
endif()
590-
ENDIF()
591-
592603
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
593604
target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
594605
else()
595-
target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${SYSINFO_LIBRARIES})
606+
target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${EXECINFO_LIBRARIES})
596607
ENDIF()
597608

598609
ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h")
@@ -646,6 +657,7 @@ install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX})
646657
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX})
647658
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
648659
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
660+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION ${CMAKE_INSTALL_PREFIX})
649661
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
650662
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX})
651663
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)

Config/BeNext/PanicButton.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<Value type="button" genre="config" instance="1" index="1" label="Set to Default" size="1" value="0">
88
<Help>Set all configuration values to default values (factory settings).</Help>
99
</Value>
10-
<Value type="int" genre="config" instance="1" index="2" label="Time to press the panic button" size="1" min="0" max="255" value="100" >
10+
<Value type="byte" genre="config" instance="1" index="2" label="Time to press the panic button" size="1" min="0" max="255" value="100" >
1111
<Help>
1212
The time that the panic pushbutton must be pressed before a (panic) message is sent out to the controller.
1313
0: send directly the panic message when pressed.
1414
1-255: send a panic message after you keep holding the button pressed for this value x 10ms.
1515
</Help>
1616
</Value>
17-
<Value type="int" genre="config" instance="1" index="3" label="Min led feedback time panic" size="1" min="0" max="255" value="100" >
17+
<Value type="byte" genre="config" instance="1" index="3" label="Min led feedback time panic" size="1" min="0" max="255" value="100" >
1818
<Help>
1919
Minimum time that led feedback is shown after a panic message.
2020
0: led only stays on during the send time.
@@ -35,7 +35,7 @@
3535
1-255: send a control message after you keep holding pushbutton pressed for this value x 10ms.
3636
</Help>
3737
</Value>
38-
<Value type="int" genre="config" instance="1" index="6" label="Min led feedback time control" size="1" min="0" max="255" value="50">
38+
<Value type="byte" genre="config" instance="1" index="6" label="Min led feedback time control" size="1" min="0" max="255" value="50">
3939
<Help>
4040
Minimum time that led feedback is shown after a control message is sent.
4141
0: led only stays on during the send time.

Config/BeNext/PanicWatch.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Benext Panic Watch
4+
http://www.benext.eu/static/manual/panicwatch.pdf
5+
-->
6+
<Product xmlns='http://code.google.com/p/open-zwave/'>
7+
<!-- Configuration -->
8+
<CommandClass id="112">
9+
<Value type="button" genre="config" instance="1" index="1" label="Set to Default" size="1" value="0">
10+
<Help>Set all configuration values to default values (factory settings).</Help>
11+
</Value>
12+
<Value type="byte" genre="config" instance="1" index="2" label="Time to press the panic Watch" size="1" min="0" max="255" value="100" >
13+
<Help>
14+
The time that the panic pushbutton must be pressed before a (panic) message is sent out to the controller.
15+
0: send directly the panic message when pressed.
16+
1-255: send a panic message after you keep holding the button pressed for this value x 10ms.
17+
</Help>
18+
</Value>
19+
<Value type="byte" genre="config" instance="1" index="3" label="Min led feedback time panic" size="1" min="0" max="255" value="100" >
20+
<Help>
21+
Minimum time that led feedback is shown after a panic message.
22+
0: led only stays on during the send time.
23+
1-255: led stays on during send time + this value*10ms.
24+
</Help>
25+
</Value>
26+
<Value type="byte" genre="config" instance="1" index="4" label="Buttons mapped" size="1" min="0" max="255" value="0">
27+
<Help>
28+
With this config parameter you can map the buttons to send different Z-Wave messages.
29+
0: SOS button sends an ALARM_REPORT to nodes group 1.
30+
1-255: SOS button sends an BASIC_SET, 0xFF to nodes group 1.
31+
</Help>
32+
</Value>
33+
</CommandClass>
34+
<!-- Basic set as report -->
35+
<CommandClass id="32" setasreport="true" />
36+
37+
<!-- Association Groups -->
38+
<CommandClass id="133">
39+
<Associations num_groups="2">
40+
<Group index="1" max_associations="8" label="Report"/>
41+
<Group index="2" max_associations="8" label="Not used"/>
42+
</Associations>
43+
</CommandClass>
44+
</Product>

0 commit comments

Comments
 (0)