Major glitching revisions.

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

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index b5cd5bc..df7dc86 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -15,20 +15,11 @@
 //! Call this before the function to be glitched.
 void glitchprime(){
 #ifdef DAC12IR
-  //Don't forget to call glitchvoltages().
-  
-  //Reconfigure TACTL.
-  TACTL=0;           //Clear dividers.
-  TACTL|=TACLR;      //Clear TimerA Config
-  TACTL|=
-    TASSEL_SMCLK |   //SMCLK source,
-    MC_1 |            //Count up to CCR0
-    TAIE;            //Enable Interrupt
-  CCTL0 = CCIE;                         // CCR0 interrupt enabled
-  CCR0 = glitchcount;
+  WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   
-  //Enable general interrupts, just in case.
+  glitchsetup();
   _EINT();
+  return;
 #endif
 }
 
@@ -42,12 +33,12 @@ void glitchsetup(){
   
   P5OUT|=0x80;
   P6OUT|=BIT6+BIT5;
-
+  
   WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   TACTL = TASSEL1 + TACLR;              // SMCLK, clear TAR
   CCTL0 = CCIE;                         // CCR0 interrupt enabled
-  CCR0 = glitchcount;
-  TACTL |= MC1;                         // Start Timer_A in continuous mode
+  CCR0 = glitchcount+0x30; //clock divider
+  TACTL |= MC_3;
   _EINT();                              // Enable interrupts 
 #endif
 }
@@ -55,16 +46,15 @@ void glitchsetup(){
 // Timer A0 interrupt service routine
 interrupt(TIMERA0_VECTOR) Timer_A (void)
 {
-#ifdef DAC12IR
+  P1OUT^=1;
   P5OUT&=~BIT7;//Glitch
   P5OUT|=BIT7;//Normal
-#endif
-  TACTL |= MC0;                         // Stop Timer_A;
+  TACTL |= MC0;// Stop Timer_A;
+  P1OUT&=~1;
+  return;
 }
 
 
-
-
 u16 glitchcount=0;
 
 //! Glitch an application.
@@ -76,7 +66,9 @@ void glitchapp(u8 app){
 //! Set glitching voltages.
 void glitchvoltages(u16 gnd, u16 vcc){
   int i;
-  //debugstr("Set glitching voltages.");
+  //debugstr("Set glitching voltages: GND and VCC");
+  //debughex(gnd);
+  //debughex(vcc);
   
   #ifdef DAC12IR
   ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
@@ -98,6 +90,7 @@ void glitchrate(u16 rate){
 void glitchhandle(unsigned char app,
                  unsigned char verb,
                  unsigned long len){
+  P1OUT&=~1;
   switch(verb){
   case GLITCHVOLTAGES:
     glitchvoltages(cmddataword[0],