Mercurial > templog

changeset 142:8375616bbc7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Matt Johnston <matt@ucc.asn.au>
date Mon, 19 Nov 2012 22:46:45 +0800
parents 4755e6f9a5b8 (current diff) 9091411be841 (diff)
children 0895f5ad7731
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)
     {