New DCOCTL value. Seems to be closer to the mean.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@273 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 2242448..65742bc 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -72,26 +72,8 @@ interrupt(TIMERA0_VECTOR) Timer_A (void)
   asm("nop");
   asm("nop");
   DAC12_0DAT = glitchH;
-  //DAC12_0DAT = glitchL;
-  /*
-  switch(glitchstate){
-  case 0:
-    P1OUT|=1;
-    glitchstate=1;
-    DAC12_0DAT = glitchH;
-    break;
-  case 1:
-    P1OUT|=1;
-    glitchstate=0;
-    DAC12_0DAT = glitchL;
-    break;
-  default:
-    P1OUT&=~1;
-    //Do nothing.
-    break;
-  }
-  */
 #endif
+  TACTL |= MC0;                         // Stop Timer_A;
 }
 
 

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 814c8ef..6a224fc 100644 (file)
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -139,7 +139,10 @@ void msp430_init_dco() {
     case 0x6ff2:        //f26f, the MSP430F2618
       DCOCTL = 0x00;
       BCSCTL1 = 0x8f;   //CALBC1_16MHZ at 0x10f9
-      DCOCTL = 0x7f;    //CALDCO_16MHZ at 0x10f8
+      /** Observed DCOCTL values:
+         2618: 7f, 97
+      */
+      DCOCTL = 0x83;    //CALDCO_16MHZ at 0x10f8
       break;
     }
   }