Merge pull request #472 from szczukot/master

More logs for devices

Author: gizmocuz

hardware/1Wire.cpp

@@ -12,6 +12,7 @@
 #include "../main/Helper.h"
 #include "../main/localtime_r.h"
 #include "../main/mainworker.h"
+#include "../main/SQLHelper.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -25,12 +26,14 @@
 
 #define round(a) ( int ) ( a + .5 )
 
+extern CSQLHelper m_sql;
+
 C1Wire::C1Wire(const int ID) :
 	m_stoprequested(false),
 	m_system(NULL)
 {
 	m_HwdID=ID;
-  DetectSystem();
+	DetectSystem();
 }
 
 C1Wire::~C1Wire()
@@ -182,12 +185,15 @@ void C1Wire::GetDeviceDetails()
 		return;
 
 	// Get all devices
-	std::vector<_t1WireDevice> devices;
-	m_system->GetDevices(devices);
+	if ((m_devices.size() == 0) || (m_sql.m_bAcceptNewHardware))
+	{
+		_log.Log(LOG_STATUS, "1-Wire: Searching devices...");
+		m_system->GetDevices(m_devices);
+	}
 
 	// Parse our devices (have to test m_stoprequested because it can take some time in case of big networks)
 	std::vector<_t1WireDevice>::const_iterator itt;
-	for (itt=devices.begin(); itt!=devices.end() && !m_stoprequested; ++itt)
+	for (itt=m_devices.begin(); itt!=m_devices.end() && !m_stoprequested; ++itt)
 	{
 		const _t1WireDevice& device=*itt;
 

hardware/1Wire.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "DomoticzHardware.h"
+#include "..\hardware\1Wire\1WireCommon.h"
 
 class I_1WireSystem;
 class C1Wire : public CDomoticzHardwareBase
@@ -17,6 +18,7 @@ class C1Wire : public CDomoticzHardwareBase
 	boost::shared_ptr<boost::thread> m_thread;
 	I_1WireSystem* m_system;
 	std::map<std::string, bool> m_LastSwitchState;
+	std::vector<_t1WireDevice> m_devices;
 
 	static void LogSystem();
 	void DetectSystem();

hardware/1Wire/1WireByOWFS.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "1WireByOWFS.h"
+#include "../../main/mainworker.h"
 
 #include <fstream>
 #include <algorithm>
@@ -214,6 +215,12 @@ void C1WireByOWFS::SetLightState(const std::string& sId,int unit,bool value)
 float C1WireByOWFS::GetTemperature(const _t1WireDevice& device) const
 {
    std::string readValue=readRawData(std::string(device.filename+"/temperature"));
+
+   if (m_mainworker.GetVerboseLevel() == EVBL_DEBUG)
+   {
+	   _log.Log(LOG_STATUS, "1Wire (OWFS): Get Temperature from %s = %s", device.filename, readValue);
+   }
+
    if (readValue.empty())
       return -1000.0;
    return static_cast<float>(atof(readValue.c_str()));

hardware/SatelIntegra.cpp

@@ -704,7 +704,7 @@ void SatelIntegra::ReportZonesViolation(const unsigned long Idx, const bool viol
 	zone.id = (unsigned char)Idx;
 	zone.intval1 = violation ? 3 : 1;
 
-  if (m_mainworker.GetVerboseLevel() == EVBL_ALL)
+  if (m_mainworker.GetVerboseLevel() >= EVBL_ALL)
   {
     _log.Log(LOG_STATUS, "Satel Integra: Report Zone %d = %d", zone.id, zone.intval1);
   }

main/domoticz.cpp

@@ -88,7 +88,7 @@ const char *szHelp=
 	"\t-userdata file_path (for example /opt/domoticz)\n"
 #endif
 	"\t-webroot additional web root, useful with proxy servers (for example domoticz)\n"
-	"\t-verbose x (where x=0 is none, x=1 is debug)\n"
+	"\t-verbose x (where x=0 is none, x=1 is all important, x=2 is debug)\n"
 	"\t-startupdelay seconds (default=0)\n"
 	"\t-nowwwpwd (in case you forgot the web server username/password)\n"
 	"\t-nocache (do not return appcache, use only when developing the web pages)\n"