Merge remote-tracking branch 'origin/master'

hobbyquaker · Nov 28, 2013 · c9d64a8 · c9d64a8
2 parents da1245f + 79b5efe
commit c9d64a8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ccu.io/adapter/ping/ping.js b/ccu.io/adapter/ping/ping.js
@@ -2,7 +2,7 @@
  *      CCU.IO Ping Adapter
  *      11'2013 Bluefox
  *
- *      Version 0.1
+ *      Version 0.2
  *
  */
 var settings = require(__dirname+'/../../settings.js');
@@ -107,6 +107,7 @@ function pingInit () {
             Parent: dp
         });
 		dp += 2;
+		i++;
     }
 
     setObject(pingSettings.firstId, {
@@ -119,6 +120,10 @@ function pingInit () {
     });
 
     logger.info("adapter ping  inserted objects");
+	// Fix polling interval if too short
+	if (pingSettings.pollingInterval <= 5000 * (i + 1)) {
+		pingSettings.pollingInterval = 5000 * (i + 1);
+	}
 
     logger.info("adapter ping  polling enabled - interval "+pingSettings.pollingInterval+"ms");