X-Git-Url: http://git.rot13.org//?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fglitch%2Fglitch.c;fp=firmware%2Fapps%2Fglitch%2Fglitch.c;h=95653ff958042f2ff42589a9ab778b4d05b3bcdb;hp=b5cd5bccdddffef0adb0d8171b246ffec732e0bf;hb=f0eaf8347f79d77ca7d1bcaf8018d3e3b1505649;hpb=776e412df82634e84aa68074a965c0492ec809b0 diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c index b5cd5bc..95653ff 100644 --- a/firmware/apps/glitch/glitch.c +++ b/firmware/apps/glitch/glitch.c @@ -16,7 +16,7 @@ void glitchprime(){ #ifdef DAC12IR //Don't forget to call glitchvoltages(). - + P5OUT|=0x80; //Reconfigure TACTL. TACTL=0; //Clear dividers. TACTL|=TACLR; //Clear TimerA Config @@ -28,7 +28,7 @@ void glitchprime(){ CCR0 = glitchcount; //Enable general interrupts, just in case. - _EINT(); + //_EINT(); #endif } @@ -48,6 +48,7 @@ void glitchsetup(){ CCTL0 = CCIE; // CCR0 interrupt enabled CCR0 = glitchcount; TACTL |= MC1; // Start Timer_A in continuous mode + //TACTL |= MC0; // Stop Timer_A; _EINT(); // Enable interrupts #endif } @@ -55,11 +56,10 @@ void glitchsetup(){ // Timer A0 interrupt service routine interrupt(TIMERA0_VECTOR) Timer_A (void) { -#ifdef DAC12IR P5OUT&=~BIT7;//Glitch P5OUT|=BIT7;//Normal -#endif TACTL |= MC0; // Stop Timer_A; + return; }