Clocking changes.

[goodfet] / firmware / apps / glitch / glitch.c

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 4c4c6cf..53b0376 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -39,17 +39,16 @@ void glitchsetup(){
   WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   TACTL = TASSEL1 + TACLR;              // SMCLK, clear TAR
   CCTL0 = CCIE;                         // CCR0 interrupt enabled
-  CCR0 = glitchcount+0x15;              // Compare Value
+  CCR0 = glitchcount+0x10;              // Compare Value
   TACTL |= MC_2;                        // continuous mode.
 #endif
 }
 
 // Timer A0 interrupt service routine
 interrupt(TIMERA0_VECTOR) Timer_A (void){
-  P5OUT&=~BIT7;//Glitch
+  P5OUT^=BIT7;//Glitch
   //P5DIR=BIT7; //All else high impedance.
-  P5OUT|=BIT7;//Normal
-  TACTL |= MC0;// Stop Timer_A;
+  P5OUT^=BIT7;//Normal
   return;
 }
 
@@ -95,7 +94,6 @@ void glitchrate(u16 rate){
 void glitchhandle(unsigned char app,
                  unsigned char verb,
                  unsigned long len){
-  P1OUT&=~1;
   switch(verb){
   case GLITCHVOLTAGES:
     glitchvoltages(cmddataword[0],
@@ -109,7 +107,9 @@ void glitchhandle(unsigned char app,
   case GLITCHVERB:
     //FIXME parameters don't work yet.
     glitchprime();
+    TAR=0; //Reset clock.
     handle(cmddata[0],cmddata[1],0);
+    TACTL |= MC0;// Stop Timer_A;
     break;
   case GLITCHTIME:
     _DINT();//disable interrupts
@@ -120,9 +120,10 @@ void glitchhandle(unsigned char app,
     
     //perform the function
     silent++;//Don't want the function to return anything.
+    TAR=0;
     handle(cmddata[0],cmddata[1],0);
-    silent--;
     cmddataword[0]=TAR; //Return counter.
+    silent--;
     txdata(app,verb,2);
     break;
   case START:
@@ -133,7 +134,7 @@ void glitchhandle(unsigned char app,
     while(1){
       P5OUT&=~BIT7;//Glitch
       //asm("nop");//asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");
-      asm("nop"); //Not necessary.
+      //asm("nop"); //Not necessary.
       P5OUT|=BIT7;//Normal
       asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");
       asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");