From 4b8e193dc49eccecbf45728100b026bd0224784c Mon Sep 17 00:00:00 2001 From: Florian Asche Date: Fri, 22 Jan 2016 21:42:16 +0100 Subject: [PATCH 1/2] Added new apcupsd format --- apps/apcupsd/local/mode/libgetdata.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/apcupsd/local/mode/libgetdata.pm b/apps/apcupsd/local/mode/libgetdata.pm index f82e703b9..0d9f3d4e1 100644 --- a/apps/apcupsd/local/mode/libgetdata.pm +++ b/apps/apcupsd/local/mode/libgetdata.pm @@ -41,7 +41,7 @@ sub getdata { my ($value); #print $stdout; foreach (split(/\n/, $stdout)) { - if (/^$searchpattern\s*:\s*(.*)\s(Percent Load Capacity|Percent|Minutes|Seconds|Volts|Hz|seconds|C|F Internal)/i) { + if (/^$searchpattern\s*:\s*(.*)\s(Percent Load Capacity|Percent|Minutes|Seconds|Volts|Hz|seconds|C|F Internal|C|F)/i) { $valueok = "1"; $value = $1; #print $value; From f600935b057cad2e9e32911ee0d1dfdbe81c11fa Mon Sep 17 00:00:00 2001 From: Florian Asche Date: Tue, 2 Feb 2016 15:06:06 +0100 Subject: [PATCH 2/2] Update libgetdata.pm --- apps/apcupsd/local/mode/libgetdata.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/apcupsd/local/mode/libgetdata.pm b/apps/apcupsd/local/mode/libgetdata.pm index 0d9f3d4e1..a3710515f 100644 --- a/apps/apcupsd/local/mode/libgetdata.pm +++ b/apps/apcupsd/local/mode/libgetdata.pm @@ -41,7 +41,7 @@ sub getdata { my ($value); #print $stdout; foreach (split(/\n/, $stdout)) { - if (/^$searchpattern\s*:\s*(.*)\s(Percent Load Capacity|Percent|Minutes|Seconds|Volts|Hz|seconds|C|F Internal|C|F)/i) { + if (/^$searchpattern\s*:\s*(.*)\s(Percent Load Capacity|Percent|Minutes|Seconds|Volts|Hz|seconds|C Internal|F Internal|C|F)/i) { $valueok = "1"; $value = $1; #print $value;