fixed cmake script

Author: gizmocuz

CMakeLists.txt

@@ -266,37 +266,33 @@ ENDIF(WIN32)
 
 FIND_PACKAGE(PythonLibs)
 IF(PYTHONLIBS_FOUND)
-  #dirty hack to link against the static lib
-  STRING(REGEX REPLACE ".so" ".a" PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
-  MESSAGE(STATUS "Python libraries found at: ${PYTHON_LIBRARIES}")
-  MESSAGE(STATUS "Python includes found at: ${PYTHON_INCLUDE_PATH}")
-  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+	#dirty hack to link against the static lib
+	STRING(REGEX REPLACE ".so" ".a" PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
+	MESSAGE(STATUS "Python libraries found at: ${PYTHON_LIBRARIES}")
+	MESSAGE(STATUS "Python includes found at: ${PYTHON_INCLUDE_PATH}")
+	INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+
+	FIND_PACKAGE(PythonInterp)
+	IF(PYTHONINTERP_FOUND)
+		MESSAGE(STATUS "Python interpreter found at: ${PYTHON_EXECUTABLE}")
+		INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+		LIST(APPEND ADDITIONAL_LIBS ${PYTHON_LIBRARIES})
+		MESSAGE(STATUS "Python as scripting languages: ENABLED")
+		IF(PYTHONLIBS_FOUND)
+		add_definitions(-DENABLE_PYTHON)
+		add_definitions(-DPYTHON_EXE=${PYTHON_EXECUTABLE})
+		target_link_libraries(domoticz ${PYTHON_LIBRARIES} util)
+		ELSE()
+		MESSAGE(STATUS "Python as scripting languages: DISABLED")
+		ENDIF(PYTHONLIBS_FOUND)
+
+	else()
+		MESSAGE(STATUS "Python not found on your system, to enable python support, install 'python-dev'")
+	ENDIF(PYTHONINTERP_FOUND)
 else()
   MESSAGE(STATUS "Python not found on your system, to enable python support, install 'python-dev'")
 ENDIF(PYTHONLIBS_FOUND)
 
-FIND_PACKAGE(PythonInterp)
-IF(PYTHONINTERP_FOUND)
-  MESSAGE(STATUS "Python interpreter found at: ${PYTHON_EXECUTABLE}")
-  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-  LIST(APPEND ADDITIONAL_LIBS ${PYTHON_LIBRARIES})
-  MESSAGE(STATUS "Python as scripting languages: ENABLED")
-  IF(PYTHONLIBS_FOUND)
-    add_definitions(-DENABLE_PYTHON)
-    add_definitions(-DPYTHON_EXE=${PYTHON_EXECUTABLE})
-    target_link_libraries(domoticz ${PYTHON_LIBRARIES} util)
-  ELSE()
-    MESSAGE(STATUS "Python as scripting languages: DISABLED")
-  ENDIF(PYTHONLIBS_FOUND)
-
-else()
-  MESSAGE(STATUS "Python not found on your system, to enable python support, install 'python-dev'")
-ENDIF(PYTHONINTERP_FOUND)
-
-
-
-
-
 option(USE_STATIC_BOOST "Build with static BOOST libraries" YES)
 set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST})
 set(Boost_USE_MULTITHREADED ON)

hardware/ToonThermostat.cpp

@@ -570,8 +570,8 @@ bool CToonThermostat::WriteToHardware(const char *pdata, const unsigned char len
 		return false; //later add RGB support, if someone can provide access
 
 	int node_id = pCmd->LIGHTING2.id4;
-	if (node_id == 113)
-		return false; //we can not turn on/off the internal flame
+	if ((node_id == 113) || (node_id == 114) || (node_id == 115))
+		return false; //we can not turn on/off the internal status
 
 	int state = 0;
 	int light_command = pCmd->LIGHTING2.cmnd;
@@ -689,16 +689,39 @@ void CToonThermostat::GetMeterDetails()
 			//1=heating
 			//2=hot water
 			//3=pre-heating
+			int burnerInfo = 0;
+
 			if (root["thermostatInfo"]["burnerInfo"].isString())
 			{
-				std::string sBurnerInfo = root["thermostatInfo"]["burnerInfo"].asString();
-				int burnerInfo = atoi(sBurnerInfo.c_str());
-				UpdateSwitch(113, burnerInfo != 0, "FlameOn");
+				burnerInfo = atoi(root["thermostatInfo"]["burnerInfo"].asString().c_str());
 			}
 			else if (root["thermostatInfo"]["burnerInfo"].isInt())
 			{
-				int burnerInfo = root["thermostatInfo"]["burnerInfo"].asInt();
-				UpdateSwitch(113, burnerInfo != 0, "FlameOn");
+				burnerInfo = root["thermostatInfo"]["burnerInfo"].asInt();
+			}
+			if (burnerInfo == 1)
+			{
+				UpdateSwitch(113, true, "HeatingOn");
+				UpdateSwitch(114, false, "TapwaterOn");
+				UpdateSwitch(115, false, "PreheatOn");
+			}
+			else if (burnerInfo == 2)
+			{
+				UpdateSwitch(113, false, "HeatingOn");
+				UpdateSwitch(114, true, "TapwaterOn");
+				UpdateSwitch(115, false, "PreheatOn");
+			}
+			else if (burnerInfo == 3)
+			{
+				UpdateSwitch(113, false, "HeatingOn");
+				UpdateSwitch(114, false, "TapwaterOn");
+				UpdateSwitch(115, true, "PreheatOn");
+			}
+			else
+			{
+				UpdateSwitch(113, false, "HeatingOn");
+				UpdateSwitch(114, false, "TapwaterOn");
+				UpdateSwitch(115, false, "PreheatOn");
 			}
 		}
 	}