X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fglitch%2Fglitch.c;h=0691932f3ba173276bbc8a7fc30ba4635addf2b4;hp=53b037682cfad9fee95abfbd4bf064979cc2d26a;hb=704a3e5036b88ba2fc03606d24b0e474b22338e8;hpb=f10e55ab25dfe0b4114a1700920a1433708e8fcd

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 53b0376..0691932 100644
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -30,6 +30,7 @@ void glitchsetup(){
   
   //Normal voltage, use resistors instead of output.
   //P5DIR=0x80;   //ONLY glitch pin is output.
+  P5DIR|=0x80;   //glitch pin is output.
   P5OUT|=0x80;  //It MUST begin high.
   //P5REN|=0x7F;  //Resistors pull high and low weakly.
   
@@ -46,9 +47,18 @@ void glitchsetup(){
 
 // Timer A0 interrupt service routine
 interrupt(TIMERA0_VECTOR) Timer_A (void){
+  //This oughtn't be necessary, but glitches repeat without it.
+  TACTL=0; //disable counter.
+  
+  
   P5OUT^=BIT7;//Glitch
-  //P5DIR=BIT7; //All else high impedance.
+  //asm("nop"); //delay deepens glitch.
   P5OUT^=BIT7;//Normal
+  
+  //This oughtn't be necessary, but glitches repeat without it.
+  TACTL=0; //disable counter.
+  
+  //P5OUT^=BIT7;//Normal
   return;
 }
 
@@ -63,7 +73,7 @@ void glitchapp(u8 app){
 
 //! Set glitching voltages.
 void glitchvoltages(u16 gnd, u16 vcc){
-  int i;
+  
   //debugstr("Set glitching voltages: GND and VCC");
   //debughex(gnd);
   //debughex(vcc);
@@ -75,6 +85,7 @@ void glitchvoltages(u16 gnd, u16 vcc){
   */
   
   #ifdef DAC12IR
+  int i;
   ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
   // Delay here for reference to settle.
   for(i=0;i!=0xFFFF;i++) asm("nop");
@@ -112,6 +123,7 @@ void glitchhandle(unsigned char app,
     TACTL |= MC0;// Stop Timer_A;
     break;
   case GLITCHTIME:
+    debugstr("Measuring start time.");
     _DINT();//disable interrupts
     TACTL=0; //clear dividers
     TACTL|=TACLR; //clear config
@@ -124,17 +136,20 @@ void glitchhandle(unsigned char app,
     handle(cmddata[0],cmddata[1],0);
     cmddataword[0]=TAR; //Return counter.
     silent--;
+    debugstr("Measured start time.");
+    debughex(cmddataword[0]);
     txdata(app,verb,2);
     break;
   case START:
     //Testing mode, for looking at the glitch waveform.
-    glitchvoltages(0xFFF,0);//Inverted VCC and GND.
+    glitchvoltages(0,0xFFF);//Minimum glitch, for noise test.
+    //glitchvoltages(0,0);//Drop VCC
+    //glitchvoltages(0xFFF,0xFFF);//Raise Ground
     P5OUT|=BIT7;//Normal
     P5DIR|=BIT7;
     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");