diff --git a/conf/modules/dac.xml b/conf/modules/dac.xml deleted file mode 100644 index 69f2d1dd1e..0000000000 --- a/conf/modules/dac.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - General DAC driver - To activate a specific DAC input, define flag USE_DACX where X is your DAC input number - - - - mcu - -
- -
- - - - -
- diff --git a/sw/airborne/arch/chibios/halconf.h b/sw/airborne/arch/chibios/halconf.h index 1d844016d0..7c9b7f53c8 100644 --- a/sw/airborne/arch/chibios/halconf.h +++ b/sw/airborne/arch/chibios/halconf.h @@ -73,12 +73,8 @@ * @brief Enables the DAC subsystem. */ #if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) -#if USE_DAC1 || USE_DAC2 -#define HAL_USE_DAC TRUE -#else #define HAL_USE_DAC FALSE #endif -#endif /** * @brief Enables the EFlash subsystem. diff --git a/sw/airborne/boards/chimera/chibios/v1.0/mcuconf_board.h b/sw/airborne/boards/chimera/chibios/v1.0/mcuconf_board.h index c2323bef21..c8fd8c48e9 100644 --- a/sw/airborne/boards/chimera/chibios/v1.0/mcuconf_board.h +++ b/sw/airborne/boards/chimera/chibios/v1.0/mcuconf_board.h @@ -192,11 +192,7 @@ */ #define STM32_DAC_DUAL_MODE FALSE #define STM32_DAC_USE_DAC1_CH1 FALSE -#if USE_DAC1 -#define STM32_DAC_USE_DAC1_CH2 TRUE -#else #define STM32_DAC_USE_DAC1_CH2 FALSE -#endif #define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 10 #define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 10 #define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2 diff --git a/sw/airborne/boards/lisa_mx/chibios/v2.1/mcuconf_board.h b/sw/airborne/boards/lisa_mx/chibios/v2.1/mcuconf_board.h index 04a384b491..c0724779ed 100644 --- a/sw/airborne/boards/lisa_mx/chibios/v2.1/mcuconf_board.h +++ b/sw/airborne/boards/lisa_mx/chibios/v2.1/mcuconf_board.h @@ -146,16 +146,8 @@ * DAC driver system settings. */ #define STM32_DAC_DUAL_MODE FALSE -#if USE_DAC1 -#define STM32_DAC_USE_DAC1_CH1 TRUE -#else #define STM32_DAC_USE_DAC1_CH1 FALSE -#endif -#if USE_DAC2 -#define STM32_DAC_USE_DAC1_CH2 TRUE -#else #define STM32_DAC_USE_DAC1_CH2 FALSE -#endif #define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 10 #define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 10 #define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2 diff --git a/sw/airborne/boards/lisa_mxs/chibios/v1.0/mcuconf_board.h b/sw/airborne/boards/lisa_mxs/chibios/v1.0/mcuconf_board.h index ae4f82e4e0..4dac58ae67 100644 --- a/sw/airborne/boards/lisa_mxs/chibios/v1.0/mcuconf_board.h +++ b/sw/airborne/boards/lisa_mxs/chibios/v1.0/mcuconf_board.h @@ -146,16 +146,8 @@ * DAC driver system settings. */ #define STM32_DAC_DUAL_MODE FALSE -#if USE_DAC1 -#define STM32_DAC_USE_DAC1_CH1 TRUE -#else #define STM32_DAC_USE_DAC1_CH1 FALSE -#endif -#if USE_DAC2 -#define STM32_DAC_USE_DAC1_CH2 TRUE -#else #define STM32_DAC_USE_DAC1_CH2 FALSE -#endif #define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 10 #define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 10 #define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2 diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c index 2a55fd1b8c..e9dfcc0102 100644 --- a/sw/airborne/mcu.c +++ b/sw/airborne/mcu.c @@ -67,9 +67,6 @@ #if USE_SPI #include "mcu_periph/spi.h" #endif -#ifdef USE_DAC -#include "mcu_periph/dac.h" -#endif #ifdef USE_RNG #include "mcu_periph/rng.h" #endif @@ -252,10 +249,6 @@ void mcu_init(void) #endif #endif // USE_SPI -#ifdef USE_DAC - dac_init(); -#endif - #if USE_UDP0 || USE_UDP1 || USE_UDP2 udp_arch_init(); #endif diff --git a/sw/airborne/mcu_periph/dac.h b/sw/airborne/mcu_periph/dac.h deleted file mode 100644 index f1a7d23b41..0000000000 --- a/sw/airborne/mcu_periph/dac.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef MCU_PERIPH_DAC_H -#define MCU_PERIPH_DAC_H - -#include "mcu_periph/dac_arch.h" - -extern void dac_init(void); - - -#endif /* MCU_PERIPH_DAC_H */