diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2017-06-05 12:21:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 12:21:51 +0200 |
| commit | 3ff5a092fcddcda4308d0220445c22e6847eb1db (patch) | |
| tree | 9f7d6fcb847e189e29bd1477c44299716e8f57e2 | |
| parent | f6fb9f4c77a5d2d7d7faa6743777b85cc297fd9f (diff) | |
| parent | c5be9cd85bb360651604fbcd285978c766494891 (diff) | |
| download | ChibiOS-Contrib-3ff5a092fcddcda4308d0220445c22e6847eb1db.tar.gz ChibiOS-Contrib-3ff5a092fcddcda4308d0220445c22e6847eb1db.tar.bz2 ChibiOS-Contrib-3ff5a092fcddcda4308d0220445c22e6847eb1db.zip | |
Merge pull request #116 from andresv/qei-tim-used-checks
Add checks to STM32 QEI driver if TIMx is already used
| -rw-r--r-- | os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.h | 58 |
1 files changed, 54 insertions, 4 deletions
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.h b/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.h index ba33a29..73468f5 100644 --- a/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.h +++ b/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.h @@ -182,6 +182,56 @@ #error "QEI driver activated but no TIM peripheral assigned"
#endif
+/* Checks on allocation of TIMx units.*/
+#if STM32_QEI_USE_TIM1
+#if defined(STM32_TIM1_IS_USED)
+#error "QEID1 requires TIM1 but the timer is already used"
+#else
+#define STM32_TIM1_IS_USED
+#endif
+#endif
+
+#if STM32_QEI_USE_TIM2
+#if defined(STM32_TIM2_IS_USED)
+#error "QEID2 requires TIM2 but the timer is already used"
+#else
+#define STM32_TIM2_IS_USED
+#endif
+#endif
+
+#if STM32_QEI_USE_TIM3
+#if defined(STM32_TIM3_IS_USED)
+#error "QEID3 requires TIM3 but the timer is already used"
+#else
+#define STM32_TIM3_IS_USED
+#endif
+#endif
+
+#if STM32_QEI_USE_TIM4
+#if defined(STM32_TIM4_IS_USED)
+#error "QEID4 requires TIM4 but the timer is already used"
+#else
+#define STM32_TIM4_IS_USED
+#endif
+#endif
+
+#if STM32_QEI_USE_TIM5
+#if defined(STM32_TIM5_IS_USED)
+#error "QEID5 requires TIM5 but the timer is already used"
+#else
+#define STM32_TIM5_IS_USED
+#endif
+#endif
+
+#if STM32_QEI_USE_TIM8
+#if defined(STM32_TIM8_IS_USED)
+#error "QEID8 requires TIM8 but the timer is already used"
+#else
+#define STM32_TIM8_IS_USED
+#endif
+#endif
+
+/* IRQ priority checks.*/
#if STM32_QEI_USE_TIM1 && \
!OSAL_IRQ_IS_VALID_PRIORITY(STM32_QEI_TIM1_IRQ_PRIORITY)
#error "Invalid IRQ priority assigned to TIM1"
@@ -286,7 +336,7 @@ typedef struct { qeioverflow_t overflow;
/**
* @brief Min count value.
- *
+ *
* @note If min == max, then QEI_COUNT_MIN is used.
*
* @note Only min set to 0 / QEI_COUNT_MIN is supported.
@@ -294,7 +344,7 @@ typedef struct { qeicnt_t min;
/**
* @brief Max count value.
- *
+ *
* @note If min == max, then QEI_COUNT_MAX is used.
*
* @note Only max set to 0 / QEI_COUNT_MAX is supported.
@@ -309,7 +359,7 @@ typedef struct { /**
* @brief Notify of overflow
*
- * @note Overflow notification is performed after
+ * @note Overflow notification is performed after
* value changed notification.
* @note Called from ISR context.
*/
@@ -365,7 +415,7 @@ struct QEIDriver { *
* @notapi
*/
-#define qei_lld_set_count(qeip, value)
+#define qei_lld_set_count(qeip, value)
/*===========================================================================*/
/* External declarations. */
|