@@ -725,35 +725,33 @@ typedef struct {
725725#define TIM_ICSELECTION_DIRECTTI 0U
726726#define TIM_ICPSC_DIV1 0U
727727
728-
729-
730728#define TIM_MASTERSLAVEMODE_DISABLE 0U
731729#define TIM_BREAK_ENABLE 1U
732730#define TIM_LOCKLEVEL_OFF 0U
733731
734732#define TIM_TRGO_RESET 0U
735- #define TIM_TRGO_ENABLE 0x00000010U
736- #define TIM_TRGO_UPDATE 0x00000020U
737- #define TIM_TRGO_OC1 0x00000030U
738- #define TIM_TRGO_OC1REF 0x00000040U
739- #define TIM_TRGO_OC2REF 0x00000050U
740- #define TIM_TRGO_OC3REF 0x00000060U
741- #define TIM_TRGO_OC4REF 0x00000070U
733+ #define TIM_TRGO_ENABLE 0x00000010U
734+ #define TIM_TRGO_UPDATE 0x00000020U
735+ #define TIM_TRGO_OC1 0x00000030U
736+ #define TIM_TRGO_OC1REF 0x00000040U
737+ #define TIM_TRGO_OC2REF 0x00000050U
738+ #define TIM_TRGO_OC3REF 0x00000060U
739+ #define TIM_TRGO_OC4REF 0x00000070U
742740
743741#define TIM_TRGO2_RESET 0U
744- #define TIM_TRGO2_ENABLE 0x00000001U
745- #define TIM_TRGO2_UPDATE 0x00000002U
746- #define TIM_TRGO2_OC1 0x00000003U
747- #define TIM_TRGO2_OC1REF 0x00000004U
748- #define TIM_TRGO2_OC2REF 0x00000005U
749- #define TIM_TRGO2_OC3REF 0x00000006U
750- #define TIM_TRGO2_OC4REF 0x00000007U
751- #define TIM_TRGO2_OC5REF 0x00000008U
752- #define TIM_TRGO2_OC6REF 0x00000009U
742+ #define TIM_TRGO2_ENABLE 0x00000001U
743+ #define TIM_TRGO2_UPDATE 0x00000002U
744+ #define TIM_TRGO2_OC1 0x00000003U
745+ #define TIM_TRGO2_OC1REF 0x00000004U
746+ #define TIM_TRGO2_OC2REF 0x00000005U
747+ #define TIM_TRGO2_OC3REF 0x00000006U
748+ #define TIM_TRGO2_OC4REF 0x00000007U
749+ #define TIM_TRGO2_OC5REF 0x00000008U
750+ #define TIM_TRGO2_OC6REF 0x00000009U
753751#define TIM_TRGO2_OC4REF_RISING_OC6REF_FALLING 0x0000000AU
754- #define TIM_TRGO2_OC4REF_RISING_OC6REF_RISING 0x0000000BU
752+ #define TIM_TRGO2_OC4REF_RISING_OC6REF_RISING 0x0000000BU
755753#define TIM_TRGO2_OC5REF_RISING_OC6REF_FALLING 0x0000000CU
756- #define TIM_TRGO2_OC5REF_RISING_OC6REF_RISING 0x0000000DU
754+ #define TIM_TRGO2_OC5REF_RISING_OC6REF_RISING 0x0000000DU
757755
758756#define TIM_CHANNEL_1 0x00000000U
759757#define TIM_CHANNEL_2 0x00000004U
@@ -792,7 +790,6 @@ typedef struct {
792790#define TIM_SR_TIF (1U << 6)
793791#define TIM_SR_BIF (1U << 7)
794792
795-
796793#define TIM_CCMR1_CC1S (3U << 0)
797794#define TIM_CCMR1_OC1PE (1U << 3)
798795#define TIM_CCMR1_OC1M (7U << 4)
0 commit comments