X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fglitch%2Fglitch.c;h=b5cd5bccdddffef0adb0d8171b246ffec732e0bf;hp=224244876bb931991ddd448eac8e23c417b86b0c;hb=776e412df82634e84aa68074a965c0492ec809b0;hpb=bd6ced95abc5725c991fc100d94a023b27c9e159

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 2242448..b5cd5bc 100644
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -15,16 +15,15 @@
 //! Call this before the function to be glitched.
 void glitchprime(){
 #ifdef DAC12IR
-  //Set to high voltage.
-  DAC12_0DAT = glitchH;
+  //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
+    MC_1 |            //Count up to CCR0
+    TAIE;            //Enable Interrupt
   CCTL0 = CCIE;                         // CCR0 interrupt enabled
   CCR0 = glitchcount;
   
@@ -39,12 +38,10 @@ void glitchsetup(){
   //Set GSEL high to disable glitching.
 
   P5DIR|=0x80;
-  P6DIR|=0x40;  
+  P6DIR|=BIT6+BIT5;
   
   P5OUT|=0x80;
-  P6OUT|=0x40;
-  
-  glitchsetupdac();
+  P6OUT|=BIT6+BIT5;
 
   WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   TACTL = TASSEL1 + TACLR;              // SMCLK, clear TAR
@@ -55,50 +52,20 @@ void glitchsetup(){
 #endif
 }
 
-//! Setup analog chain for glitching.
-void glitchsetupdac(){
-  glitchvoltages(glitchL,glitchH);
-}
-
 // Timer A0 interrupt service routine
 interrupt(TIMERA0_VECTOR) Timer_A (void)
 {
 #ifdef DAC12IR
-  //debugstr("Glitching.");
-  DAC12_0DAT = glitchL;
-  asm("nop");
-  asm("nop");
-  asm("nop");
-  asm("nop");
-  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;
-  }
-  */
+  P5OUT&=~BIT7;//Glitch
+  P5OUT|=BIT7;//Normal
 #endif
+  TACTL |= MC0;                         // Stop Timer_A;
 }
 
 
 
 
-u16 glitchH=0xfff, glitchL=0xfff,
-  glitchstate=2, glitchcount=0;
+u16 glitchcount=0;
 
 //! Glitch an application.
 void glitchapp(u8 app){
@@ -107,11 +74,8 @@ void glitchapp(u8 app){
 
 
 //! Set glitching voltages.
-void glitchvoltages(u16 low, u16 high){
+void glitchvoltages(u16 gnd, u16 vcc){
   int i;
-  glitchH=high;
-  glitchL=low;
-  
   //debugstr("Set glitching voltages.");
   
   #ifdef DAC12IR
@@ -119,9 +83,10 @@ void glitchvoltages(u16 low, u16 high){
   // Delay here for reference to settle.
   for(i=0;i!=0xFFFF;i++) asm("nop");
   DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
+  DAC12_1CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
   // 1.0V 0x0666, 2.5V 0x0FFF
-  DAC12_0DAT = high;
-  //DAC12_0DAT = 0x0880;
+  DAC12_0DAT = vcc; //high;
+  DAC12_1DAT = gnd; //low;
   #endif 
 }
 //! Set glitching rate.
@@ -163,6 +128,19 @@ void glitchhandle(unsigned char app,
     txdata(app,verb,2);
     break;
   case START:
+    glitchvoltages(0xFFF,0);//Inverted VCC and GND.
+    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.
+      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");
+    }
+    txdata(app,verb,0);
+    break;
   case STOP:
   case GLITCHAPP:
   default: