Shorted glitch interrupt, TACTL is now disabled post-glitch.

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

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index f337e42..4a50438 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -29,9 +29,9 @@ void glitchsetup(){
   //Set GSEL high to disable glitching.
   
   //Normal voltage, use resistors instead of output.
-  P5DIR=0x80;   //ONLY glitch pin is output.
+  //P5DIR=0x80;   //ONLY glitch pin is output.
   P5OUT|=0x80;  //It MUST begin high.
-  P5REN|=0xFF;  //Resistors pull high and low weakly.
+  //P5REN|=0x7F;  //Resistors pull high and low weakly.
   
   P6DIR|=BIT6+BIT5;
   P6OUT|=BIT6+BIT5;
@@ -39,19 +39,16 @@ void glitchsetup(){
   WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   TACTL = TASSEL1 + TACLR;              // SMCLK, clear TAR
   CCTL0 = CCIE;                         // CCR0 interrupt enabled
-  CCR0 = glitchcount+0x15; //clock divider
-  TACTL |= MC_3;
-  _EINT();                              // Enable interrupts 
+  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;
 }
 
@@ -97,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],
@@ -112,13 +108,14 @@ void glitchhandle(unsigned char app,
     //FIXME parameters don't work yet.
     glitchprime();
     handle(cmddata[0],cmddata[1],0);
+    TACTL |= MC0;// Stop Timer_A;
     break;
   case GLITCHTIME:
     _DINT();//disable interrupts
     TACTL=0; //clear dividers
     TACTL|=TACLR; //clear config
     TACTL|=TASSEL_SMCLK| //smclk source
-      MC_2; //continuout mode.
+      MC_2; //continuous mode.
     
     //perform the function
     silent++;//Don't want the function to return anything.
@@ -128,6 +125,7 @@ void glitchhandle(unsigned char app,
     txdata(app,verb,2);
     break;
   case START:
+    //Testing mode, for looking at the glitch waveform.
     glitchvoltages(0xFFF,0);//Inverted VCC and GND.
     P5OUT|=BIT7;//Normal
     P5DIR|=BIT7;