diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-07-20 08:35:30 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-07-20 08:35:30 +0000 |
| commit | b913fe956cc2d46a8bd7aad24a2ac4d792923422 (patch) | |
| tree | 12742ee6161d44527619be3b907ce9fb13401744 | |
| parent | 302d06cc6652cd44f961c35c7194ff3145f55406 (diff) | |
| download | ChibiOS-b913fe956cc2d46a8bd7aad24a2ac4d792923422.tar.gz ChibiOS-b913fe956cc2d46a8bd7aad24a2ac4d792923422.tar.bz2 ChibiOS-b913fe956cc2d46a8bd7aad24a2ac4d792923422.zip | |
I2C. Small fixes in tests.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3168 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | testhal/STM32/I2C/halconf.h | 2 | ||||
| -rw-r--r-- | testhal/STM32/I2C/mcuconf.h | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/testhal/STM32/I2C/halconf.h b/testhal/STM32/I2C/halconf.h index 65d88f586..f64120126 100644 --- a/testhal/STM32/I2C/halconf.h +++ b/testhal/STM32/I2C/halconf.h @@ -58,7 +58,7 @@ * @brief Enables the GPT subsystem.
*/
#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT FALSE
+#define HAL_USE_GPT TRUE
#endif
/**
diff --git a/testhal/STM32/I2C/mcuconf.h b/testhal/STM32/I2C/mcuconf.h index 465de58b8..005c8f83c 100644 --- a/testhal/STM32/I2C/mcuconf.h +++ b/testhal/STM32/I2C/mcuconf.h @@ -61,11 +61,12 @@ /*
* GPT driver system settings.
*/
-#define STM32_GPT_USE_TIM1 FALSE
-#define STM32_GPT_USE_TIM2 FALSE
+#define STM32_GPT_USE_TIM1 TRUE
+#define STM32_GPT_USE_TIM2 TRUE
#define STM32_GPT_USE_TIM3 FALSE
#define STM32_GPT_USE_TIM4 FALSE
#define STM32_GPT_USE_TIM5 FALSE
+#define STM32_GPT_USE_TIM8 FALSE
#define STM32_GPT_TIM1_IRQ_PRIORITY 7
#define STM32_GPT_TIM2_IRQ_PRIORITY 7
#define STM32_GPT_TIM3_IRQ_PRIORITY 7
@@ -80,6 +81,7 @@ #define STM32_ICU_USE_TIM3 FALSE
#define STM32_ICU_USE_TIM4 TRUE
#define STM32_ICU_USE_TIM5 FALSE
+#define STM32_ICU_USE_TIM8 FALSE
#define STM32_ICU_TIM1_IRQ_PRIORITY 7
#define STM32_ICU_TIM2_IRQ_PRIORITY 7
#define STM32_ICU_TIM3_IRQ_PRIORITY 7
@@ -95,6 +97,7 @@ #define STM32_PWM_USE_TIM3 TRUE
#define STM32_PWM_USE_TIM4 TRUE
#define STM32_PWM_USE_TIM5 FALSE
+#define STM32_PWM_USE_TIM8 FALSE
#define STM32_PWM_TIM1_IRQ_PRIORITY 2
#define STM32_PWM_TIM2_IRQ_PRIORITY 2
#define STM32_PWM_TIM3_IRQ_PRIORITY 2
@@ -154,6 +157,12 @@ #define STM32_I2C_I2C2_DMA_PRIORITY 4
#define STM32_I2C_I2C1_DMA_ERROR_HOOK() chSysHalt()
#define STM32_I2C_I2C2_DMA_ERROR_HOOK() chSysHalt()
+/* I2C1 */
+#define STM32_I2C_I2C1_USE_GPT_TIM GPTD1
+#define STM32_I2C_I2C1_USE_POLLING_WAIT FALSE
+/* I2C2 */
+#define STM32_I2C_I2C2_USE_GPT_TIM GPTD2
+#define STM32_I2C_I2C2_USE_POLLING_WAIT FALSE
/*
* EXTI system settings.
|