From 813660036a16c7853f4de4c1a9b10c0d96079fff Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Fri, 14 Jun 2013 15:39:31 +0200 Subject: [PATCH] increase first start interrupt and default device in downlink.h --- sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c | 2 +- sw/airborne/subsystems/datalink/downlink.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c b/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c index 8e5229298c..6afe5ec1a5 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c +++ b/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c @@ -120,7 +120,7 @@ void sys_time_arch_init( void ) { T0EMR = 0; /* set first sys tick interrupt */ - T0MR0 = sys_time.resolution_cpu_ticks; + T0MR0 = 4*sys_time.resolution_cpu_ticks; /* enable timer 0 */ T0TCR = TCR_ENABLE; diff --git a/sw/airborne/subsystems/datalink/downlink.h b/sw/airborne/subsystems/datalink/downlink.h index 890f27d768..d8af126b68 100644 --- a/sw/airborne/subsystems/datalink/downlink.h +++ b/sw/airborne/subsystems/datalink/downlink.h @@ -63,6 +63,12 @@ #define DefaultChannel DOWNLINK_TRANSPORT #endif +// FIXME are DOWNLINK_AP|FBW_DEVICE distinction really necessary ? +// by default use AP_DEVICE if nothing is set ? +#ifndef DOWNLINK_DEVICE +#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE +#endif + #ifndef DefaultDevice #define DefaultDevice DOWNLINK_DEVICE #endif