fixed a bug in timer sync; added missing rooms to device site page;

Author: fquirin

www/device-site.html

@@ -78,15 +78,19 @@ <h3>Device Local Site</h3>
 			{ "value": "kitchen", "name": "Kitchen"	},
 			{ "value": "bedroom", "name": "Bedroom" },
 			{ "value": "bath", "name": "Bath" },
-			{ "value": "study", "name": "Study room" },
 			{ "value": "office", "name": "Office" },
+			{ "value": "study", "name": "Study room" },
 			{ "value": "childsroom", "name": "Child's room" },
 			{ "value": "garage", "name": "Garage" },
 			{ "value": "basement", "name": "Basement" },
 			{ "value": "garden", "name": "Garden" },
 			{ "value": "sunroom", "name": "Winter garden" },
-			{ "value": "shack", "name": "Shack" },
+			{ "value": "terrace", "name": "Terrace" },
+			{ "value": "balcony", "name": "Balcony" },
 			{ "value": "hallway", "name": "Hallway" },
+			{ "value": "entrance", "name": "Entrance" },
+			{ "value": "shack", "name": "Shack" },
+			{ "value": "attic", "name": "Attic" },
 			{ "value": "other", "name": "Other" }
 		],
 		updates: [

www/scripts/sepiaFW.ui.events.js

@@ -293,6 +293,7 @@ function sepiaFW_build_events(){
 	var SyncSchedulers = {};
 
 	var lastTimeEventsCheck = 0;
+	var timeEventsCheckTimer;
 
 	//----------------- Broadcasting -------------------
 
@@ -308,7 +309,10 @@ function sepiaFW_build_events(){
 		}
 		//prevent multiple consecutive calls in short intervall...
 		var now = new Date().getTime();
-		if (forceNew || (now - lastTimeEventsCheck) > 10*1000){ 		//interval: 10s
+		var timePassedSinceLastCheck = (now - lastTimeEventsCheck);
+		var targetTime = 10*1000; 	//at least 10s
+		if (forceNew || timePassedSinceLastCheck > targetTime){ 		//interval: 10s
+			clearTimeout(timeEventsCheckTimer);
 			lastTimeEventsCheck = now;
 
 			//reset ids tracking timeEvents - basically just reload all active background time events to 'timeEventNotificationIds'
@@ -342,8 +346,11 @@ function sepiaFW_build_events(){
 				SepiaFW.client.sendCommand(dataset2, options);
 			});
 		}else{
-			SepiaFW.debug.log("Events: skipped time events update because requests came too quickly!");
-			//TODO: buffer calls and schedule update for later
+			SepiaFW.debug.log("Events: Delayed time events update because requests came too quickly!");
+			//buffer calls and schedule update for later
+			timeEventsCheckTimer = setTimeout(function(){
+				Events.setupTimeEvents();
+			}, (targetTime - timePassedSinceLastCheck + 2000));
 		}
 	}