Merge branch 'master'

Author: rkluwen

History.txt

@@ -80,6 +80,7 @@ Version 3.xxx (xxxx 2015)
 - Implemented: MySensors added support for V_IMPEDANCE
 - Changed: MySensors, rebuild
 - Changed: migrated to github
+- Implemented: Option to add a log message via the json api (see wiki)
 
 Version 2.2563 (June 14th 2015)
 - Implemented: WebServer, native SSL and keep-alive, big thanks to chimit!!!!

getgit.cmake

@@ -28,7 +28,7 @@ Gitversion_GET_DATE(. ProjectDate)
 
 # write a file with the APPVERSION define
 MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
-file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectRevision}\"\n#define APPDATE ${ProjectDate}\n")
+file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
 # copy the file to the final header only if the version changes
 # reduces needless rebuilds
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different

hardware/1Wire.cpp

@@ -150,7 +150,6 @@ bool C1Wire::WriteToHardware(const char *pdata, const unsigned char length)
 		deviceIdByteArray[2]=pSen->LIGHTING2.id3;
 		deviceIdByteArray[3]=pSen->LIGHTING2.id4;
 
-		_t1WireDevice device;
 		m_system->SetLightState(ByteArrayToDeviceId(deviceIdByteArray),pSen->LIGHTING2.unitcode,pSen->LIGHTING2.cmnd==light2_sOn);
 		return true;
 	}

hardware/AnnaThermostat.cpp

@@ -204,7 +204,6 @@ void CAnnaThermostat::SetSetpoint(const int idx, const float temp)
 	szURL << "/thermostat";
 
 	std::stringstream sPostData;
-	std::stringstream Url;
 	std::vector<std::string> ExtraHeaders;
 	std::string sResult;
 

hardware/BMP085.cpp

@@ -254,7 +254,7 @@ int CBMP085::bmp_WriteCmd(int fd, uint8_t devAction)
 int CBMP085::bmp_Calibration(int fd)
 {
 #ifdef __arm__
-	uint8_t rValue[21];
+	uint8_t rValue[22];
 	//printf("Entering Calibration\n");
 	if (bmp_ReadInt(fd,rValue,0xAA,22) == 0)
 	{

hardware/Dummy.cpp

@@ -75,7 +75,7 @@ namespace http {
 			}
 			nid += 82000;
 			char ID[40];
-			sprintf(ID, "%ld", nid);
+			sprintf(ID, "%lu", nid);
 
 			std::string devname;
 

hardware/ForecastIO.cpp

@@ -150,7 +150,6 @@ void CForecastIO::GetMeterDetails()
 	fclose(fOut);
 	*/
 
-	std::string tmpstr;
 	float temp;
 	int humidity=0;
 	int barometric=0;

hardware/FritzboxTCP.cpp

@@ -230,7 +230,6 @@ void FritzboxTCP::UpdateSwitch(const unsigned char Idx, const int SubUnit, const
 
 	char szIdx[10];
 	sprintf(szIdx, "%X%02X%02X%02X", 0, 0, 0, Idx);
-	std::stringstream szQuery;
 	std::vector<std::vector<std::string> > result;
 	result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit ==%d)", m_HwdID, szIdx, SubUnit);
 	if (result.size() < 1)

hardware/HardwareMonitor.cpp

@@ -299,7 +299,7 @@ void CHardwareMonitor::SendFanSensor(const int Idx, const int FanSpeed, const st
 
 void CHardwareMonitor::GetInternalTemperature()
 {
-	std::vector<std::string> ret = ExecuteCommandAndReturn(szInternalTemperatureCommand.c_str());
+	std::vector<std::string> ret = ExecuteCommandAndReturn(szInternalTemperatureCommand);
 	if (ret.size() < 1)
 		return;
 	std::string tmpline = ret[0];
@@ -324,7 +324,7 @@ void CHardwareMonitor::GetInternalTemperature()
 
 void CHardwareMonitor::GetInternalVoltage()
 {
-	std::vector<std::string> ret = ExecuteCommandAndReturn(szInternalVoltageCommand.c_str());
+	std::vector<std::string> ret = ExecuteCommandAndReturn(szInternalVoltageCommand);
 	if (ret.size() < 1)
 		return;
 	std::string tmpline = ret[0];
@@ -346,7 +346,7 @@ void CHardwareMonitor::GetInternalVoltage()
 
 void CHardwareMonitor::GetInternalCurrent()
 {
-	std::vector<std::string> ret = ExecuteCommandAndReturn(szInternalCurrentCommand.c_str());
+	std::vector<std::string> ret = ExecuteCommandAndReturn(szInternalCurrentCommand);
 	if (ret.size() < 1)
 		return;
 	std::string tmpline = ret[0];
@@ -492,7 +492,7 @@ bool CHardwareMonitor::IsOHMRunning()
 	return false;
 }
 
-void CHardwareMonitor::RunWMIQuery(const char* qTable,const char* qType)
+void CHardwareMonitor::RunWMIQuery(const char* qTable, const std::string &qType)
 {
 	if (pServicesOHM && pServicesSystem)
 	{
@@ -611,6 +611,7 @@ void CHardwareMonitor::RunWMIQuery(const char* qTable,const char* qType)
 						break;
 					totcpu++;
 				}
+				fclose(fIn);
 			}
 			if (totcpu<1)
 				m_lastquerytime=0;

hardware/HardwareMonitor.h

@@ -38,7 +38,7 @@ class CHardwareMonitor : public CDomoticzHardwareBase
 	void InitWMI();
 	void ExitWMI();
 	bool IsOHMRunning();
-	void RunWMIQuery(const char* qTable, const char* qType);
+	void RunWMIQuery(const char* qTable, const std::string &qType);
 	IWbemLocator *pLocator; 
 	IWbemServices *pServicesOHM;
 	IWbemServices *pServicesSystem;