Merge branch 'master'

Author: rkluwen

CMakeLists.txt

@@ -208,7 +208,7 @@ hardware/MySensorsBase.cpp
 hardware/MySensorsSerial.cpp
 hardware/MySensorsTCP.cpp
 hardware/Nest.cpp
-hardware/NetatmoWeatherStation.cpp
+hardware/Netatmo.cpp
 hardware/OpenZWave.cpp
 hardware/openzwave/control_panel/ozwcp.cpp
 hardware/openzwave/control_panel/zwavelib.cpp

History.txt

@@ -21,6 +21,11 @@ Version 2.3xxx
 - Implemented: Netatmo, support for multiple weather stations (from the weathermap) and multiple rain sensors
 - Changed: OpenZwave, not sending cold-white in the colorclass, solved issues on different zipato bulbs
 - Changed: OpenZwave, kWh sensor now maybe compatible with more hardware
+- Fixed: Blockly, string uservariables where saved with quotes when not using with set-after
+- Implemented: Wind Graph, option to delete a short-log data point
+- Implemented: Wind Beaufort scale
+- Implemented: Nest Thermostat, support for multiple thermostats
+- Implemented: MySensors Ethernet gateway will now request the gateway version on startup
 
 Version 2.3530 (November 1th 2015)
 - Implemented: Degree Days in Temperature report

hardware/ASyncTCP.cpp

@@ -14,7 +14,8 @@
 
 ASyncTCP::ASyncTCP()
 	: mIsConnected(false), mIsClosing(false),
-	mSocket(mIos), mReconnectTimer(mIos)
+	mSocket(mIos), mReconnectTimer(mIos),
+	mDoReconnect(true), mIsReconnecting(false)
 {	
 }
 
@@ -144,18 +145,6 @@ bool ASyncTCP::set_tcp_keepalive()
 }
 */
 
-void ASyncTCP::read()
-{
-	if(!mIsConnected) return;
-	if(mIsClosing) return;
-
-	mSocket.async_read_some(boost::asio::buffer(m_buffer,sizeof(m_buffer)),
-		boost::bind(&ASyncTCP::handle_read,
-		this,
-		boost::asio::placeholders::error,
-		boost::asio::placeholders::bytes_transferred));
-}
-
 // callbacks
 
 void ASyncTCP::handle_connect(const boost::system::error_code& error) 
@@ -183,20 +172,42 @@ void ASyncTCP::handle_connect(const boost::system::error_code& error)
 		mIsConnected = false;
 
 		OnError(error);
-		_log.Log(LOG_ERROR,"TCP: Error: %s", error.message().c_str());
+		OnErrorInt(error);
 
-		// schedule a timer to reconnect after 30 seconds		
-		mReconnectTimer.expires_from_now(boost::posix_time::seconds(RECONNECT_TIME));
-		mReconnectTimer.async_wait(boost::bind(&ASyncTCP::do_reconnect, this, boost::asio::placeholders::error));
+		if (!mDoReconnect)
+		{
+			OnDisconnect();
+			return;
+		}
+		if (!mIsReconnecting)
+		{
+			mIsReconnecting = true;
+			_log.Log(LOG_STATUS, "TCP: Reconnecting in %d seconds...", RECONNECT_TIME);
+			// schedule a timer to reconnect after 30 seconds		
+			mReconnectTimer.expires_from_now(boost::posix_time::seconds(RECONNECT_TIME));
+			mReconnectTimer.async_wait(boost::bind(&ASyncTCP::do_reconnect, this, boost::asio::placeholders::error));
+		}
 	}
 }
 
+void ASyncTCP::read()
+{
+	if (!mIsConnected) return;
+	if (mIsClosing) return;
+
+	mSocket.async_read_some(boost::asio::buffer(m_buffer, sizeof(m_buffer)),
+		boost::bind(&ASyncTCP::handle_read,
+			this,
+			boost::asio::placeholders::error,
+			boost::asio::placeholders::bytes_transferred));
+}
+
 void ASyncTCP::handle_read(const boost::system::error_code& error, size_t bytes_transferred)
 {
 	if (!error)
 	{
-		//Read next
 		OnData(m_buffer,bytes_transferred);
+		//Read next
 		//This gives some work to the io_service before it is started
 		mIos.post(boost::bind(&ASyncTCP::read, this));
 	}
@@ -209,10 +220,19 @@ void ASyncTCP::handle_read(const boost::system::error_code& error, size_t bytes_
 
 			// let listeners know
 			OnError(error);
-			
-			// schedule a timer to reconnect after 30 seconds
-			mReconnectTimer.expires_from_now(boost::posix_time::seconds(RECONNECT_TIME));
-			mReconnectTimer.async_wait(boost::bind(&ASyncTCP::do_reconnect, this, boost::asio::placeholders::error));
+			if (!mDoReconnect)
+			{
+				OnDisconnect();
+				return;
+			}
+			if (!mIsReconnecting)
+			{
+				mIsReconnecting = true;
+				_log.Log(LOG_STATUS, "TCP: Reconnecting in %d seconds...", RECONNECT_TIME);
+				// schedule a timer to reconnect after 30 seconds
+				mReconnectTimer.expires_from_now(boost::posix_time::seconds(RECONNECT_TIME));
+				mReconnectTimer.async_wait(boost::bind(&ASyncTCP::do_reconnect, this, boost::asio::placeholders::error));
+			}
 		}
 		else
 			do_close();
@@ -229,9 +249,20 @@ void ASyncTCP::write_end(const boost::system::error_code& error)
 			OnError(error);
 
 			mIsConnected = false;
-			// schedule a timer to reconnect after 30 seconds
-			mReconnectTimer.expires_from_now(boost::posix_time::seconds(RECONNECT_TIME));
-			mReconnectTimer.async_wait(boost::bind(&ASyncTCP::do_reconnect, this, boost::asio::placeholders::error));
+
+			if (!mDoReconnect)
+			{
+				OnDisconnect();
+				return;
+			}
+			if (!mIsReconnecting)
+			{
+				mIsReconnecting = true;
+				_log.Log(LOG_STATUS, "TCP: Reconnecting in %d seconds...", RECONNECT_TIME);
+				// schedule a timer to reconnect after 30 seconds
+				mReconnectTimer.expires_from_now(boost::posix_time::seconds(RECONNECT_TIME));
+				mReconnectTimer.async_wait(boost::bind(&ASyncTCP::do_reconnect, this, boost::asio::placeholders::error));
+			}
 		}
 	}
 }
@@ -270,7 +301,37 @@ void ASyncTCP::do_reconnect(const boost::system::error_code& error)
 	// close current socket if necessary
 	mSocket.close();
 
+	if (!mDoReconnect)
+	{
+		return;
+	}
+	mReconnectTimer.cancel();
 	// try to reconnect, then call handle_connect
+	_log.Log(LOG_STATUS, "TCP: Reconnecting...");
 	mSocket.async_connect(mEndPoint,
         boost::bind(&ASyncTCP::handle_connect, this, boost::asio::placeholders::error));
+	mIsReconnecting = false;
+}
+
+void ASyncTCP::OnErrorInt(const boost::system::error_code& error)
+{
+	if (
+		(error == boost::asio::error::address_in_use) ||
+		(error == boost::asio::error::connection_refused) ||
+		(error == boost::asio::error::access_denied) ||
+		(error == boost::asio::error::host_unreachable) ||
+		(error == boost::asio::error::timed_out)
+		)
+	{
+		_log.Log(LOG_STATUS, "TCP: Connection problem (Unable to connect to specified IP/Port)");
+	}
+	else if (
+		(error == boost::asio::error::eof) ||
+		(error == boost::asio::error::connection_reset)
+		)
+	{
+		_log.Log(LOG_STATUS, "TCP: Connection reset! (Disconnected)");
+	}
+	else
+		_log.Log(LOG_ERROR, "TCP: Error: %s", error.message().c_str());
 }

hardware/ASyncTCP.h

@@ -44,9 +44,13 @@ class ASyncTCP
 	virtual void OnError(const std::exception e)=0;
 	virtual void OnError(const boost::system::error_code& error)=0;
 
+	void OnErrorInt(const boost::system::error_code& error);
+
 protected:
 	bool							mIsConnected;
 	bool							mIsClosing;
+	bool							mDoReconnect;
+	bool							mIsReconnecting;
 
 	boost::asio::ip::tcp::endpoint	mEndPoint;
 

hardware/DomoticzHardware.h

@@ -98,7 +98,7 @@ class CDomoticzHardwareBase
 	friend class CNest;
 	friend class CThermosmart;
 	friend class CKodi;
-	friend class CNetAtmoWeatherStation;
+	friend class CNetatmo;
 	friend class CAnnaThermostat;
 	friend class SatelIntegra;
 	friend class CLogitechMediaServer;

hardware/EnOceanESP3.cpp

@@ -136,8 +136,8 @@ typedef enum
 	CO_RD_FILTER		= 15,	//! Read supplied filters
 	CO_WR_WAIT_MATURITY	= 16,	//! Waiting till end of maturity time before received radio telegrams will transmitted
 	CO_WR_SUBTEL		= 17,	//! Enable/Disable transmitting additional subtelegram info
-	CO_WR_MEM			= 18,	//! Write x bytes of the Flash, XRAM, RAM0 ….
-	CO_RD_MEM			= 19,	//! Read x bytes of the Flash, XRAM, RAM0 ….
+	CO_WR_MEM			= 18,	//! Write x bytes of the Flash, XRAM, RAM0 ….
+	CO_RD_MEM			= 19,	//! Read x bytes of the Flash, XRAM, RAM0 ….
 	CO_RD_MEM_ADDRESS	= 20,	//! Feedback about the used address and length of the config area and the Smart Ack Table
 	CO_RD_SECURITY		= 21,	//! Read security informations (level, keys)
 	CO_WR_SECURITY		= 22,	//! Write security informations (level, keys)
@@ -1194,8 +1194,8 @@ void CEnOceanESP3::ParseRadioDatagram()
 							// [Eltako FTR55D, FTR55H, Thermokon SR04 *, Thanos SR *, untested]
 							// DATA_BYTE3 is the fan speed or night reduction for Eltako
 							// DATA_BYTE2 is the setpoint where 0x00 = min ... 0xFF = max or
-							// reference temperature for Eltako where 0x00 = 0°C ... 0xFF = 40°C
-							// DATA_BYTE1 is the temperature where 0x00 = +40°C ... 0xFF = 0°C
+							// reference temperature for Eltako where 0x00 = 0°C ... 0xFF = 40°C
+							// DATA_BYTE1 is the temperature where 0x00 = +40°C ... 0xFF = 0°C
 							// DATA_BYTE0_bit_0 is the occupy button, pushbutton or slide switch
 							float temp=GetValueRange(DATA_BYTE1,0,40);
 							if (Manufacturer == 0x0D) 
@@ -1344,7 +1344,7 @@ void CEnOceanESP3::ParseRadioDatagram()
 						tsen.TEMP.temperaturel=(BYTE)(at10);
 						sDecodeRXMessage(this, (const unsigned char *)&tsen.TEMP);
 					}
-					else if (szST == "TempHum")
+					else if (szST.find("TempHum")==0)
 					{
 						//(EPP A5-04 01/02)
 						float ScaleMax = 0;

hardware/FritzboxTCP.cpp

@@ -148,7 +148,25 @@ void FritzboxTCP::OnError(const std::exception e)
 
 void FritzboxTCP::OnError(const boost::system::error_code& error)
 {
-	_log.Log(LOG_ERROR,"Fritzbox: Error: %s",error.message().c_str());
+	if (
+		(error == boost::asio::error::address_in_use) ||
+		(error == boost::asio::error::connection_refused) ||
+		(error == boost::asio::error::access_denied) ||
+		(error == boost::asio::error::host_unreachable) ||
+		(error == boost::asio::error::timed_out)
+		)
+	{
+		_log.Log(LOG_STATUS, "Fritzbox: Can not connect to: %s:%ld", m_szIPAddress.c_str(), m_usIPPort);
+	}
+	else if (
+		(error == boost::asio::error::eof) ||
+		(error == boost::asio::error::connection_reset)
+		)
+	{
+		_log.Log(LOG_STATUS, "Fritzbox: Connection reset!");
+	}
+	else
+		_log.Log(LOG_ERROR, "Fritzbox: %s", error.message().c_str());
 }
 
 bool FritzboxTCP::WriteToHardware(const char *pdata, const unsigned char length)

hardware/MochadTCP.cpp

@@ -131,6 +131,7 @@ bool MochadTCP::StartHardware()
 
 bool MochadTCP::StopHardware()
 {
+	m_stoprequested = true;
 	if (isConnected())
 	{
 		try {
@@ -222,7 +223,25 @@ void MochadTCP::OnError(const std::exception e)
 
 void MochadTCP::OnError(const boost::system::error_code& error)
 {
-	_log.Log(LOG_ERROR, "Mochad: Error: %s", error.message().c_str());
+	if (
+		(error == boost::asio::error::address_in_use) ||
+		(error == boost::asio::error::connection_refused) ||
+		(error == boost::asio::error::access_denied) ||
+		(error == boost::asio::error::host_unreachable) ||
+		(error == boost::asio::error::timed_out)
+		)
+	{
+		_log.Log(LOG_STATUS, "Mochad: Can not connect to: %s:%ld", m_szIPAddress.c_str(), m_usIPPort);
+	}
+	else if (
+		(error == boost::asio::error::eof) ||
+		(error == boost::asio::error::connection_reset)
+		)
+	{
+		_log.Log(LOG_STATUS, "Mochad: Connection reset!");
+	}
+	else
+		_log.Log(LOG_ERROR, "Mochad: %s", error.message().c_str());
 }
 
 bool MochadTCP::WriteToHardware(const char *pdata, const unsigned char length)

hardware/MySensorsBase.cpp

@@ -231,7 +231,7 @@ void MySensorsBase::LoadDevicesFromDatabase()
 	boost::lock_guard<boost::mutex> l(readQueueMutex);
 	m_nodes.clear();
 
-	std::vector<std::vector<std::string> > result;
+	std::vector<std::vector<std::string> > result,result2;
 	result = m_sql.safe_query("SELECT ID, Name, SketchName, SketchVersion FROM MySensors WHERE (HardwareID=%d) ORDER BY ID ASC", m_HwdID);
 	if (result.size() > 0)
 	{
@@ -251,6 +251,23 @@ void MySensorsBase::LoadDevicesFromDatabase()
 			mNode.SketchName = SkectName;
 			mNode.SketchVersion = SkectVersion;
 			mNode.lastreceived = 0;
+			//Load the Childs
+			result2 = m_sql.safe_query("SELECT ChildID, [Type], [Name], UseAck FROM MySensorsChilds WHERE (HardwareID=%d) AND (NodeID=%d) ORDER BY ChildID ASC", m_HwdID, ID);
+			if (result2.size() > 0)
+			{
+				std::vector<std::vector<std::string> >::const_iterator itt2;
+				for (itt2 = result2.begin(); itt2 != result2.end(); ++itt2)
+				{
+					std::vector<std::string> sd2 = *itt2;
+					_tMySensorChild mSensor;
+					mSensor.nodeID = ID;
+					mSensor.childID = atoi(sd2[0].c_str());
+					mSensor.presType = (_ePresentationType)atoi(sd2[1].c_str());
+					mSensor.childName = sd2[2];
+					mSensor.useAck = atoi(sd2[3].c_str()) != 0;
+					mNode.m_childs.push_back(mSensor);
+				}
+			}
 			m_nodes[ID] = mNode;
 		}
 	}
@@ -1144,12 +1161,12 @@ bool MySensorsBase::WriteToHardware(const char *pdata, const unsigned char lengt
 			if ((light_command == light2_sOn) || (light_command == light2_sOff))
 			{
 				std::string lState = (light_command == light2_sOn) ? "1" : "0";
-				if (FindChildWithValueType(node_id, V_LOCK_STATUS) != NULL)
+				if (pChild->presType == S_LOCK)
 				{
 					//Door lock
 					return SendNodeSetCommand(node_id, child_sensor_id, MT_Set, V_LOCK_STATUS, lState, pChild->useAck);
 				}
-				else if ((FindChildWithValueType(node_id, V_SCENE_ON) != NULL) || (FindChildWithValueType(node_id, V_SCENE_OFF) != NULL))
+				else if (pChild->presType == S_SCENE_CONTROLLER)
 				{
 					//Scene Controller
 					return SendNodeSetCommand(node_id, child_sensor_id, MT_Set, (light_command == light2_sOn) ? V_SCENE_ON : V_SCENE_OFF, lState, pChild->useAck);
@@ -1515,6 +1532,10 @@ void MySensorsBase::ParseLine()
 				SendNodeCommand(node_id, child_sensor_id, message_type, I_TIME, sstr.str());
 			}
 			break;
+		case I_HEARTBEAT:
+			//Received a heartbeat
+			while (1 == 0);
+			break;
 		default:
 			while (1==0);
 			break;

hardware/MySensorsBase.h

@@ -140,6 +140,8 @@ class MySensorsBase : public CDomoticzHardwareBase
 		I_REQUEST_SIGNING = 15,			//Used between sensors when initiating signing.
 		I_GET_NONCE = 16,				//Used between sensors when requesting nonce.
 		I_GET_NONCE_RESPONSE = 17,		//Used between sensors for nonce response.
+		I_HEARTBEAT = 18,
+		I_PRESENTATION = 19
 	};
 
 	struct _tMySensorValue