diff options
Diffstat (limited to 'testhal/STM32/STM32F3xx/COMP')
| -rw-r--r-- | testhal/STM32/STM32F3xx/COMP/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32F3xx/COMP/halconf.h | 6 | ||||
| -rw-r--r-- | testhal/STM32/STM32F3xx/COMP/halconf_community.h | 45 | ||||
| -rw-r--r-- | testhal/STM32/STM32F3xx/COMP/mcuconf.h | 21 | ||||
| -rw-r--r-- | testhal/STM32/STM32F3xx/COMP/mcuconf_community.h | 82 | 
5 files changed, 130 insertions, 28 deletions
diff --git a/testhal/STM32/STM32F3xx/COMP/Makefile b/testhal/STM32/STM32F3xx/COMP/Makefile index e19b2ee..0e3d04d 100644 --- a/testhal/STM32/STM32F3xx/COMP/Makefile +++ b/testhal/STM32/STM32F3xx/COMP/Makefile @@ -10,7 +10,7 @@ endif  # C specific options here (added to USE_OPT).
  ifeq ($(USE_COPT),)
 -  USE_COPT =
 +  USE_COPT = 
  endif
  # C++ specific options here (added to USE_OPT).
 @@ -149,7 +149,7 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)  INCDIR = $(CHIBIOS)/os/license \
           $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
           $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
 -         $(CHIBIOS)/os/various
 +         $(CHIBIOS_CONTRIB)/os/various
  #
  # Project, sources and paths
 diff --git a/testhal/STM32/STM32F3xx/COMP/halconf.h b/testhal/STM32/STM32F3xx/COMP/halconf.h index 77a7055..9192b27 100644 --- a/testhal/STM32/STM32F3xx/COMP/halconf.h +++ b/testhal/STM32/STM32F3xx/COMP/halconf.h @@ -41,7 +41,7 @@   * @brief   Enables the ADC subsystem.
   */
  #if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
 -#define HAL_USE_ADC                 FALSE
 +#define HAL_USE_ADC                 TRUE
  #endif
  /**
 @@ -412,10 +412,6 @@  #define USB_USE_WAIT                FALSE
  #endif
 -/*===========================================================================*/
 -/* Community drivers's includes                                              */
 -/*===========================================================================*/
 -
  #include "halconf_community.h"
  #endif /* HALCONF_H */
 diff --git a/testhal/STM32/STM32F3xx/COMP/halconf_community.h b/testhal/STM32/STM32F3xx/COMP/halconf_community.h index df052f8..76d4856 100644 --- a/testhal/STM32/STM32F3xx/COMP/halconf_community.h +++ b/testhal/STM32/STM32F3xx/COMP/halconf_community.h @@ -84,7 +84,28 @@   * @brief   Enables the TIMCAP subsystem.
   */
  #if !defined(HAL_USE_COMP) || defined(__DOXYGEN__)
 -#define HAL_USE_COMP              TRUE
 +#define HAL_USE_COMP                TRUE
 +#endif
 +
 +/**
 + * @brief   Enables the QEI subsystem.
 + */
 +#if !defined(HAL_USE_QEI) || defined(__DOXYGEN__)
 +#define HAL_USE_QEI                 FALSE
 +#endif
 +
 +/**
 + * @brief   Enables the USBH subsystem.
 + */
 +#if !defined(HAL_USE_USBH) || defined(__DOXYGEN__)
 +#define HAL_USE_USBH                FALSE
 +#endif
 +
 +/**
 + * @brief   Enables the USB_MSD subsystem.
 + */
 +#if !defined(HAL_USE_USB_MSD) || defined(__DOXYGEN__)
 +#define HAL_USE_USB_MSD             FALSE
  #endif
  /*===========================================================================*/
 @@ -115,6 +136,24 @@  #define ONEWIRE_USE_SEARCH_ROM      TRUE
  /*===========================================================================*/
 +/* QEI driver related settings.                                              */
 +/*===========================================================================*/
 +
 +/**
 + * @brief   Enables discard of overlow
 + */
 +#if !defined(QEI_USE_OVERFLOW_DISCARD) || defined(__DOXYGEN__)
 +#define QEI_USE_OVERFLOW_DISCARD    FALSE
 +#endif
 +
 +/**
 + * @brief   Enables min max of overlow
 + */
 +#if !defined(QEI_USE_OVERFLOW_MINMAX) || defined(__DOXYGEN__)
 +#define QEI_USE_OVERFLOW_MINMAX     FALSE
 +#endif
 +
 +/*===========================================================================*/
  /* EEProm driver related settings.                                           */
  /*===========================================================================*/
 @@ -122,12 +161,12 @@   * @brief   Enables 24xx series I2C eeprom device driver.
   * @note    Disabling this option saves both code and data space.
   */
 -#define EEPROM_USE_EE24XX TRUE
 +#define EEPROM_USE_EE24XX FALSE
   /**
   * @brief   Enables 25xx series SPI eeprom device driver.
   * @note    Disabling this option saves both code and data space.
   */
 -#define EEPROM_USE_EE25XX TRUE
 +#define EEPROM_USE_EE25XX FALSE
  #endif /* HALCONF_COMMUNITY_H */
 diff --git a/testhal/STM32/STM32F3xx/COMP/mcuconf.h b/testhal/STM32/STM32F3xx/COMP/mcuconf.h index a270b6f..9b14ad7 100644 --- a/testhal/STM32/STM32F3xx/COMP/mcuconf.h +++ b/testhal/STM32/STM32F3xx/COMP/mcuconf.h @@ -90,10 +90,10 @@   */
  #define STM32_ADC_DUAL_MODE                 FALSE
  #define STM32_ADC_COMPACT_SAMPLES           FALSE
 -#define STM32_ADC_USE_ADC1                  FALSE
 -#define STM32_ADC_USE_ADC2                  FALSE
 -#define STM32_ADC_USE_ADC3                  FALSE
 -#define STM32_ADC_USE_ADC4                  FALSE
 +#define STM32_ADC_USE_ADC1                  TRUE
 +#define STM32_ADC_USE_ADC2                  TRUE
 +#define STM32_ADC_USE_ADC3                  TRUE
 +#define STM32_ADC_USE_ADC4                  TRUE
  #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)
  #define STM32_ADC_ADC2_DMA_STREAM           STM32_DMA_STREAM_ID(2, 1)
  #define STM32_ADC_ADC3_DMA_STREAM           STM32_DMA_STREAM_ID(2, 5)
 @@ -115,7 +115,7 @@  /*
   * CAN driver system settings.
   */
 -#define STM32_CAN_USE_CAN1                  TRUE
 +#define STM32_CAN_USE_CAN1                  FALSE
  #define STM32_CAN_CAN1_IRQ_PRIORITY         11
  /*
 @@ -123,7 +123,7 @@   */
  #define STM32_DAC_DUAL_MODE                 FALSE
  #define STM32_DAC_USE_DAC1_CH1              TRUE
 -#define STM32_DAC_USE_DAC1_CH2              FALSE
 +#define STM32_DAC_USE_DAC1_CH2              TRUE
  #define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10
  #define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10
  #define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2
 @@ -150,7 +150,7 @@  /*
   * I2C driver system settings.
   */
 -#define STM32_I2C_USE_I2C1                  TRUE
 +#define STM32_I2C_USE_I2C1                  FALSE
  #define STM32_I2C_USE_I2C2                  FALSE
  #define STM32_I2C_BUSY_TIMEOUT              50
  #define STM32_I2C_I2C1_IRQ_PRIORITY         10
 @@ -206,7 +206,7 @@  /*
   * SPI driver system settings.
   */
 -#define STM32_SPI_USE_SPI1                  TRUE
 +#define STM32_SPI_USE_SPI1                  FALSE
  #define STM32_SPI_USE_SPI2                  FALSE
  #define STM32_SPI_USE_SPI3                  FALSE
  #define STM32_SPI_SPI1_DMA_PRIORITY         1
 @@ -248,11 +248,8 @@  /*
   * WDG driver system settings.
   */
 -#define STM32_WDG_USE_IWDG                  TRUE
 +#define STM32_WDG_USE_IWDG                  FALSE
 -/*
 - * header for community drivers.
 - */
  #include "mcuconf_community.h"
  #endif /* MCUCONF_H */
 diff --git a/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h b/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h index 1f89e54..cf6a1ce 100644 --- a/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h +++ b/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h @@ -47,13 +47,13 @@  /*   * TIMCAP driver system settings.   */ -#define STM32_TIMCAP_USE_TIM1                  FALSE +#define STM32_TIMCAP_USE_TIM1                  TRUE  #define STM32_TIMCAP_USE_TIM2                  FALSE -#define STM32_TIMCAP_USE_TIM3                  FALSE -#define STM32_TIMCAP_USE_TIM4                  FALSE -#define STM32_TIMCAP_USE_TIM5                  FALSE -#define STM32_TIMCAP_USE_TIM8                  FALSE -#define STM32_TIMCAP_USE_TIM9                  FALSE +#define STM32_TIMCAP_USE_TIM3                  TRUE +#define STM32_TIMCAP_USE_TIM4                  TRUE +#define STM32_TIMCAP_USE_TIM5                  TRUE +#define STM32_TIMCAP_USE_TIM8                  TRUE +#define STM32_TIMCAP_USE_TIM9                  TRUE  #define STM32_TIMCAP_TIM1_IRQ_PRIORITY         3  #define STM32_TIMCAP_TIM2_IRQ_PRIORITY         3  #define STM32_TIMCAP_TIM3_IRQ_PRIORITY         3 @@ -83,3 +83,73 @@  #define STM32_DISABLE_EXTI30_32_HANDLER  #define STM32_DISABLE_EXTI33_HANDLER  #endif + +/* + * USBH driver system settings. + */ +#define STM32_OTG1_CHANNELS_NUMBER          8 +#define STM32_OTG2_CHANNELS_NUMBER          12 + +#define STM32_USBH_USE_OTG1                 1 +#define STM32_OTG1_RXFIFO_SIZE              1024 +#define STM32_OTG1_PTXFIFO_SIZE             128 +#define STM32_OTG1_NPTXFIFO_SIZE            128 + +#define STM32_USBH_USE_OTG2                 0 +#define STM32_OTG2_RXFIFO_SIZE              2048 +#define STM32_OTG2_PTXFIFO_SIZE             1024 +#define STM32_OTG2_NPTXFIFO_SIZE            1024 + +#define STM32_USBH_MIN_QSPACE               4 +#define STM32_USBH_CHANNELS_NP              4 + +/* + * CRC driver system settings. + */ +#define STM32_CRC_USE_CRC1                  TRUE +#define STM32_CRC_CRC1_DMA_IRQ_PRIORITY     1 +#define STM32_CRC_CRC1_DMA_PRIORITY         2 +#define STM32_CRC_CRC1_DMA_STREAM           STM32_DMA1_STREAM2 + +#define CRCSW_USE_CRC1                      FALSE +#define CRCSW_CRC32_TABLE                   TRUE +#define CRCSW_CRC16_TABLE                   TRUE +#define CRCSW_PROGRAMMABLE                  TRUE + +/* + * EICU driver system settings. + */ +#define STM32_EICU_USE_TIM1                 TRUE +#define STM32_EICU_USE_TIM2                 FALSE +#define STM32_EICU_USE_TIM3                 TRUE +#define STM32_EICU_USE_TIM4                 TRUE +#define STM32_EICU_USE_TIM5                 TRUE +#define STM32_EICU_USE_TIM8                 TRUE +#define STM32_EICU_USE_TIM9                 TRUE +#define STM32_EICU_USE_TIM10                TRUE +#define STM32_EICU_USE_TIM11                TRUE +#define STM32_EICU_USE_TIM12                TRUE +#define STM32_EICU_USE_TIM13                TRUE +#define STM32_EICU_USE_TIM14                TRUE +#define STM32_EICU_TIM1_IRQ_PRIORITY        7 +#define STM32_EICU_TIM2_IRQ_PRIORITY        7 +#define STM32_EICU_TIM3_IRQ_PRIORITY        7 +#define STM32_EICU_TIM4_IRQ_PRIORITY        7 +#define STM32_EICU_TIM5_IRQ_PRIORITY        7 +#define STM32_EICU_TIM8_IRQ_PRIORITY        7 +#define STM32_EICU_TIM9_IRQ_PRIORITY        7 +#define STM32_EICU_TIM10_IRQ_PRIORITY       7 +#define STM32_EICU_TIM11_IRQ_PRIORITY       7 +#define STM32_EICU_TIM12_IRQ_PRIORITY       7 +#define STM32_EICU_TIM13_IRQ_PRIORITY       7 +#define STM32_EICU_TIM14_IRQ_PRIORITY       7 + +/* + * QEI driver system settings. + */ +#define STM32_QEI_USE_TIM1                TRUE +#define STM32_QEI_USE_TIM2                FALSE +#define STM32_QEI_USE_TIM3                TRUE +#define STM32_QEI_TIM1_IRQ_PRIORITY         3 +#define STM32_QEI_TIM2_IRQ_PRIORITY         3 +#define STM32_QEI_TIM3_IRQ_PRIORITY         3  | 
