github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-20 21:33:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidy up of SpinDelay

Browse source
This commit is contained in:
d18c7db 2009-07-19 03:47:01 +00:00
commit 5e6a0b2369
1 changed files with 20 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

55
armsrc/util.c
View file

@ -86,7 +86,7 @@ void LED(int led, int ms)
if (led & LED_RED2) if (led & LED_RED2)
LED_D_OFF(); LED_D_OFF();
} }
// Determine if a button is double clicked, single clicked, // Determine if a button is double clicked, single clicked,
// not clicked, or held down (for ms || 1sec) // not clicked, or held down (for ms || 1sec)
@ -107,14 +107,14 @@ int BUTTON_CLICKED(int ms)
PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10); PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
PWM_CH_DUTY_CYCLE(0) = 0; PWM_CH_DUTY_CYCLE(0) = 0;
PWM_CH_PERIOD(0) = 0xffff; PWM_CH_PERIOD(0) = 0xffff;
WORD start = (WORD)PWM_CH_COUNTER(0); WORD start = (WORD)PWM_CH_COUNTER(0);
int letoff = 0; int letoff = 0;
for(;;) for(;;)
{ {
WORD now = (WORD)PWM_CH_COUNTER(0); WORD now = (WORD)PWM_CH_COUNTER(0);
// We haven't let off the button yet // We haven't let off the button yet
if (!letoff) if (!letoff)
{ {
@ -163,20 +163,20 @@ int BUTTON_HELD(int ms)
// If we're not even pressed, forget about it! // If we're not even pressed, forget about it!
if (!BUTTON_PRESS()) if (!BUTTON_PRESS())
return BUTTON_NO_CLICK; return BUTTON_NO_CLICK;
// Borrow a PWM unit for my real-time clock // Borrow a PWM unit for my real-time clock
PWM_ENABLE = PWM_CHANNEL(0); PWM_ENABLE = PWM_CHANNEL(0);
// 48 MHz / 1024 gives 46.875 kHz // 48 MHz / 1024 gives 46.875 kHz
PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10); PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
PWM_CH_DUTY_CYCLE(0) = 0; PWM_CH_DUTY_CYCLE(0) = 0;
PWM_CH_PERIOD(0) = 0xffff; PWM_CH_PERIOD(0) = 0xffff;
WORD start = (WORD)PWM_CH_COUNTER(0); WORD start = (WORD)PWM_CH_COUNTER(0);
for(;;) for(;;)
{ {
WORD now = (WORD)PWM_CH_COUNTER(0); WORD now = (WORD)PWM_CH_COUNTER(0);
// As soon as our button let go, we didn't hold long enough // As soon as our button let go, we didn't hold long enough
if (!BUTTON_PRESS()) if (!BUTTON_PRESS())
return BUTTON_SINGLE_CLICK; return BUTTON_SINGLE_CLICK;
@ -185,7 +185,7 @@ int BUTTON_HELD(int ms)
else else
if (now == (WORD)(start + ticks)) if (now == (WORD)(start + ticks))
return BUTTON_HOLD; return BUTTON_HOLD;
WDT_HIT(); WDT_HIT();
} }
@ -193,43 +193,22 @@ int BUTTON_HELD(int ms)
return BUTTON_ERROR; return BUTTON_ERROR;
} }
// attempt at high resolution microsecond timer
// beware: timer counts in 21.3uS increments (1024/48Mhz)
void SpinDelayUs(int us) void SpinDelayUs(int us)
{ {
int ticks = (48*us) >> 10; int ticks = (48*us) >> 10;
// Borrow a PWM unit for my real-time clock // Borrow a PWM unit for my real-time clock
PWM_ENABLE = PWM_CHANNEL(0); PWM_ENABLE = PWM_CHANNEL(0);
// 48 MHz / 1024 gives 46.875 kHz // 48 MHz / 1024 gives 46.875 kHz
PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10); PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
PWM_CH_DUTY_CYCLE(0) = 0; PWM_CH_DUTY_CYCLE(0) = 0;
PWM_CH_PERIOD(0) = 0xffff; PWM_CH_PERIOD(0) = 0xffff;
WORD start = (WORD)PWM_CH_COUNTER(0); WORD start = (WORD)PWM_CH_COUNTER(0);
for(;;) { for(;;) {
WORD now = (WORD)PWM_CH_COUNTER(0);
if(now == (WORD)(start + ticks)) {
return;
}
WDT_HIT();
}
}
void SpinDelay(int ms)
{
int ticks = (48000*ms) >> 10;
// Borrow a PWM unit for my real-time clock
PWM_ENABLE = PWM_CHANNEL(0);
// 48 MHz / 1024 gives 46.875 kHz
PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
PWM_CH_DUTY_CYCLE(0) = 0;
PWM_CH_PERIOD(0) = 0xffff;
WORD start = (WORD)PWM_CH_COUNTER(0);
for(;;)
{
WORD now = (WORD)PWM_CH_COUNTER(0); WORD now = (WORD)PWM_CH_COUNTER(0);
if (now == (WORD)(start + ticks)) if (now == (WORD)(start + ticks))
return; return;
@ -237,3 +216,9 @@ void SpinDelay(int ms)
WDT_HIT(); WDT_HIT();
} }
} }
void SpinDelay(int ms)
{
// convert to uS and call microsecond delay function
SpinDelayUs(ms*1000);
}