# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1371391555 -28800
# Node ID a55d7c2440fd690360fd81253e3a9a532b537665
# Parent  83a0663c082ff643b54262b659a0c051425827ba
basically done

diff -r 83a0663c082f -r a55d7c2440fd Makefile
--- a/Makefile	Sun Jun 16 19:17:07 2013 +0800
+++ b/Makefile	Sun Jun 16 22:05:55 2013 +0800
@@ -31,6 +31,17 @@
 # default but 2mhz
 FUSES      = -U hfuse:w:0xd9:m -U lfuse:w:0x77:m -U efuse:w:0xfd:m
 
+#LOCKBIT
+# -U lock:w:0x28:m
+# 0  unused bit7
+# 0  unused
+# 1 blb12  no writing to bootloader
+# 0 blb11
+# 1 blb02  no writing to app
+# 0 blb01
+# 0 lb2
+# 0 lb1 bit0
+
 # ATMega8 fuse bits used above (fuse bits for other devices are different!):
 # Example for 8 MHz internal oscillator
 # Fuse high byte:
diff -r 83a0663c082f -r a55d7c2440fd main.c
--- a/main.c	Sun Jun 16 19:17:07 2013 +0800
+++ b/main.c	Sun Jun 16 22:05:55 2013 +0800
@@ -104,6 +104,9 @@
 static uint8_t oneshot_hit;
 static uint8_t reboot_hit;
 
+// informational for status messages
+static uint8_t boot_normal_status;
+
 // flips between 0 and 1 each watchdog_long_hit, so eventually a
 // working firmware should boot. set back to 0 for each 'alive'
 // command
@@ -114,7 +117,7 @@
 static uint8_t have_cmd;
 
 int uart_putchar(char c, FILE *stream);
-static void long_delay(int ms);
+static void long_delay(uint16_t ms);
 static void blink();
 static uint16_t adc_vcc();
 static uint16_t adc_5v(uint16_t vcc);
@@ -317,12 +320,14 @@
         "newboot %lu (%lu)\n"
         "oneshot (%lu)\n"
         "uptime %lu rem %u\n"
+        "boot normal %hhu\n"
         ),
         watchdog_long_limit, cur_watchdog_long, long_reboot_mode,
         watchdog_short_limit, cur_watchdog_short,
         newboot_limit, cur_newboot,
         cur_oneshot,
-        t.ticks, t.rem);
+        t.ticks, t.rem,
+        boot_normal_status);
 }
 
 static void
@@ -827,6 +832,9 @@
 
     // set to measure 1.1 reference
     ADMUX = admux;
+
+    // delay after setting reference etc, allow settling
+    long_delay(300);
     // average a number of samples
     uint16_t sum = 0;
     uint8_t num = 0;
@@ -885,14 +893,15 @@
 adc_temp()
 {
     // set to measure temperature against 1.1v reference.
-    const uint8_t mux = _BV(REFS0) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
+    const uint8_t mux = _BV(REFS0) | _BV(REFS1) | _BV(MUX3);
     uint16_t sum;
     uint8_t num;
     
     adc_generic(mux, &num, &sum);
 
     // return the voltage
-    return ((uint32_t)1100*1024*sum) / num;
+
+    return ((uint32_t)1100*sum) / (num*1024);
 }
 
 static void
@@ -922,6 +931,7 @@
 static void
 set_pi_boot_normal(uint8_t normal) 
 {
+    boot_normal_status = normal;
     PORT_PI_BOOT &= ~_BV(PIN_PI_BOOT);
     if (normal) 
     {
@@ -1017,13 +1027,13 @@
 }
 
 static void
-long_delay(int ms)
+long_delay(uint16_t ms)
 {
-    int iter = ms / 100;
+    uint16_t iter = ms / 10;
 
-    for (int i = 0; i < iter; i++)
+    for (uint16_t i = 0; i < iter; i++)
     {
-        _delay_ms(100);
+        _delay_ms(10);
     }
 }