- Fixed: CMakeList.txt

- Fixed: Blockly, Set user variables (you need to resave your blockly's)

Author: gizmocuz

CMakeLists.txt

@@ -5,7 +5,7 @@ IF(USE_BUILTIN_LUA)
   add_subdirectory (lua)
   get_directory_property (LUA_LIBRARIES DIRECTORY lua
     DEFINITION LUA_LIBRARIES)
-ELSE(USE_BUILTIN_SQLITE)
+ELSE(USE_BUILTIN_LUA)
   find_package(PkgConfig)
   pkg_check_modules(LUA lua>=5.2)
   IF(LUA_FOUND)

History.txt

@@ -31,6 +31,7 @@ Version 2.3xxx
 - Implemented: OpenZWave, added COMMAND_CLASS_PROTECTION in configuration options
 - Implemented: Netatmo, support for multiple Thermostats
 - Implemented: Day display in energy/gas/water/temp report
+- Fixed: Blockly, Set user variables (you need to resave your blockly's)
 
 Version 2.3530 (November 1th 2015)
 - Implemented: Degree Days in Temperature report

main/EventSystem.cpp

@@ -1789,9 +1789,8 @@ bool CEventSystem::parseBlocklyActions(const std::string &Actions, const std::st
 		}
 		size_t eQPos = csubstr.find_first_of("=") + 1;
 		std::string doWhat = csubstr.substr(eQPos);
-		if (doWhat.find('"') == 0) {
-			doWhat = doWhat.substr(1, doWhat.size() - 2);
-		}
+		doWhat = doWhat.substr(1, doWhat.size() - 2);
+
 		size_t sPos = csubstr.find_first_of("[") + 1;
 		size_t ePos = csubstr.find_first_of("]");
 
@@ -1841,7 +1840,7 @@ bool CEventSystem::parseBlocklyActions(const std::string &Actions, const std::st
 				size_t aFind = doWhat.find(" AFTER ");
 				if ((aFind > 0) && (aFind != std::string::npos)) {
 					std::string delayString = doWhat.substr(aFind + 7);
-					std::string newAction = doWhat.substr(0, aFind - 1);
+					std::string newAction = doWhat.substr(0, aFind);
 					afterTimerSeconds = atoi(delayString.c_str());
 					doWhat = newAction;
 				}

www/eventsframe.html

@@ -157,7 +157,7 @@
 					return '"'+encodeURIComponent($(titleB).text())+'"'; 
 				}
 				else if ($(titleB).attr("name") == "NUM") {
-					return $(titleB).text(); 
+					return '"'+$(titleB).text()+'"'; 
 				}
 				return "unknown comparevariable "+variableType;
 			}
@@ -345,7 +345,7 @@
 						var valueB = $(this).find("value[name='B']")[0];
 						var titleB = $(valueB).find("title")[0];
 						var blockB = $(valueB).children("block:first");
-						setString += '='+$(titleB).text()+''; 
+						setString += '="'+$(titleB).text()+''; 
 						setString += ' AFTER '+ $(titleC).text()+'"'; 
 						setArray.push(setString);
 					}

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1124
+# ref 1125
 
 CACHE:
 # CSS