# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1350911357 -28800
# Node ID 08adc1fa02e8d20841a939756324bf2c4d2adf0d
# Parent  10d35b4370ef8c3415e0c304615e9f7a741c7394# Parent  d36fe81077cc4666bacb2bb76be4abb3e7b90a7d
merge

diff -r 10d35b4370ef -r 08adc1fa02e8 main.c
--- a/main.c	Mon Oct 15 21:51:19 2012 +0800
+++ b/main.c	Mon Oct 22 21:09:17 2012 +0800
@@ -84,7 +84,7 @@
 static uint8_t wake_secs = 30;
 // decidegrees
 static int16_t fridge_setpoint = 180; // 18.0ºC
-static int16_t fridge_difference = 3; // 0.3ºC
+static uint16_t fridge_difference = 3; // 0.3ºC
 static uint16_t fridge_delay = 600; // seconds
 
 static uint16_t overshoot_delay = 720; // 12 mins
@@ -163,7 +163,7 @@
     uint8_t wake_secs;
 
     int16_t fridge_setpoint; // decidegrees
-    uint8_t fridge_difference; // decidegrees
+    uint16_t fridge_difference; // decidegrees
     uint16_t fridge_delay;
 
     uint16_t overshoot_delay;
diff -r 10d35b4370ef -r 08adc1fa02e8 web/log.py
--- a/web/log.py	Mon Oct 15 21:51:19 2012 +0800
+++ b/web/log.py	Mon Oct 22 21:09:17 2012 +0800
@@ -90,7 +90,7 @@
         if unit:
             try:
                 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds'])
-                format_last_value = ('%f' % last_value).rstrip('0.') + unit
+                format_last_value = ('%f' % last_value).rstrip('0').rstrip('.') + unit
             except ValueError:
                 pass
         width = config.LINE_WIDTH