Merged testing

Homegear · Jul 30, 2019 · 5496af6 · 5496af6
2 parents cfd73e8 + e415f7d
commit 5496af6
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 267 deletions.
diff --git a/getVersion.sh b/getVersion.sh
@@ -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
+g++ -std=c++11 -o $dir/libhomegear-base-version $dir/libhomegear-base-version.cpp -lhomegear-base -lgcrypt -lgnutls -lpthread -latomic
 chmod 755 $dir/libhomegear-base-version
 $dir/libhomegear-base-version
 rm -Rf $dir
diff --git a/src/PhilipsHue.cpp b/src/PhilipsHue.cpp
@@ -32,6 +32,8 @@
 #include "PhilipsHueCentral.h"
 #include "GD.h"
 
+#include <iomanip>
+
 namespace PhilipsHue
 {
 
@@ -55,6 +57,7 @@ void PhilipsHue::dispose()
 {
 	if(_disposed) return;
 	DeviceFamily::dispose();
+    _central.reset();
 	GD::interfaces.reset();
 	_physicalInterfaces.reset();
 }
@@ -111,7 +114,7 @@ PVariable PhilipsHue::getPairingInfo()
 		field->structValue->emplace("label", std::make_shared<BaseLib::Variable>(std::string("l10n.philipshue.pairingInfo.pollingInterval")));
 		field->structValue->emplace("type", std::make_shared<BaseLib::Variable>(std::string("integer")));
 		field->structValue->emplace("default", std::make_shared<BaseLib::Variable>(5000));
-		familySettings->structValue->emplace("pollingIntervall", field);
+		familySettings->structValue->emplace("pollingInterval", field);
 
 		info->structValue->emplace("familySettings", familySettings);
 		//}}}