Tweak web and rrdtool graph goo to separate DMX outs

diff --git a/bin/monitor-graph-cgi.sh b/bin/monitor-graph-cgi.sh
index ba9bbd3267362f5177da6bbcfa9ee710b22e6060..d10b9a4a2b1c5d9e7a5a037435202a7de89bf525 100755 (executable)
--- a/bin/monitor-graph-cgi.sh
+++ b/bin/monitor-graph-cgi.sh
@@ -3,8 +3,8 @@
 DATA_DIR=/home/pi/sc/data
 OUTDIR=/home/pi/public_html/genimg
 
-DMX_SCALE=5
-DMX_SHIFT=20
+#DMX_SCALE=5
+#DMX_SHIFT=20
 
 TEMP_SCALE_UPPER=32
 TEMP_SCALE_LOWER=19
@@ -16,16 +16,25 @@ COMMON_ARGS=(
         --lazy
 )
 
+DMX_ARGS=(
+       --step=60 -v "DMX" --upper-limit 255 --lower-limit 0
+       --right-axis-label "DMX" --right-axis 1:0
+        DEF:dmxTN=${DATA_DIR}/tank-near-dmx.rrd:dmx:AVERAGE
+        DEF:dmxHN=${DATA_DIR}/hide-near-dmx.rrd:dmx:AVERAGE
+       LINE:dmxTN\#800000:"left side"
+       LINE:dmxHN\#008000:"left hide"
+)
+
 NEAR_ARGS=(
         --step=60 -v "degrees C" --upper-limit ${TEMP_SCALE_UPPER} --lower-limit ${TEMP_SCALE_LOWER} --rigid
-       --right-axis-label "DMX"
-       --right-axis ${DMX_SCALE}:-${DMX_SHIFT}
+       --right-axis-label "degrees C" --right-axis 1:0
+       # --right-axis-label "DMX"
+       # --right-axis ${DMX_SCALE}:-${DMX_SHIFT}
         DEF:tempH=${DATA_DIR}/heater-temp.rrd:temp:AVERAGE
         DEF:tempHN=${DATA_DIR}/hide-near-temp.rrd:temp:AVERAGE
-        DEF:dmxHN=${DATA_DIR}/hide-near-dmx.rrd:dmx:AVERAGE
         DEF:tempTN=${DATA_DIR}/tank-near-temp.rrd:temp:AVERAGE
-       CDEF:scaled_dmxHN=dmxHN,${DMX_SHIFT},+,${DMX_SCALE},/
-       LINE:scaled_dmxHN\#000000:"dmx left"
+       # CDEF:scaled_dmxHN=dmxHN,${DMX_SHIFT},+,${DMX_SCALE},/
+       # LINE:scaled_dmxHN\#000000:"dmx left"
         LINE2:tempH\#FF0000:"heater"
         LINE2:tempHN\#808000:"hide left"
         LINE2:tempTN\#00FF00:"tank left"
@@ -50,8 +59,7 @@ MID_ARGS=(
 
 FAR_ARGS=(
         --step=60 -v "degrees C" --upper-limit ${TEMP_SCALE_UPPER} --lower-limit ${TEMP_SCALE_LOWER} --rigid
-       --right-axis-label "degrees C"
-       --right-axis 1:0
+       --right-axis-label "degrees C" --right-axis 1:0
         DEF:tempHF=${DATA_DIR}/hide-far-temp.rrd:temp:AVERAGE
         DEF:tempTF=${DATA_DIR}/tank-far-temp.rrd:temp:AVERAGE
         LINE2:tempHF\#FF8000:"hide right"
@@ -61,15 +69,18 @@ FAR_ARGS=(
 
 OUTFILE="${QUERY_STRING}.png"
 case "$QUERY_STRING" in
-       near-4h)        PARAMS=(--start now-4h  --title "Melman Vivarium Near Sensor Data 4h"   ${NEAR_ARGS[@]}) ;;
-       near-24h)       PARAMS=(--start now-24h --title "Melman Vivarium Near Sensor Data 24h"  ${NEAR_ARGS[@]}) ;;
-       near-7d)        PARAMS=(--start now-7d  --title "Melman Vivarium Near Sensor Data 7d"   ${NEAR_ARGS[@]}) ;;
+       dmx-4h)         PARAMS=(--start now-4h  --title "Melman Vivarium DMX Outputs 4h"        ${DMX_ARGS[@]}) ;;
+       dmx-24h)        PARAMS=(--start now-24h --title "Melman Vivarium DMX Outputs 24h"       ${DMX_ARGS[@]}) ;;
+       dmx-7d)         PARAMS=(--start now-7d  --title "Melman Vivarium DMX Outputs 7d"        ${DMX_ARGS[@]}) ;;
+       near-4h)        PARAMS=(--start now-4h  --title "Melman Vivarium Left Sensor Data 4h"   ${NEAR_ARGS[@]}) ;;
+       near-24h)       PARAMS=(--start now-24h --title "Melman Vivarium Left Sensor Data 24h"  ${NEAR_ARGS[@]}) ;;
+       near-7d)        PARAMS=(--start now-7d  --title "Melman Vivarium Left Sensor Data 7d"   ${NEAR_ARGS[@]}) ;;
        mid-4h)         PARAMS=(--start now-4h  --title "Melman Vivarium Mid Sensor Data 4h"    ${MID_ARGS[@]})  ;;
        mid-24h)        PARAMS=(--start now-24h --title "Melman Vivarium Mid Sensor Data 24h"   ${MID_ARGS[@]})  ;;
        mid-7d)         PARAMS=(--start now-7d  --title "Melman Vivarium Mid Sensor Data 7d"    ${MID_ARGS[@]})  ;;
-       far-4h)         PARAMS=(--start now-4h  --title "Melman Vivarium Far Sensor Data 4h"    ${FAR_ARGS[@]})  ;;
-       far-24h)        PARAMS=(--start now-24h --title "Melman Vivarium Far Sensor Data 24h"   ${FAR_ARGS[@]})  ;;
-       far-7d)         PARAMS=(--start now-7d  --title "Melman Vivarium Far Sensor Data 7d"    ${FAR_ARGS[@]})  ;;
+       far-4h)         PARAMS=(--start now-4h  --title "Melman Vivarium Right Sensor Data 4h"  ${FAR_ARGS[@]})  ;;
+       far-24h)        PARAMS=(--start now-24h --title "Melman Vivarium Right Sensor Data 24h" ${FAR_ARGS[@]})  ;;
+       far-7d)         PARAMS=(--start now-7d  --title "Melman Vivarium Right Sensor Data 7d"  ${FAR_ARGS[@]})  ;;
        *)
                cat <<HERE
 Content-Type: text/html

diff --git a/misc/index.html b/misc/index.html
index e7c49b5ad5a09af97eacb77e4faf22d65bcc6088..6647529c896f11e028a408c60c066b0e93705e06 100644 (file)
--- a/misc/index.html
+++ b/misc/index.html
@@ -5,19 +5,24 @@
  </HEAD><BODY>
   <TABLE>
    <TR>
-    <TD><IMG src="cgi-bin/graph.cgi?near-4h"    width="609" height="393"/></TD>
-    <TD><IMG src="cgi-bin/graph.cgi?near-24h"   width="609" height="393"/></TD>
-    <TD><IMG src="cgi-bin/graph.cgi?near-7d"    width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?near-4h"  width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?near-24h" width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?near-7d"  width="609" height="393"/></TD>
    </TR>
    <TR>
-    <TD><IMG src="cgi-bin/graph.cgi?mid-4h"  width="609" height="393"/></TD>
-    <TD><IMG src="cgi-bin/graph.cgi?mid-24h" width="609" height="393"/></TD>
-    <TD><IMG src="cgi-bin/graph.cgi?mid-7d"  width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?dmx-4h"   width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?dmx-24h"  width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?dmx-7d"   width="609" height="393"/></TD>
    </TR>
    <TR>
-    <TD><IMG src="cgi-bin/graph.cgi?far-4h"  width="609" height="393"/></TD>
-    <TD><IMG src="cgi-bin/graph.cgi?far-24h" width="609" height="393"/></TD>
-    <TD><IMG src="cgi-bin/graph.cgi?far-7d"  width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?mid-4h"   width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?mid-24h"  width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?mid-7d"   width="609" height="393"/></TD>
+   </TR>
+   <TR>
+    <TD><IMG src="cgi-bin/graph.cgi?far-4h"   width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?far-24h"  width="609" height="393"/></TD>
+    <TD><IMG src="cgi-bin/graph.cgi?far-7d"   width="609" height="393"/></TD>
    </TR>
   </TABLE>
   <IFRAME src="cgi-bin/log.cgi" width="1827"/>