mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
tests: Update xtimer_usleep_until usage to xtimer_periodic_wakeup
This commit is contained in:
parent
71501de4c6
commit
c0ad83c167
@ -20,17 +20,18 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include "xtimer.h"
|
||||
#include "timex.h"
|
||||
|
||||
/* set interval to 1 second */
|
||||
#define INTERVAL (1000000U)
|
||||
#define INTERVAL (1U * SEC_IN_USEC)
|
||||
|
||||
int main(void)
|
||||
{
|
||||
uint32_t last_wakeup = xtimer_now();
|
||||
|
||||
while(1) {
|
||||
xtimer_usleep_until(&last_wakeup, INTERVAL);
|
||||
printf("slept until %"PRIu32"\n", xtimer_now());
|
||||
xtimer_periodic_wakeup(&last_wakeup, INTERVAL);
|
||||
printf("slept until %" PRIu32 "\n", xtimer_now());
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -40,7 +40,7 @@ int main(void)
|
||||
while(1) {
|
||||
uint16_t val = bh1750fvi_sample(&dev);
|
||||
printf("value: %5i lux\n", (int)val);
|
||||
xtimer_usleep_until(&last, RATE);
|
||||
xtimer_periodic_wakeup(&last, RATE);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -27,6 +27,7 @@
|
||||
|
||||
#include "shell.h"
|
||||
#include "xtimer.h"
|
||||
#include "timex.h"
|
||||
#include "srf02.h"
|
||||
|
||||
#ifndef TEST_SRF02_I2C
|
||||
@ -36,7 +37,7 @@
|
||||
#error "TEST_MODE not defined"
|
||||
#endif
|
||||
|
||||
#define SAMPLE_PERIOD (100LU * 1000U)
|
||||
#define SAMPLE_PERIOD (100LU * MS_IN_USEC) /* 100 ms */
|
||||
|
||||
static srf02_t dev;
|
||||
|
||||
@ -78,7 +79,7 @@ static int cmd_sample(int argc, char **argv)
|
||||
|
||||
while(1) {
|
||||
sample();
|
||||
xtimer_usleep_until(&wakeup, SAMPLE_PERIOD);
|
||||
xtimer_periodic_wakeup(&wakeup, SAMPLE_PERIOD);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -21,11 +21,12 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "xtimer.h"
|
||||
#include "timex.h"
|
||||
#include "periph/adc.h"
|
||||
|
||||
|
||||
#define RES ADC_RES_10BIT
|
||||
#define DELAY (100LU * 1000U)
|
||||
#define DELAY (100LU * MS_IN_USEC) /* 100 ms */
|
||||
|
||||
|
||||
int main(void)
|
||||
@ -56,7 +57,7 @@ int main(void)
|
||||
printf("ADC_LINE(%i): %i\n", i, sample);
|
||||
}
|
||||
}
|
||||
xtimer_usleep_until(&last, DELAY);
|
||||
xtimer_periodic_wakeup(&last, DELAY);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -56,7 +56,7 @@ int main(void)
|
||||
dac_set(DAC_LINE(i), val);
|
||||
}
|
||||
val += step;
|
||||
xtimer_usleep_until(&last, DELAY);
|
||||
xtimer_periodic_wakeup(&last, DELAY);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -27,9 +27,10 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "xtimer.h"
|
||||
#include "timex.h"
|
||||
#include "periph/pwm.h"
|
||||
|
||||
#define INTERVAL (10000U)
|
||||
#define INTERVAL (10LU * MS_IN_USEC) /* 10 ms */
|
||||
#define STEP (10)
|
||||
|
||||
#define MODE PWM_LEFT
|
||||
@ -71,7 +72,7 @@ int main(void)
|
||||
step = -step;
|
||||
}
|
||||
|
||||
xtimer_usleep_until(&last_wakeup, INTERVAL);
|
||||
xtimer_periodic_wakeup(&last_wakeup, INTERVAL);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -26,7 +26,7 @@
|
||||
/**
|
||||
* @brief Read th sensors every second
|
||||
*/
|
||||
#define INTERVAL (1000000LU)
|
||||
#define INTERVAL (1LU * SEC_IN_USEC)
|
||||
|
||||
|
||||
int main(void)
|
||||
@ -50,7 +50,7 @@ int main(void)
|
||||
dev = dev->next;
|
||||
}
|
||||
|
||||
xtimer_usleep_until(&last, INTERVAL);
|
||||
xtimer_periodic_wakeup(&last, INTERVAL);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -192,7 +192,7 @@ int main(void)
|
||||
|
||||
uint32_t last_wakeup = xtimer_now();
|
||||
while (1) {
|
||||
xtimer_usleep_until(&last_wakeup, TEST_INTERVAL);
|
||||
xtimer_periodic_wakeup(&last_wakeup, TEST_INTERVAL);
|
||||
msg_try_send(&m, pid3);
|
||||
}
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ we consider this long-term...). The mid-term timers are set to 3 and 5 minutes.
|
||||
Both kind of timers have one that is using `xtimer_usleep` and one that is
|
||||
using `xtimer_set_msg`.
|
||||
|
||||
The short-term timer is triggered every 50ms and is using `xtimer_sleep_until`.
|
||||
The short-term timer is triggered every 50ms and is using `xtimer_periodic_wakeup`.
|
||||
Each time this timer triggers, it increments a software counter, which triggers
|
||||
then a message every minute. A 50ms interval should be small enough, to trigger
|
||||
also for 16-bit wide timers at least once in every timer period.
|
||||
@ -28,4 +28,4 @@ On each mid- and long-term timer event, the output shows also the number of
|
||||
fast timer (1min timer) ticks, that have been triggered since a timer was
|
||||
triggered last. This number should be equal to the timers interval.
|
||||
|
||||
For reasonable results, you should run this test at least for some ours...
|
||||
For reasonable results, you should run this test at least for some hours...
|
||||
|
@ -113,7 +113,7 @@ void *ticker(void *arg)
|
||||
msg_send(&msg, print_pid);
|
||||
}
|
||||
|
||||
xtimer_usleep_until(&base, INT_SHORT);
|
||||
xtimer_periodic_wakeup(&base, INT_SHORT);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
@ -18,6 +18,8 @@
|
||||
* @}
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "thread.h"
|
||||
@ -46,11 +48,11 @@ int main(void)
|
||||
xtimer_set_wakeup(&xtimer, 200000, me);
|
||||
xtimer_set_wakeup(&xtimer2, 100000, me);
|
||||
|
||||
printf("now=%u\n", (unsigned)xtimer_now());
|
||||
printf("now=%" PRIu32 "\n", xtimer_now());
|
||||
thread_sleep();
|
||||
printf("now=%u\n", (unsigned)xtimer_now());
|
||||
printf("now=%" PRIu32 "\n", xtimer_now());
|
||||
thread_sleep();
|
||||
printf("now=%u\n", (unsigned)xtimer_now());
|
||||
printf("now=%" PRIu32 "\n", xtimer_now());
|
||||
|
||||
printf("Test completed!\n");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user