Skip to content

Commit

Permalink
Merged testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@hfedcba
hfedcba committed Jul 30, 2019
2 parents a185ae8 + 920c44d commit 5ab6865
Show file tree
Hide file tree
Showing 161 changed files with 17,397 additions and 9,813 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,11 @@ set(SOURCE_FILES
src/WebServer/WebServer.cpp
src/WebServer/WebServer.h
src/main.cpp
src/IpcLogger.cpp
src/IpcLogger.h
src/Monitor.cpp
src/Monitor.h
config.h)
config.h src/Database/SystemVariableController.cpp src/Database/SystemVariableController.h)

add_custom_target(homegear COMMAND ../../devscripts/makeAll.sh SOURCES ${SOURCE_FILES})

Expand Down
5 changes: 0 additions & 5 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,4 @@ AS_IF([test "x$with_i2c" != "xno"], [
AC_DEFINE(I2CSUPPORT, [], [Enables compilation of all I2C interfaces and I2C support in PHP])
])

AC_ARG_ENABLE(sesocketdebug, AS_HELP_STRING([--enable-sesocketdebug], [Enable logging of script engine communication to PCAP file, default: no]), [sesocketdebug=true], [sesocketdebug=false])
AS_IF([test "x$sesocketdebug" = "xtrue"], [
AC_DEFINE(DEBUGSESOCKET, [], [Enable debugging of scriptengine communication])
])

AC_OUTPUT(Makefile src/Makefile homegear-miscellaneous/src/Makefile)
2 changes: 1 addition & 1 deletion debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Homepage: https://homegear.eu

Package: homegear
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libhomegear-base (= <BASELIBVER>), libhomegear-node, libhomegear-ipc, wget, libsqlite3-0 (>= 3.7.13), libreadline7 | libreadline6, adduser (>= 3.113), libgcrypt20, libgnutlsxx28, libgpg-error0 (>= 1.10), unzip (>= 6.0), p7zip-full (>= 9.0), procps, libxslt1.1, libedit2, libenchant1c2a, libqdbm14, libltdl7, zlib1g, libtinfo5, libgmp10, libxml2, libssl1.1 | libssl1.0.0, openssl, libcurl3-gnutls, libmariadbclient20 | libmariadbclient18 | libmysqlclient20 | libmysqlclient18, zlib1g, libicu52 | libicu55 | libicu57 | libicu60
Depends: ${shlibs:Depends}, ${misc:Depends}, libhomegear-base (= <BASELIBVER>), libhomegear-node, libhomegear-ipc, wget, libsqlite3-0 (>= 3.7.13), libreadline7 | libreadline6, adduser (>= 3.113), libgcrypt20, libgnutlsxx28, libgpg-error0 (>= 1.10), unzip (>= 6.0), p7zip-full (>= 9.0), procps, libxslt1.1, libedit2, libenchant1c2a, libqdbm14, libltdl7, zlib1g, libtinfo5 | libtinfo6, libgmp10, libxml2, libssl1.1 | libssl1.0.0, openssl, libcurl3-gnutls, zlib1g, libicu52 | libicu55 | libicu57 | libicu60 | libicu63
Replaces: homegear (<< 0.6)
Breaks: homegear (<< 0.6)
Description: Interface program to your smart home devices
Expand Down
3 changes: 2 additions & 1 deletion getVersion.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
dir=`mktemp -d`
cat > "$dir/libhomegear-base-version.cpp" <<-'EOF'
#include <homegear-base/BaseLib.h>
#include <iostream>
int main(int argc, char** argv)
{
std::cout << BaseLib::SharedObjects::version() << std::endl;
return 0;
}
EOF
g++ -std=c++11 -o $dir/libhomegear-base-version $dir/libhomegear-base-version.cpp -lhomegear-base -lgcrypt -lgnutls -lpthread -latomic
g++ -std=c++11 -o $dir/libhomegear-base-version $dir/libhomegear-base-version.cpp -lhomegear-base -lgcrypt -lgnutls -lpthread -latomic -latomic
chmod 755 $dir/libhomegear-base-version
$dir/libhomegear-base-version
rm -Rf $dir
106 changes: 106 additions & 0 deletions homegear-miscellaneous/misc/Device Description Files/VirtualBlind.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<homegearDevice xmlns="https://homegear.eu/xmlNamespaces/HomegearDevice" version="1">
<supportedDevices xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<device id="VirtualBlind">
<description>VirtualBlind</description>
<typeNumber>0xF002</typeNumber>
</device>
</supportedDevices>
<properties/>
<functions xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="0" type="MAINTENANCE">
<properties>
<internal>true</internal>
</properties>
<configParameters>config</configParameters>
<variables>maint_ch0_values</variables>
</function>
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="1" type="VirtualBlind">
<variables>custom_ch1_values</variables>
</function>
</functions>
<parameterGroups xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<configParameters id="config"/>
<variables id="maint_ch0_values">
<parameter id="LOWBAT">
<properties>
<service>true</service>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
<variables id="custom_ch1_values">
<parameter id="LEVEL">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalInteger>
<minimumValue>0</minimumValue>
<maximumValue>100</maximumValue>
<defaultValue>0</defaultValue>
</logicalInteger>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="UP">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="DOWN">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="STOP">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="STATE_LEVEL">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalInteger>
<minimumValue>0</minimumValue>
<maximumValue>100</maximumValue>
<defaultValue>0</defaultValue>
</logicalInteger>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="STATE">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
</parameterGroups>
</homegearDevice>
12 changes: 12 additions & 0 deletions homegear-miscellaneous/misc/Device Description Files/VirtualDimmer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,25 @@ class HomegearDevice extends HomegearDeviceBase
<internal>true</internal>
</properties>
<configParameters>config</configParameters>
<variables>maint_ch0_values</variables>
</function>
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="1" type="VirtualDimmer">
<variables>custom_ch1_values</variables>
</function>
</functions>
<parameterGroups xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<configParameters id="config"/>
<variables id="maint_ch0_values">
<parameter id="LOWBAT">
<properties>
<service>true</service>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
<variables id="custom_ch1_values">
<parameter id="LEVEL">
<properties>
Expand Down
48 changes: 48 additions & 0 deletions homegear-miscellaneous/misc/Device Description Files/VirtualSwitch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<homegearDevice xmlns="https://homegear.eu/xmlNamespaces/HomegearDevice" version="1">
<supportedDevices xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<device id="VirtualSwitch">
<description>VirtualSwitch</description>
<typeNumber>0xF004</typeNumber>
</device>
</supportedDevices>
<properties/>
<functions xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="0" type="MAINTENANCE">
<properties>
<internal>true</internal>
</properties>
<configParameters>config</configParameters>
<variables>maint_ch0_values</variables>
</function>
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="1" type="VirtualSwitch">
<variables>custom_ch1_values</variables>
</function>
</functions>
<parameterGroups xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<configParameters id="config"/>
<variables id="maint_ch0_values">
<parameter id="LOWBAT">
<properties>
<service>true</service>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
<variables id="custom_ch1_values">
<parameter id="STATE">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
</parameterGroups>
</homegearDevice>
100 changes: 100 additions & 0 deletions homegear-miscellaneous/misc/Device Description Files/VirtualThermostat.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<homegearDevice xmlns="https://homegear.eu/xmlNamespaces/HomegearDevice" version="1">
<supportedDevices xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<device id="VirtualThermostat">
<description>VirtualThermostat</description>
<typeNumber>0xF003</typeNumber>
</device>
</supportedDevices>
<properties/>
<functions xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="0" type="MAINTENANCE">
<properties>
<internal>true</internal>
</properties>
<configParameters>config</configParameters>
<variables>maint_ch0_values</variables>
</function>
<function xmlns="https://homegear.eu/xmlNamespaces/FunctionGroupType" channel="1" type="VirtualThermostat">
<variables>custom_ch1_values</variables>
</function>
</functions>
<parameterGroups xmlns="https://homegear.eu/xmlNamespaces/DeviceType">
<configParameters id="config"/>
<variables id="maint_ch0_values">
<parameter id="LOWBAT">
<properties>
<service>true</service>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
<variables id="custom_ch1_values">
<parameter id="ACTUAL_TEMPERATURE">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalFloat>
<minimumValue>4</minimumValue>
<maximumValue>30</maximumValue>
<defaultValue>19</defaultValue>
</logicalFloat>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="ACTUAL_HUMIDITY">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalFloat>
<minimumValue>0</minimumValue>
<maximumValue>100</maximumValue>
<defaultValue>50</defaultValue>
</logicalFloat>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="SET_TEMPERATURE">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalFloat>
<minimumValue>4</minimumValue>
<maximumValue>30</maximumValue>
<defaultValue>19</defaultValue>
</logicalFloat>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="MODE">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalString/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
<parameter id="STATE">
<properties>
<readable>true</readable>
<writeable>true</writeable>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
</parameterGroups>
</homegearDevice>
13 changes: 12 additions & 1 deletion homegear-miscellaneous/misc/Device Description Files/VirtualWindowContact.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<function channel="0" type="" channelCount="1">
<properties/>
<configParameters>custom_ch0_master</configParameters>
<variables>maint_ch0_values</variables>
</function>
<function channel="1" type="VirtualWindowContact" channelCount="1">
<properties/>
Expand All @@ -19,8 +20,18 @@
</functions>
<packets/>
<parameterGroups>
<configParameters id="config"/>
<configParameters id="custom_ch0_master" />
<variables id="maint_ch0_values">
<parameter id="LOWBAT">
<properties>
<service>true</service>
</properties>
<logicalBoolean/>
<physicalNone>
<operationType>store</operationType>
</physicalNone>
</parameter>
</variables>
<variables id="custom_ch1_values">
<parameter id="STATE">
<properties>
Expand Down

0 comments on commit 5ab6865

Please sign in to comment.