Merge pull request #403 from JohnAdders/currentcost

Add support for multiple meters and throttle temp updates

Author: gizmocuz

hardware/CurrentCostMeterBase.cpp

@@ -1,7 +1,8 @@
 #include "stdafx.h"
 #include "CurrentCostMeterBase.h"
 
-CurrentCostMeterBase::CurrentCostMeterBase(void)
+CurrentCostMeterBase::CurrentCostMeterBase(void) :
+	m_tempuratureCounter(0)
 {
 	Init();
 }
@@ -55,17 +56,18 @@ void CurrentCostMeterBase::ExtractReadings()
 	}
 
 	float temp;
-	float sensor;
+	float sensor(0.0);
 	float type;
 	float reading;
 
-	// if we have the sensor tag then only do the whle house one
+	// if we have the sensor tag then read it
 	// earlier versions don't have this
 	if(m_buffer.find("<sensor>") != std::string::npos)
 	{
-		if(!ExtractNumberBetweenStrings("<sensor>", "</sensor>", &sensor) || sensor != 0.0)
+		if(!ExtractNumberBetweenStrings("<sensor>", "</sensor>", &sensor) || sensor > 9.0)
 		{
-			// not the whole house sensor, ignore
+			// no sensor end tag found or too high a sensor number 
+			// indicating data must be corrupt
 			return;
 		}
 	}
@@ -76,9 +78,14 @@ void CurrentCostMeterBase::ExtractReadings()
 		return;
 	}
 
-	if(ExtractNumberBetweenStrings("<tmpr>", "</tmpr>", &temp))
+	// get the temp and only process if it is from the whole house sensor
+	if(ExtractNumberBetweenStrings("<tmpr>", "</tmpr>", &temp) && sensor == 0.0)
 	{
-		SendTempSensor(1, 255, temp, "Temp");
+		// only send the temp once a minute to avoid filling up the db
+		if((m_tempuratureCounter++ % 10) == 0)
+		{
+			SendTempSensor(1, 255, temp, "Temp");
+		}
 	}
 
 	float totalPower(0.0);
@@ -94,7 +101,20 @@ void CurrentCostMeterBase::ExtractReadings()
 	{
 		totalPower += reading;
 	}
-	SendWattMeter(2, 1, 255, totalPower, "CC Power");
+	if(sensor == 0.0)
+	{
+		SendWattMeter(2, 1, 255, totalPower, "CC Whole House Power");
+	}
+	else
+	{
+		// create a suitable default name
+		// there can only be 8 sensors so this
+		// method is OK and should be faster
+		char sensorInt(static_cast<char>(sensor));
+		std::string sensorName("CC Sensor 0 Power");
+		sensorName[10] += sensorInt;
+		SendWattMeter(2 + sensorInt, 1, 255, totalPower, sensorName);
+	}
 }
 
 bool CurrentCostMeterBase::ExtractNumberBetweenStrings(const char *startString, const char *endString, float *pResult)

hardware/CurrentCostMeterBase.h

@@ -17,5 +17,6 @@ class CurrentCostMeterBase : public CDomoticzHardwareBase
 	void ExtractReadings();
 	bool ExtractNumberBetweenStrings(const char *startString, const char *endString, float *pResult);
 	std::string m_buffer;
+	unsigned int m_tempuratureCounter;
 };
 

webserver/proxyclient.cpp

@@ -4,6 +4,7 @@
 #include "request.hpp"
 #include "reply.hpp"
 #include "request_parser.hpp"
+#include "../main/Helper.h"
 #include "../main/SQLHelper.h"
 #include "../webserver/Base64.h"
 #include "../tcpserver/TCPServer.h"
@@ -91,7 +92,7 @@ namespace http {
 			}
 			if (b_Connected) {
 				_socket.lowest_layer().close();
-				boost::this_thread::sleep_for(boost::chrono::seconds(10));
+				sleep_seconds(10);
 			}
 			b_Connected = false;
 			boost::asio::ip::tcp::resolver resolver(_io_service);