Comments and cleanup.

firmware/energytrace.gnuplot

@@ -5,7 +5,8 @@ set output "energytrace.png"
 set title "GoodWatch Current Consumption" font ",20"
 set xlabel "Seconds"
 set ylabel "Current"
-set yrange [0:10e-06]
+#set yrange [0:10e-06]
+set xrange [10:60]
 
 plot "energytrace.txt" with lines;
 

firmware/lcd.c

@@ -55,12 +55,6 @@ void lcd_init() {
   //LCDBVCTL = LCDCPEN | VLCD_3_02 | LCD2B; //Mid contrast
   //LCDBVCTL = LCDCPEN | VLCD_2_60 | LCD2B; //Weakest contrast.
   LCDBCTL0 |= LCDON + LCDSON;
-
-  /* Previously, we cleared REFMSTR to place the reference in legacy
-     mode, but this wasn't compatible with ADC10 on the CC430F6147.
-   */
-  //REFCTL0 &= ~REFMSTR; // Enable legacy mode.
-  //REFCTL0 |=  REFMSTR; // Disable legacy mode.
   
   //Select LCD Segments 0-9
   LCDBPCTL0 = 0xFFFF;

firmware/main.c

@@ -1,8 +1,8 @@
 /*! \file main.c
 
-  \brief Main module.  This version just initializes the LCD and then
-   drops to a low power mode, letting the WDT do the work on a slow
-   interval.
+  \brief Main module.  This version initializes the LCD and then
+   drops to a low power mode, letting the WDT update the display each
+   quarter second, or in the handler of a keypress.
 */
 
 #include <msp430.h>

firmware/ucs.c

@@ -19,11 +19,7 @@ void ucs_fast(){
 
 //! Slow mode.
 void ucs_slow(){
-  #ifdef TURBOMODE
-  ucs_fast();
-  #else
   UCSCTL4 = SELM_0 + SELS_0 + SELA_0;    //XT1 for everything; very slow CPU.
-  #endif
 }
 
 //! Initialize the XT1 crystal, and stabilize it.