Merge branch 'master' of github.com:avp-avp/libs

jirmjos · Feb 26, 2017 · 0225b2e · 0225b2e
2 parents f22be81 + 5999bdd
commit 0225b2e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/libcomm/libcomm.vcxproj b/libcomm/libcomm.vcxproj
@@ -81,6 +81,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>../libutils/jsoncpp.w32</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/libutils/libutils.vcxproj b/libutils/libutils.vcxproj
@@ -90,6 +90,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_DLL_BUILD;LIBUTILS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>jsoncpp.w32</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -153,7 +154,7 @@
     <ClCompile Include="ConfigItem.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="Exception.cpp" />
-    <ClCompile Include="jsoncpp\jsoncpp.cpp" />
+    <ClCompile Include="jsoncpp.w32\jsoncpp.cpp" />
     <ClCompile Include="libutils.cpp" />
     <ClCompile Include="locks.cpp" />
     <ClCompile Include="logging.cpp" />

diff --git a/libutils/libutils.vcxproj.filters b/libutils/libutils.vcxproj.filters
@@ -57,10 +57,10 @@
     <ClCompile Include="XmlDocument.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="jsoncpp\jsoncpp.cpp">
+    <ClCompile Include="Config.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Config.cpp">
+    <ClCompile Include="jsoncpp.w32\jsoncpp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/libutils/logging.cpp b/libutils/logging.cpp
@@ -18,10 +18,10 @@ LogParam::LogParam()
 #ifdef USE_CONFIG
 LogParam::LogParam(CConfigItem node)
 {
-	FileName = node.getStr("FileName");
-	LogTime = (node.getStr("LogTime", false, "yes")=="yes")?true:false;
-	ConsoleLevel = node.getInt("ConsoleLevel", false, -1);
-	FileLevel = node.getInt("FileLevel", false, 0);
+	FileName = node.getStr("FileName", false, node.getStr("file_name"));
+	LogTime = (node.getStr("LogTime", false, node.getStr("log_time", false, "yes"))=="yes")?true:false;
+	ConsoleLevel = node.getInt("ConsoleLevel", false, node.getInt("console_level", false, -1));
+	FileLevel = node.getInt("FileLevel", false, node.getInt("file_level", false, 0));
 }
 #endif
 
@@ -73,8 +73,8 @@ CLog* CLog::GetLog(string Name)
 				if (pos>0)
 					m_BasePath  = m_BasePath.substr(0, pos+1);
 		#else
-				m_BasePath = ".";
-//				m_BasePath = "/run/";
+//				m_BasePath = ".";
+				m_BasePath = "/run/";
 		#endif
 
 		log->Open((m_BasePath+Name+".log").c_str());
@@ -112,10 +112,13 @@ void CLog::Init(CConfigItem *Config)
 {
 	CConfigItemList nodes;
 	Config->getList("Log", nodes);
+
+	if (nodes.size()==0)
+		Config->getList("log", nodes);
 
 	for(CConfigItemList::iterator i=nodes.begin();i!=nodes.end();i++)
 	{
-		m_LogsCfg[(*i)->getStr("Name")] = LogParam(**i);
+		m_LogsCfg[(*i)->getStr("Name", false, (*i)->getStr("name"))] = LogParam(**i);
 	}
 }
 #endif

diff --git a/libwb/WBDevice.cpp b/libwb/WBDevice.cpp
@@ -22,10 +22,10 @@ const char *g_Topics[] =
 	"WindSpeed", //	wind_speed	m / s	float
 	"PowerPower", //	watt	float
 	"PowerConsumption", //	power_consumption	kWh	float
-	"VoltageVoltage", //	volts	float
-	"WaterFlow", //	water_flow	m ^ 3 / hour	float
+	"voltage", //	volts	float
+	"water_flow", //	water_flow	m ^ 3 / hour	float
 	"WaterTotal", // consumption	water_consumption	m ^ 3	float
-	"Resistance", //	resistance	Ohm	float
+	"resistance", //	resistance	Ohm	float
 	"concentration", //	concentration	ppm	float(unsigned)
 
 	"",
@@ -94,6 +94,9 @@ string CWBControl::getTypeName()
 void CWBControl::setType(const string& type)
 {
 	Type = getType(type);
+
+	if (Type == Error && type != "" && type != "Error")
+		throw CHaException(CHaException::ErrBadParam, "Unknown device type '%s'", type.c_str());
 }
 
 bool CWBControl::isLoaded()
@@ -296,7 +299,7 @@ void CWBDevice::setBySource(string source, string sourceType, string Value)
 	}
 }
 
-void CWBDevice::subscribeToEntich(string_vector &v)
+void CWBDevice::subscribeToEnrich(string_vector &v)
 {
 	if (m_Description.size()==0)
 		v.push_back("/devices/" + m_Name+ "/meta/#");
@@ -338,4 +341,4 @@ bool CWBDevice::isLoaded()
 	}
 
 	return true;
-}
+}
diff --git a/libwb/WBDevice.h b/libwb/WBDevice.h
@@ -80,7 +80,7 @@ class LIBWB_API CWBDevice
 	void updateValues(string_map &);
 	const CControlMap *getControls(){return &m_Controls;};
 	string getTopic(string Control);
-	void subscribeToEntich(string_vector &v);
+	void subscribeToEnrich(string_vector &v);
 	void enrichDevice(const string &meta, const string &val);
 	void enrichControl(const string &control, const string &meta, const string &val);
 	bool isLoaded();

diff --git a/libwb/libwb.vcxproj b/libwb/libwb.vcxproj
@@ -89,6 +89,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBWB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>../libutils/jsoncpp.w32</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>