diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-04-07 07:57:43 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-04-07 07:57:43 +0000 |
| commit | d009502eb4c6b467d80a686b9a91f3ddbf0b595c (patch) | |
| tree | ada55de9b67718570aeb5aee67ca667e2ed7caee | |
| parent | 3adcb46879db0ebabf5d5575dcc724e8483c9079 (diff) | |
| download | ChibiOS-d009502eb4c6b467d80a686b9a91f3ddbf0b595c.tar.gz ChibiOS-d009502eb4c6b467d80a686b9a91f3ddbf0b595c.tar.bz2 ChibiOS-d009502eb4c6b467d80a686b9a91f3ddbf0b595c.zip | |
Added new pwmIsChannelEnabledI() API to the PWM driver, implemented in the STM32 driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5554 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/include/pwm.h | 12 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/pwm_lld.h | 13 | ||||
| -rw-r--r-- | readme.txt | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/os/hal/include/pwm.h b/os/hal/include/pwm.h index ce8e8b29b..a735cfbc2 100644 --- a/os/hal/include/pwm.h +++ b/os/hal/include/pwm.h @@ -211,6 +211,18 @@ typedef void (*pwmcallback_t)(PWMDriver *pwmp); */
#define pwmDisableChannelI(pwmp, channel) \
pwm_lld_disable_channel(pwmp, channel)
+
+/**
+ * @brief Returns a PWM channel status.
+ * @pre The PWM unit must have been activated using @p pwmStart().
+ *
+ * @param[in] pwmp pointer to a @p PWMDriver object
+ * @param[in] channel PWM channel identifier (0...PWM_CHANNELS-1)
+ *
+ * @iclass
+ */
+#define pwmIsChannelEnabledI(pwmp, channel) \
+ pwm_lld_is_channel_enabled(pwmp, channel)
/** @} */
/*===========================================================================*/
diff --git a/os/hal/platforms/STM32/pwm_lld.h b/os/hal/platforms/STM32/pwm_lld.h index 94426e28c..8b1761f82 100644 --- a/os/hal/platforms/STM32/pwm_lld.h +++ b/os/hal/platforms/STM32/pwm_lld.h @@ -406,6 +406,19 @@ struct PWMDriver { #define pwm_lld_change_period(pwmp, period) \
((pwmp)->tim->ARR = (uint16_t)((period) - 1))
+/**
+ * @brief Returns a PWM channel status.
+ * @pre The PWM unit must have been activated using @p pwmStart().
+ *
+ * @param[in] pwmp pointer to a @p PWMDriver object
+ * @param[in] channel PWM channel identifier (0...PWM_CHANNELS-1)
+ *
+ * @notapi
+ */
+#define pwm_lld_is_channel_enabled(pwmp, channel) \
+ ((pwmp->tim->CCR[channel] == 0) && \
+ ((pwmp->tim->DIER & (2 << channel)) == 0))
+
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
diff --git a/readme.txt b/readme.txt index 7941d860e..094a83c55 100644 --- a/readme.txt +++ b/readme.txt @@ -138,6 +138,8 @@ (backported to 2.4.3).
- FIX: Fixed wrong SPI path in platform_f105_f107.mk (bug 3598151).
- FIX: Fixed PHY powerdown issues not fixed (bug 3596911).
+- NEW: Added new pwmIsChannelEnabledI() API to the PWM driver, implemented
+ in the STM32 driver.
- NEW: Added support for timers 6, 7, 9, 11, 12, 14 to the STM32 GPT driver.
- NEW: Added support for timer 9 to the STM32 PWM driver.
- NEW: Relicensed parts of the distribution tree under the Apache 2.0
|