From: bobmseagithub <bobmseagithub@squakmt.com>
Date: Thu, 20 Jul 2017 18:47:57 +0000 (-0700)
Subject: luci-app-statistics: Voltage graphs - AC and DC
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=176f5fb94cd06acaa62f2f3174476f421a430fd8;p=project%2Fluci.git

luci-app-statistics: Voltage graphs - AC and DC

The Voltage graph combines Battery, Input Voltage and Output Voltage.
The Y-Axis scale masks changes in Input/Output voltages over time.
This patch splits the graphs into 2 graphs.
This makes it possible to see variations in AC Input/Output voltages.

Signed-off-by: Bob Meizlik <bobmseagithub@squakmt.com>
(cherry picked from commit 2145b7b33bbc4c142b243ac032e6e9c1c28ca835)
---

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
index 04eee93051..2a8aceec08 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
@@ -5,18 +5,34 @@ module("luci.statistics.rrdtool.definitions.apcups",package.seeall)
 
 function rrdargs( graph, plugin, plugin_instance, dtype )
 
+	local voltagesdc = {
+		title = "%H: Voltages on APC UPS - Battery",
+		vlabel = "Volts DC",
+    alt_autoscale = true,
+		number_format = "%5.1lfV",
+		data = {
+			instances = {
+				voltage = { "battery" }
+			},
+
+			options = { 
+				voltage = { title = "Battery voltage", noarea=true }
+			}
+		}
+	}
+	
 	local voltages = {
-		title = "%H: Voltages on APC UPS ",
-		vlabel = "V",
+		title = "%H: Voltages on APC UPS - AC",
+		vlabel = "Volts AC",
+		alt_autoscale = true,
 		number_format = "%5.1lfV",
 		data = {
 			instances = {
-				voltage = { "battery", "input", "output" }
+				voltage = {  "input", "output" }
 			},
 
 			options = {
 				voltage_output  = { color = "00e000", title = "Output voltage", noarea=true, overlay=true },
-				voltage_battery = { color = "0000ff", title = "Battery voltage", noarea=true, overlay=true },
 				voltage_input   = { color = "ffb000", title = "Input voltage", noarea=true, overlay=true }
 			}
 		}
@@ -97,5 +113,5 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 		}
 	}
 
-	return { voltages, percentload, charge_percent, temperature, timeleft, frequency }
+	return { voltages, voltagesdc, percentload, charge_percent, temperature, timeleft, frequency }
 end