Merge branch 'master' into EcoDevices

CMakeLists.txt

@@ -396,7 +396,11 @@ hardware/ZWaveBase.cpp
 hardware/Yeelight.cpp
 hardware/XiaomiGateway.cpp
 hardware/Arilux.cpp
+hardware/plugins/DelayedLink.cpp
+hardware/plugins/Plugins.cpp
 hardware/plugins/PluginManager.cpp
+hardware/plugins/PluginTransports.cpp
+hardware/plugins/PluginProtocols.cpp
 notifications/NotificationBase.cpp
 notifications/NotificationEmail.cpp
 notifications/NotificationGCM.cpp

History.txt

@@ -15,9 +15,11 @@ Version 3.xxxx (January xth 2017)
 - Implemented: Blinds T1 till T13 new supports the Stop button
 - Implemented: Devices, Log icon for Blinds
 - Implemented: Blockly/Lua Set SetPoint option
+- Implemented: Estonian Language support (big thanks to Kuido)
 - Implemented: I2C BME280 sensor (temp+hum+baro)
 - Implemented: I2C for non arm systems
 - Implemented: InfluxDB Data push
+- Implemented: Latvian Language support (big thanks to Edgars)
 - Implemented: Netatmo Home Coach support
 - Implemented: Notification for Dummy Soil/Moisture sensor
 - Implemented: Notification for Alert Sensor via udevice JSON call

MQTT/config.h

@@ -26,3 +26,6 @@
 
 #define WITH_THREADING
 
+#ifndef EPROTO
+#  define EPROTO ECONNABORTED
+#endif

hardware/ToonThermostat.cpp

@@ -328,7 +328,7 @@ bool CToonThermostat::Login()
 	Json::Value root;
 	Json::Reader jReader;
 	bool bRet = jReader.parse(sResult, root);
-	if ((!bRet) || (!root.isObject()))
+	if (!bRet)
 	{
 		_log.Log(LOG_ERROR, "ToonThermostat: Invalid data received, or invalid username/password!");
 		return false;
@@ -387,7 +387,7 @@ bool CToonThermostat::Login()
 
 	root.clear();
 	bRet = jReader.parse(sResult, root);
-	if ((!bRet) || (!root.isObject()))
+	if (!bRet)
 	{
 		_log.Log(LOG_ERROR, "ToonThermostat: Invalid data received!");
 		return false;
@@ -483,7 +483,7 @@ bool CToonThermostat::SwitchLight(const std::string &UUID, const int SwitchState
 	Json::Value root;
 	Json::Reader jReader;
 	bool bRet = jReader.parse(sResult, root);
-	if ((!bRet) || (!root.isObject()))
+	if (!bRet)
 	{
 		_log.Log(LOG_ERROR, "ToonThermostat: Invalid data received!");
 		return false;
@@ -527,7 +527,7 @@ bool CToonThermostat::SwitchAll(const int SwitchState)
 	Json::Value root;
 	Json::Reader jReader;
 	bool bRet = jReader.parse(sResult, root);
-	if ((!bRet) || (!root.isObject()))
+	if (!bRet)
 	{
 		_log.Log(LOG_ERROR, "ToonThermostat: Invalid data received!");
 		return false;
@@ -626,7 +626,7 @@ void CToonThermostat::GetMeterDetails()
 
 	Json::Reader jReader;
 	bool bRet = jReader.parse(sResult, root);
-	if ((!bRet) || (!root.isObject()))
+	if (!bRet)
 	{
 		_log.Log(LOG_ERROR, "ToonThermostat: Invalid data received!");
 		m_bDoLogin = true;
@@ -925,7 +925,7 @@ void CToonThermostat::SetSetpoint(const int idx, const float temp)
 		Json::Value root;
 		Json::Reader jReader;
 		bool bRet = jReader.parse(sResult, root);
-		if ((!bRet) || (!root.isObject()))
+		if (!bRet)
 		{
 			_log.Log(LOG_ERROR, "ToonThermostat: Invalid data received!");
 			m_bDoLogin = true;
@@ -983,7 +983,7 @@ void CToonThermostat::SetProgramState(const int newState)
 	Json::Value root;
 	Json::Reader jReader;
 	bool bRet = jReader.parse(sResult, root);
-	if ((!bRet) || (!root.isObject()))
+	if (!bRet)
 	{
 		_log.Log(LOG_ERROR, "ToonThermostat: setProgramState request not successful, restarting..!");
 		m_bDoLogin = true;