# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1353336405 -28800
# Node ID 9fbeafc0984527f4e70ff37f18dfd5fddec80853
# Parent  31ac84425a2d0d500ce8ad932dae2d6f6d2023cd# Parent  e6ec149d40631b9856407afcd5f9c7f16966d0b5
merge

diff -r 31ac84425a2d -r 9fbeafc09845 main.c
--- a/main.c	Mon Nov 19 22:46:34 2012 +0800
+++ b/main.c	Mon Nov 19 22:46:45 2012 +0800
@@ -157,7 +157,6 @@
 #define EXPECT_MAGIC 0x67c9
 
 struct __attribute__ ((__packed__)) __eeprom_data {
-    uint16_t magic;
     uint16_t measure_wake;
     uint16_t comms_wake;
     uint8_t wake_secs;
@@ -173,6 +172,8 @@
     static uint8_t wort_id[ID_LEN];
     static uint8_t fridge_id[ID_LEN];
 #endif
+
+    uint16_t magic;
 };
 
 static const uint8_t fridge_id[ID_LEN] = 
@@ -676,9 +677,9 @@
         return;
     }
 
-    uint8_t old = overshoot_delay;
+    uint8_t old = overshoot_factor;
 
-    overshoot_delay = new_f * 10;
+    overshoot_factor = new_f * 10;
     bool written = set_initial_eeprom();
     if (!written)
     {