From a1ec84b321325c5bef6d2340e8ebdba63731e15e Mon Sep 17 00:00:00 2001 From: Richard Meadows Date: Mon, 29 Feb 2016 21:41:51 +0000 Subject: [PATCH] [lftimer] Remove LFTIMER_XOSC32K option, assume that LFTIMER is XOSC32K if used from now on --- firmware/inc/hw_config.h | 1 - firmware/src/xosc.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/firmware/inc/hw_config.h b/firmware/inc/hw_config.h index e8cb414..147d5c8 100644 --- a/firmware/inc/hw_config.h +++ b/firmware/inc/hw_config.h @@ -218,7 +218,6 @@ */ #ifdef V0987 #define USE_LFTIMER 1 -#define LFTIMER_XOSC32K #else #define USE_LFTIMER 0 #define LFTIMER_GCLKIO_0_PIN PIN_PA27 diff --git a/firmware/src/xosc.c b/firmware/src/xosc.c index d835496..8e8c67a 100644 --- a/firmware/src/xosc.c +++ b/firmware/src/xosc.c @@ -157,8 +157,6 @@ void gclk0_to_hf_clock(void) void gclk0_to_lf_clock(void) { #if USE_LFTIMER - -#ifdef LFTIMER_XOSC32K /* Setup XOSC */ system_clock_source_xosc32k_set_config(SYSTEM_CLOCK_EXTERNAL_CLOCK, SYSTEM_XOSC32K_STARTUP_16384, /* ~500ms startup*/ @@ -172,25 +170,12 @@ void gclk0_to_lf_clock(void) /* Wait for it to stabilise */ while (!system_clock_source_is_ready(SYSTEM_CLOCK_SOURCE_XOSC32K)); - -#else - /* Configure GCLK_IO[0] pin */ - system_pinmux_pin_set_config(LFTIMER_GCLKIO_0_PINMUX >> 16, - LFTIMER_GCLKIO_0_PINMUX & 0xFFFF, - SYSTEM_PINMUX_PIN_DIR_INPUT, - SYSTEM_PINMUX_PIN_PULL_NONE, - true); -#endif #endif /* Configure GCLK0 to GCLK_IO[0] / OSCULP32K */ system_gclk_gen_set_config(GCLK_GENERATOR_0, #if USE_LFTIMER -#ifdef LFTIMER_XOSC32K GCLK_SOURCE_XOSC32K, /* Source */ -#else - GCLK_SOURCE_GCLKIN, /* Source */ -#endif #else GCLK_SOURCE_OSCULP32K, /* Source */ #endif