projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
!GEN is now 1 by default.
[goodfet]
/
firmware
/
apps
/
glitch
/
glitch.c
diff --git
a/firmware/apps/glitch/glitch.c
b/firmware/apps/glitch/glitch.c
index
b5cd5bc
..
95653ff
100644
(file)
--- 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().
void glitchprime(){
#ifdef DAC12IR
//Don't forget to call glitchvoltages().
-
+ P5OUT|=0x80;
//Reconfigure TACTL.
TACTL=0; //Clear dividers.
TACTL|=TACLR; //Clear TimerA Config
//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.
CCR0 = glitchcount;
//Enable general interrupts, just in case.
- _EINT();
+
//
_EINT();
#endif
}
#endif
}
@@
-48,6
+48,7
@@
void glitchsetup(){
CCTL0 = CCIE; // CCR0 interrupt enabled
CCR0 = glitchcount;
TACTL |= MC1; // Start Timer_A in continuous mode
CCTL0 = CCIE; // CCR0 interrupt enabled
CCR0 = glitchcount;
TACTL |= MC1; // Start Timer_A in continuous mode
+ //TACTL |= MC0; // Stop Timer_A;
_EINT(); // Enable interrupts
#endif
}
_EINT(); // Enable interrupts
#endif
}
@@
-55,11
+56,10
@@
void glitchsetup(){
// Timer A0 interrupt service routine
interrupt(TIMERA0_VECTOR) Timer_A (void)
{
// Timer A0 interrupt service routine
interrupt(TIMERA0_VECTOR) Timer_A (void)
{
-#ifdef DAC12IR
P5OUT&=~BIT7;//Glitch
P5OUT|=BIT7;//Normal
P5OUT&=~BIT7;//Glitch
P5OUT|=BIT7;//Normal
-#endif
TACTL |= MC0; // Stop Timer_A;
TACTL |= MC0; // Stop Timer_A;
+ return;
}
}