Emon CMS 9.1 | 2015.11.02

Fix kwh on emoncms update.
emoncms · Nov 2, 2015 · b5923e4 · b5923e4
1 parent b2e6707
commit b5923e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/Modules/input/input_model.php b/Modules/input/input_model.php
@@ -15,14 +15,11 @@
 class Input
 {
     private $mysqli;
-    private $feed;
     private $redis;
 
     public function __construct($mysqli,$redis,$feed)
     {
         $this->mysqli = $mysqli;
-        $this->feed = $feed;
-
         $this->redis = $redis;
     }
 

diff --git a/Modules/process/process_processlist.php b/Modules/process/process_processlist.php
@@ -281,10 +281,9 @@ public function power_to_kwh($feedid, $time_now, $value)
         // only update if last datapoint was less than 2 hour old
         // this is to reduce the effect of monitor down time on creating
         // often large kwh readings.
-        if ($last_time && (time()-$last_time)<7200)
-        {
+        $time_elapsed = ($time_now - $last_time);   
+        if ($time_elapsed>0 && $time_elapsed<7200) { // 2hrs
             // kWh calculation
-            $time_elapsed = ($time_now - $last_time);
             $kwh_inc = ($time_elapsed * $value) / 3600000.0;
             $new_kwh = $last_kwh + $kwh_inc;
         } else {
@@ -494,8 +493,8 @@ public function histogram($feedid, $time_now, $value)
         $last_time = $lastvalue['time'];
 
         // kWh calculation
-        if ((time()-$last_time)<7200) {
-            $time_elapsed = ($time_now - $last_time);
+        $time_elapsed = ($time_now - $last_time);   
+        if ($time_elapsed>0 && $time_elapsed<7200) { // 2hrs
             $kwh_inc = ($time_elapsed * $value) / 3600000;
         } else {
             $kwh_inc = 0;

diff --git a/index.php b/index.php
@@ -20,7 +20,7 @@
     require "route.php";
     require "locale.php";
 
-    $emoncms_version = ($feed_settings['redisbuffer']['enabled'] ? "low-write " : "") . "9.1 | 2015.10.30";
+    $emoncms_version = ($feed_settings['redisbuffer']['enabled'] ? "low-write " : "") . "9.1 | 2015.11.02";
 
     $path = get_application_path();
     require "Lib/EmonLogger.php";