# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1340505476 -28800
# Node ID 0c181d77c85ab44534651beff36c0df3822da713
# Parent  a1aa4176ca2c39b309f4b7af1137b02c84079180# Parent  99f8b97a944935a3348563f63d28569c872afd1a
merge

diff -r a1aa4176ca2c -r 0c181d77c85a main.c
--- a/main.c	Sun Jun 24 10:37:38 2012 +0800
+++ b/main.c	Sun Jun 24 10:37:56 2012 +0800
@@ -24,15 +24,15 @@
 // 1 second. we have 1024 prescaler, 32768 crystal.
 #define SLEEP_COMPARE 32
 // limited to uint16_t
-#define MEASURE_WAKE 5 // testing 
+#define MEASURE_WAKE 60
 
 #define VALUE_NOSENSOR -9000
 #define VALUE_BROKEN -8000
 
 // limited to uint16_t
-#define COMMS_WAKE 40 // XXX testing
+#define COMMS_WAKE 3600 // XXX testing
 // limited to uint8_t
-#define WAKE_SECS 30 // XXX testing
+#define WAKE_SECS 60 // XXX testing
 
 #define BAUD 19200
 #define UBRR ((F_CPU)/8/(BAUD)-1)
@@ -46,9 +46,9 @@
 #define PIN_SHDN PD7
 
 // limited to uint16_t
-#define NUM_MEASUREMENTS 100
+#define NUM_MEASUREMENTS 280
 // limited to uint8_t
-#define MAX_SENSORS 5
+#define MAX_SENSORS 3
 
 // fixed at 8, have a shorter name
 #define ID_LEN OW_ROMCODE_SIZE
@@ -126,10 +126,10 @@
     DDR_LED |= _BV(PIN_LED);
     DDR_SHDN |= _BV(PIN_SHDN);
 
+    // set pullup
+    PORTD |= _BV(PD2);
     // INT0 setup
     EIMSK = _BV(INT0);
-    // set pullup
-    PORTD |= _BV(PD2);
 }
 
 static void
@@ -168,7 +168,7 @@
 uart_on()
 {
     // Power reduction register
-    //PRR &= ~_BV(PRUSART0);
+    PRR &= ~_BV(PRUSART0);
  
     // All of this needs to be done each time after turning off the PRR
     // baud rate
@@ -190,7 +190,7 @@
     uart_enabled = 0;
 
     // Power reduction register
-    //PRR |= _BV(PRUSART0);
+    PRR |= _BV(PRUSART0);
 }
 
 int 
@@ -252,7 +252,7 @@
     fprintf_P(crc_stdout, PSTR("measurements=%hu\n"), n_measurements);
     for (uint16_t n = 0; n < n_measurements; n++)
     {
-        fprintf_P(crc_stdout, PSTR("meas%u="), n);
+        fprintf_P(crc_stdout, PSTR("meas%hu="), n);
         for (uint8_t s = 0; s < n_sensors; s++)
         {
             fprintf_P(crc_stdout, PSTR(" %hu"), measurements[n][s]);
@@ -273,9 +273,9 @@
 static void
 cmd_btoff()
 {
-    uint16_t next_wake = COMMS_WAKE - comms_count;
-    printf_P(PSTR("off:%d\n"), next_wake);
-    _delay_ms(50);
+    comms_count = 0;
+    printf_P(PSTR("off:%hu\n"), COMMS_WAKE);
+    _delay_ms(100);
     comms_timeout = 0;
 }
 
@@ -619,7 +619,7 @@
 
     if (n_measurements == NUM_MEASUREMENTS)
     {
-        printf_P(PSTR("Measurements .overflow\n"));
+        printf_P(PSTR("Measurements overflow\n"));
         n_measurements = 0;
     }
 
@@ -684,6 +684,8 @@
     }
 
     uart_off();
+    // in case bluetooth takes time to flush
+    _delay_ms(100);
     set_aux_power(0);
 }
 
@@ -730,7 +732,7 @@
     uart_off();
 
     // turn off everything except timer2
-    //PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC);
+    PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC);
 
     // for testing
     uart_on();
@@ -759,7 +761,10 @@
         }
 
         deep_sleep();
-        blink();
+        if (clock_epoch % 60 == 0)
+        {
+            blink();
+        }
     }
 
     return 0;   /* never reached */