Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 15:30:08 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[test] fix test_sys_time_x

Browse Source
This commit is contained in:
Felix Ruess
2014-03-03 15:26:33 +01:00
parent 2d89430e0e
commit 0374d2d2ea
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/test_progs.makefile
+2 -2
View File
@@ -91,12 +91,12 @@ LED_DEFINES ?= -DLED_RED=2 -DLED_GREEN=3
test_sys_time_timer.ARCHDIR = $(ARCH) test_sys_time_timer.ARCHDIR = $(ARCH)
test_sys_time_timer.CFLAGS += $(COMMON_TEST_CFLAGS) $(LED_DEFINES) test_sys_time_timer.CFLAGS += $(COMMON_TEST_CFLAGS) $(LED_DEFINES)
test_sys_time_timer.srcs += $(COMMON_TEST_SRCS) test_sys_time_timer.srcs += $(COMMON_TEST_SRCS)
test_sys_time_timer.srcs += $(SRC_AIRBORNE)/test/mcu_periph/test_sys_time_timer.c test_sys_time_timer.srcs += test/mcu_periph/test_sys_time_timer.c
test_sys_time_usleep.ARCHDIR = $(ARCH) test_sys_time_usleep.ARCHDIR = $(ARCH)
test_sys_time_usleep.CFLAGS += $(COMMON_TEST_CFLAGS) $(LED_DEFINES) test_sys_time_usleep.CFLAGS += $(COMMON_TEST_CFLAGS) $(LED_DEFINES)
test_sys_time_usleep.srcs += $(COMMON_TEST_SRCS) test_sys_time_usleep.srcs += $(COMMON_TEST_SRCS)
test_sys_time_usleep.srcs += $(SRC_AIRBORNE)/test/mcu_periph/test_sys_time_usleep.c test_sys_time_usleep.srcs += test/mcu_periph/test_sys_time_usleep.c
# #
sw/airborne/test/mcu_periph/test_sys_time_timer.c
+3
View File
@@ -23,6 +23,7 @@
#include "mcu.h" #include "mcu.h"
#include "led.h" #include "led.h"
#include "mcu_periph/sys_time.h" #include "mcu_periph/sys_time.h"
#include "interrupt_hw.h"
static inline void main_periodic_02( void ); static inline void main_periodic_02( void );
static inline void main_periodic_03( void ); static inline void main_periodic_03( void );
@@ -36,6 +37,8 @@ int main(void) {
unsigned int tmr_03 = sys_time_register_timer(0.3, NULL); unsigned int tmr_03 = sys_time_register_timer(0.3, NULL);
sys_time_register_timer(0.5, main_periodic_05); sys_time_register_timer(0.5, main_periodic_05);
mcu_int_enable();
while(1) { while(1) {
if (sys_time_check_and_ack_timer(tmr_02)) if (sys_time_check_and_ack_timer(tmr_02))
main_periodic_02(); main_periodic_02();
sw/airborne/test/mcu_periph/test_sys_time_usleep.c
+3
View File
@@ -23,6 +23,7 @@
#include "mcu.h" #include "mcu.h"
#include "led.h" #include "led.h"
#include "mcu_periph/sys_time.h" #include "mcu_periph/sys_time.h"
#include "interrupt_hw.h"
static inline void main_periodic_1(void); static inline void main_periodic_1(void);
static inline void main_periodic_15(void); static inline void main_periodic_15(void);
@@ -33,6 +34,8 @@ int main(void) {
mcu_init(); mcu_init();
sys_time_register_timer(0.5, main_periodic_05); sys_time_register_timer(0.5, main_periodic_05);
mcu_int_enable();
while(1) { while(1) {
/* sleep for 1s */ /* sleep for 1s */
sys_time_usleep(1000000); sys_time_usleep(1000000);