|
@@ -737,6 +737,15 @@ typedef struct
|
|
|
*/
|
|
*/
|
|
|
#endif /* USE_FULL_LL_DRIVER */
|
|
#endif /* USE_FULL_LL_DRIVER */
|
|
|
|
|
|
|
|
|
|
+/** Legacy definitions for compatibility purpose
|
|
|
|
|
+@cond 0
|
|
|
|
|
+ */
|
|
|
|
|
+#define LL_TIM_OCMODE_ASSYMETRIC_PWM1 LL_TIM_OCMODE_ASYMMETRIC_PWM1
|
|
|
|
|
+#define LL_TIM_OCMODE_ASSYMETRIC_PWM2 LL_TIM_OCMODE_ASYMMETRIC_PWM2
|
|
|
|
|
+/**
|
|
|
|
|
+@endcond
|
|
|
|
|
+ */
|
|
|
|
|
+
|
|
|
/** @defgroup TIM_LL_EC_OCMODE Output Configuration Mode
|
|
/** @defgroup TIM_LL_EC_OCMODE Output Configuration Mode
|
|
|
* @{
|
|
* @{
|
|
|
*/
|
|
*/
|
|
@@ -752,8 +761,8 @@ typedef struct
|
|
|
#define LL_TIM_OCMODE_RETRIG_OPM2 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_0) /*!<Retrigerrable OPM mode 2*/
|
|
#define LL_TIM_OCMODE_RETRIG_OPM2 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_0) /*!<Retrigerrable OPM mode 2*/
|
|
|
#define LL_TIM_OCMODE_COMBINED_PWM1 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_2) /*!<Combined PWM mode 1*/
|
|
#define LL_TIM_OCMODE_COMBINED_PWM1 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_2) /*!<Combined PWM mode 1*/
|
|
|
#define LL_TIM_OCMODE_COMBINED_PWM2 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_0 | TIM_CCMR1_OC1M_2) /*!<Combined PWM mode 2*/
|
|
#define LL_TIM_OCMODE_COMBINED_PWM2 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_0 | TIM_CCMR1_OC1M_2) /*!<Combined PWM mode 2*/
|
|
|
-#define LL_TIM_OCMODE_ASSYMETRIC_PWM1 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2) /*!<Asymmetric PWM mode 1*/
|
|
|
|
|
-#define LL_TIM_OCMODE_ASSYMETRIC_PWM2 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M) /*!<Asymmetric PWM mode 2*/
|
|
|
|
|
|
|
+#define LL_TIM_OCMODE_ASYMMETRIC_PWM1 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2) /*!<Asymmetric PWM mode 1*/
|
|
|
|
|
+#define LL_TIM_OCMODE_ASYMMETRIC_PWM2 (TIM_CCMR1_OC1M_3 | TIM_CCMR1_OC1M) /*!<Asymmetric PWM mode 2*/
|
|
|
/**
|
|
/**
|
|
|
* @}
|
|
* @}
|
|
|
*/
|
|
*/
|
|
@@ -2143,8 +2152,8 @@ __STATIC_INLINE void LL_TIM_OC_ConfigOutput(TIM_TypeDef *TIMx, uint32_t Channel,
|
|
|
* @arg @ref LL_TIM_OCMODE_RETRIG_OPM2
|
|
* @arg @ref LL_TIM_OCMODE_RETRIG_OPM2
|
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM1
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM1
|
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM2
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM2
|
|
|
- * @arg @ref LL_TIM_OCMODE_ASSYMETRIC_PWM1
|
|
|
|
|
- * @arg @ref LL_TIM_OCMODE_ASSYMETRIC_PWM2
|
|
|
|
|
|
|
+ * @arg @ref LL_TIM_OCMODE_ASYMMETRIC_PWM1
|
|
|
|
|
+ * @arg @ref LL_TIM_OCMODE_ASYMMETRIC_PWM2
|
|
|
* @retval None
|
|
* @retval None
|
|
|
*/
|
|
*/
|
|
|
__STATIC_INLINE void LL_TIM_OC_SetMode(TIM_TypeDef *TIMx, uint32_t Channel, uint32_t Mode)
|
|
__STATIC_INLINE void LL_TIM_OC_SetMode(TIM_TypeDef *TIMx, uint32_t Channel, uint32_t Mode)
|
|
@@ -2183,8 +2192,8 @@ __STATIC_INLINE void LL_TIM_OC_SetMode(TIM_TypeDef *TIMx, uint32_t Channel, uint
|
|
|
* @arg @ref LL_TIM_OCMODE_RETRIG_OPM2
|
|
* @arg @ref LL_TIM_OCMODE_RETRIG_OPM2
|
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM1
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM1
|
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM2
|
|
* @arg @ref LL_TIM_OCMODE_COMBINED_PWM2
|
|
|
- * @arg @ref LL_TIM_OCMODE_ASSYMETRIC_PWM1
|
|
|
|
|
- * @arg @ref LL_TIM_OCMODE_ASSYMETRIC_PWM2
|
|
|
|
|
|
|
+ * @arg @ref LL_TIM_OCMODE_ASYMMETRIC_PWM1
|
|
|
|
|
+ * @arg @ref LL_TIM_OCMODE_ASYMMETRIC_PWM2
|
|
|
*/
|
|
*/
|
|
|
__STATIC_INLINE uint32_t LL_TIM_OC_GetMode(const TIM_TypeDef *TIMx, uint32_t Channel)
|
|
__STATIC_INLINE uint32_t LL_TIM_OC_GetMode(const TIM_TypeDef *TIMx, uint32_t Channel)
|
|
|
{
|
|
{
|