More glitching improvements.

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

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index e125544..59896c7 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -11,7 +11,29 @@
 #include "command.h"
 #include "glitch.h"
 
-//! Disable glitch state at init.
+
+//! Call this before the function to be glitched.
+void glitchprime(){
+#ifdef DAC12IR
+  //Set to high voltage.
+  DAC12_0DAT = glitchH;
+  
+  //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;
+  
+  //Enable general interrupts, just in case.
+  _EINT();
+#endif
+}
+
+//! Setup glitching.
 void glitchsetup(){
 #ifdef DAC12IR
   //Set GSEL high to disable glitching.
@@ -23,6 +45,13 @@ void glitchsetup(){
   P6OUT|=0x40;
   
   glitchsetupdac();
+
+  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
+  _EINT();                              // Enable interrupts 
 #endif
 }
 
@@ -31,20 +60,55 @@ void glitchsetupdac(){
   glitchvoltages(glitchL,glitchH);
 }
 
+// Timer A0 interrupt service routine
+interrupt(TIMERA0_VECTOR) Timer_A (void)
+{
+#ifdef DAC12IR
+  //debugstr("Glitching.");
+  DAC12_0DAT = 0;//glitchL;
+  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
+}
+
+
+
 
 u16 glitchH=0xfff, glitchL=0xfff,
-  glitchstate, glitchcount;
+  glitchstate=2, glitchcount=0;
 
 //! Glitch an application.
 void glitchapp(u8 app){
   debugstr("That app is not yet supported.");
 }
+
+
 //! Set glitching voltages.
 void glitchvoltages(u16 low, u16 high){
   int i;
   glitchH=high;
   glitchL=low;
   
+  //debugstr("Set glitching voltages.");
   
   #ifdef DAC12IR
   ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
@@ -76,10 +140,14 @@ void glitchhandle(unsigned char app,
     glitchrate(cmddataword[0]);
     txdata(app,verb,0);
     break;
+  case GLITCHVERB:
+    //FIXME parameters don't work yet.
+    glitchprime();
+    handle(cmddata[0],cmddata[1],0);
+    break;
   case START:
   case STOP:
   case GLITCHAPP:
-  case GLITCHVERB:
   default:
     debugstr("Unknown glitching verb.");
     txdata(app,NOK,0);