X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fglitch%2Fglitch.c;h=6f1ea4f9922d81e6896d94465f712dbf1a0bf322;hp=59896c7d3d812c943067d9a20f098eb7fd006786;hb=36f406d74ab1a30189b0ab0c75d75dc368de7c4f;hpb=b197a5b786af9a49508435b9da27459b8f85ba18

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 59896c7..6f1ea4f 100644
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -23,8 +23,8 @@ void glitchprime(){
   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,10 +39,10 @@ void glitchsetup(){
   //Set GSEL high to disable glitching.
 
   P5DIR|=0x80;
-  P6DIR|=0x40;  
+  P6DIR|=BIT6+BIT5;
   
   P5OUT|=0x80;
-  P6OUT|=0x40;
+  P6OUT|=BIT6+BIT5;
   
   glitchsetupdac();
 
@@ -65,29 +65,15 @@ interrupt(TIMERA0_VECTOR) Timer_A (void)
 {
 #ifdef DAC12IR
   //debugstr("Glitching.");
-  DAC12_0DAT = 0;//glitchL;
+  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;
-  }
-  */
 #endif
+  TACTL |= MC0;                         // Stop Timer_A;
 }
 
 
@@ -115,9 +101,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_1DAT = low;
   #endif 
 }
 //! Set glitching rate.
@@ -125,7 +112,6 @@ void glitchrate(u16 rate){
   glitchcount=rate;
 }
 
-
 //! Handles a monitor command.
 void glitchhandle(unsigned char app,
 		  unsigned char verb,
@@ -145,7 +131,34 @@ void glitchhandle(unsigned char app,
     glitchprime();
     handle(cmddata[0],cmddata[1],0);
     break;
+  case GLITCHTIME:
+    _DINT();//disable interrupts
+    TACTL=0; //clear dividers
+    TACTL|=TACLR; //clear config
+    TACTL|=TASSEL_SMCLK| //smclk source
+      MC_2; //continuout mode.
+    
+    //perform the function
+    silent++;//Don't want the function to return anything.
+    handle(cmddata[0],cmddata[1],0);
+    silent--;
+    cmddataword[0]=TAR; //Return counter.
+    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");asm("nop");
+      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: