From: Martin Mares <mj@ucw.cz>
Date: Sun, 9 Oct 2016 19:35:36 +0000 (+0200)
Subject: Home: Update sensor names in web interface
X-Git-Tag: v1.6~2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e3ab1cb0bb521924ea91f9e6fc8a7bf0bc0f3568;p=arexx.git

Home: Update sensor names in web interface
---

diff --git a/web/index.cgi b/web/index.cgi
index e72fcc7..8edd788 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -38,7 +38,7 @@ sub links(@) {
 
 print "<p>Temperature:", links("temp-", "quick", "12h", "48h", "month"), "\n";
 print "<p>Humidity:", links("rh-", "12h", "48h", "month"), "\n";
-print "<p>Power:", links("power-", "2h", "2h-detail", "day", "day-detail", "48h", "48h-detail", "week", "month"), "\n";
+# print "<p>Power:", links("power-", "2h", "2h-detail", "day", "day-detail", "48h", "48h-detail", "week", "month"), "\n";
 
 if ($graph =~ /^power-/) {
 	$graph = "http://micac.burrow.ucw.cz/burrow/$graph";
diff --git a/web/rh-12h.cgi b/web/rh-12h.cgi
index c70bb8f..6c7313f 100755
--- a/web/rh-12h.cgi
+++ b/web/rh-12h.cgi
@@ -12,4 +12,4 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--legend-position east \
 	--units-exponent 0 --lower-limit 0 --upper-limit 100 --rigid \
-	DEF:a=$D/sensor-catarium-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Catarium'
+	DEF:a=$D/sensor-garage-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Garage'
diff --git a/web/rh-48h.cgi b/web/rh-48h.cgi
index 8c8999b..60248f9 100755
--- a/web/rh-48h.cgi
+++ b/web/rh-48h.cgi
@@ -12,4 +12,4 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--legend-position east \
 	--units-exponent 0 --lower-limit 0 --upper-limit 100 --rigid \
-	DEF:a=$D/sensor-catarium-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Catarium'
+	DEF:a=$D/sensor-garage-rh.rrd:rh:AVERAGE 'LINE1:a#cc0000:Garage'
diff --git a/web/rh-month.cgi b/web/rh-month.cgi
index 49afbe1..99aa014 100755
--- a/web/rh-month.cgi
+++ b/web/rh-month.cgi
@@ -12,5 +12,5 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--legend-position east \
 	--units-exponent 0 --lower-limit 0 --upper-limit 100 --rigid \
-	DEF:alo=$D/sensor-catarium-rh.rrd:rh:MIN 'LINE1:alo#cc0000:Catarium' \
-	DEF:ahi=$D/sensor-catarium-rh.rrd:rh:MAX 'LINE1:ahi#cc0000'
+	DEF:alo=$D/sensor-garage-rh.rrd:rh:MIN 'LINE1:alo#cc0000:Garage' \
+	DEF:ahi=$D/sensor-garage-rh.rrd:rh:MAX 'LINE1:ahi#cc0000'
diff --git a/web/temp-12h.cgi b/web/temp-12h.cgi
index e1d92a9..432014d 100755
--- a/web/temp-12h.cgi
+++ b/web/temp-12h.cgi
@@ -24,30 +24,30 @@ exec rrdtool graph - \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
 	--pango-markup \
-	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:g=$D/sensor-garage.rrd:temp:AVERAGE \
 	DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \
-	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE \
-	DEF:o=$D/sensor-outside.rrd:temp:AVERAGE \
-	DEF:t=$D/sensor-aquarium.rrd:temp:AVERAGE \
-	'AREA:c#cc7777' \
+	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:m=$D/sensor-machinarium.rrd:temp:AVERAGE \
+	DEF:a=$D/sensor-aquarium.rrd:temp:AVERAGE \
 	'AREA:u#7777cc' \
-	'AREA:b#cc77cc' \
-	'AREA:o#77cc77' \
-	'LINE2:c#cc0000:Catarium\n' \
+	'AREA:m#77cc77' \
+	'AREA:c#cc77cc' \
+	'AREA:g#cc7777' \
+	'LINE2:g#cc0000:Garage\n' \
 	'LINE2:u#0000cc:Ursarium\n' \
-	'LINE2:t#00cccc:Aquarium\n' \
-	'LINE2:b#cc00cc:Balcony\n' \
-	'LINE2:o#00cc00:Outside\n' \
+	'LINE2:a#00cccc:Aquarium\n' \
+	'LINE2:c#cc00cc:Catarium\n' \
+	'LINE2:m#00cc00:Machinarium\n' \
 	'HRULE:0#0000ff' \
 	'COMMENT:\s' \
 	'COMMENT:\s' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#cc0000" font-size="x-large" weight="bold">'"$(current $D/sensor-catarium.rrd)"'</span>\l' \
+	'COMMENT:<span foreground="#cc0000" font-size="x-large" weight="bold">'"$(current $D/sensor-garage.rrd)"'</span>\l' \
 	'COMMENT:\s' \
 	'COMMENT:<span foreground="#0000cc" font-size="x-large" weight="bold">'"$(current $D/sensor-ursarium.rrd)"'</span>\l' \
 	'COMMENT:\s' \
 	'COMMENT:<span foreground="#00cccc" font-size="x-large" weight="bold">'"$(current $D/sensor-aquarium.rrd)"'</span>\l' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#cc00cc" font-size="x-large" weight="bold">'"$(current $D/sensor-balcony.rrd)"'</span>\l' \
+	'COMMENT:<span foreground="#cc00cc" font-size="x-large" weight="bold">'"$(current $D/sensor-catarium.rrd)"'</span>\l' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#00cc00" font-size="x-large" weight="bold">'"$(current $D/sensor-outside.rrd)"'</span>\l' \
+	'COMMENT:<span foreground="#00cc00" font-size="x-large" weight="bold">'"$(current $D/sensor-machinarium.rrd)"'</span>\l' \
diff --git a/web/temp-48h.cgi b/web/temp-48h.cgi
index e704c60..fcec7e2 100755
--- a/web/temp-48h.cgi
+++ b/web/temp-48h.cgi
@@ -12,16 +12,18 @@ exec rrdtool graph - \
 	--right-axis 1:0 --right-axis-format "%3.0lf" \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
-	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:g=$D/sensor-garage.rrd:temp:AVERAGE \
 	DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \
-	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE \
-	DEF:o=$D/sensor-outside.rrd:temp:AVERAGE \
-	'AREA:c#cc7777' \
+	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:m=$D/sensor-machinarium.rrd:temp:AVERAGE \
+	DEF:a=$D/sensor-aquarium.rrd:temp:AVERAGE \
 	'AREA:u#7777cc' \
-	'AREA:b#cc77cc' \
-	'AREA:o#77cc77' \
-	'LINE2:c#cc0000:Catarium\n' \
+	'AREA:m#77cc77' \
+	'AREA:c#cc77cc' \
+	'AREA:g#cc7777' \
+	'LINE2:g#cc0000:Garage\n' \
 	'LINE2:u#0000cc:Ursarium\n' \
-	'LINE2:b#cc00cc:Balcony\n' \
-	'LINE2:o#00cc00:Outside' \
+	'LINE2:a#00cccc:Aquarium\n' \
+	'LINE2:c#cc00cc:Catarium\n' \
+	'LINE2:m#00cc00:Machinarium\n' \
 	'HRULE:0#0000ff'
diff --git a/web/temp-month.cgi b/web/temp-month.cgi
index 3b409df..a1c1d41 100755
--- a/web/temp-month.cgi
+++ b/web/temp-month.cgi
@@ -14,10 +14,10 @@ exec rrdtool graph - \
 	--legend-position east \
 	DEF:alo=$D/sensor-ursarium.rrd:temp:MIN 'LINE2:alo#0000cc:Ursarium\n' \
 	DEF:ahi=$D/sensor-ursarium.rrd:temp:MAX 'LINE2:ahi#0000cc' \
-	DEF:dlo=$D/sensor-catarium.rrd:temp:MIN 'LINE2:dlo#cc0000:Catarium\n' \
-	DEF:dhi=$D/sensor-catarium.rrd:temp:MAX 'LINE2:dhi#cc0000' \
-	DEF:clo=$D/sensor-balcony.rrd:temp:MIN 'LINE2:clo#cc00cc:Balcony\n' \
-	DEF:chi=$D/sensor-balcony.rrd:temp:MAX 'LINE2:chi#cc00cc' \
-	DEF:blo=$D/sensor-outside.rrd:temp:MIN 'LINE2:blo#00cc00:Outside' \
-	DEF:bhi=$D/sensor-outside.rrd:temp:MAX 'LINE2:bhi#00cc00' \
+	DEF:dlo=$D/sensor-garage.rrd:temp:MIN 'LINE2:dlo#cc0000:Garage\n' \
+	DEF:dhi=$D/sensor-garage.rrd:temp:MAX 'LINE2:dhi#cc0000' \
+	DEF:clo=$D/sensor-catarium.rrd:temp:MIN 'LINE2:clo#cc00cc:Catarium\n' \
+	DEF:chi=$D/sensor-catarium.rrd:temp:MAX 'LINE2:chi#cc00cc' \
+	DEF:blo=$D/sensor-machinarium.rrd:temp:MIN 'LINE2:blo#00cc00:Machinarium' \
+	DEF:bhi=$D/sensor-machinarium.rrd:temp:MAX 'LINE2:bhi#00cc00' \
 	'HRULE:0#0000ff'
diff --git a/web/temp-quick.cgi b/web/temp-quick.cgi
index 970957b..91eeb82 100755
--- a/web/temp-quick.cgi
+++ b/web/temp-quick.cgi
@@ -13,7 +13,7 @@ exec rrdtool graph - \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
 	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE2:a#0000cc:Ursarium\n' \
-	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE2:d#cc0000:Catarium\n' \
-	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE2:c#cc00cc:Balcony\n' \
-	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE2:b#00cc00:Outside' \
+	DEF:d=$D/sensor-garage.rrd:temp:AVERAGE 'LINE2:d#cc0000:Garage\n' \
+	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE2:c#cc00cc:Catarium\n' \
+	DEF:b=$D/sensor-machinarium.rrd:temp:AVERAGE 'LINE2:b#00cc00:Machinarium' \
 	'HRULE:0#0000ff'