Merge pull request cleanflight#1538 from mikeller/fixed_beerotorf4_ti…

…mer_assignments Fixed timer assignments for BEEROTORF4 target.
sambas · Apr 9, 2017 · 7b19e71 · 7b19e71
2 parents 1c22f98 + 80ddb8c
commit 7b19e71
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/main/target/BEEROTORF4/target.c b/src/main/target/BEEROTORF4/target.c
@@ -94,16 +94,14 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
 //    DEF_TIM(TIM4, CH4,  PB9, TIM_USE_MOTOR,                     TIMER_OUTPUT_STANDARD, 0), // M8 (no DMA, doesn't work for DShot)
 
 //    DEF_TIM(TIM4, CH3,  PB8, TIM_USE_LED | TIM_USE_TRANSPONDER, TIMER_OUTPUT_STANDARD, 0), // LED_STRIP / TRANSPONDER - DMA1_ST7 (can be used for DShot, conflicts with OSD TX)
-    { TIM9,  IO_TAG(PA3),  TIM_Channel_2, TIM1_BRK_TIM9_IRQn,  1, IOCFG_AF_PP_PD, GPIO_AF_TIM9  }, // PPM IN
+    { TIM2,  IO_TAG(PA3), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM2  }, // PPM IN
 
-    { TIM1,  IO_TAG(PB0),  TIM_Channel_2, TIM1_CC_IRQn,        1, IOCFG_AF_PP,    GPIO_AF_TIM1  }, // M1 - DMA2_ST6
-    { TIM8,  IO_TAG(PB1),  TIM_Channel_3, TIM8_CC_IRQn,        0, IOCFG_AF_PP_PD, GPIO_AF_TIM8  }, // M2 - DMA2_ST4
-    { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,           1, IOCFG_AF_PP,    GPIO_AF_TIM2  }, // M3 - DMA1_ST6
-    { TIM5,  IO_TAG(PA0),  TIM_Channel_1, TIM5_IRQn,           0, IOCFG_AF_PP,    GPIO_AF_TIM5  }, // M4 - DMA1_ST2
-    { TIM3,  IO_TAG(PC6),  TIM_Channel_1, TIM3_IRQn,           0, IOCFG_AF_PP,    GPIO_AF_TIM3  }, // M5 - DMA1_ST4 (conflicts with SDCard, switch off SDCard DMA if used for DShot)
-    { TIM8,  IO_TAG(PC7),  TIM_Channel_2, TIM8_CC_IRQn,        0, IOCFG_AF_PP_PD, GPIO_AF_TIM8  }, // M6 - DMA2_ST3 (doesn't work for DShot)
-    { TIM3,  IO_TAG(PB5),  TIM_Channel_2, TIM3_IRQn,           1, IOCFG_AF_PP_PD, GPIO_AF_TIM3  }, // M7 - DMA1_ST5 (doesn't work for DShot)
-    { TIM4,  IO_TAG(PB9),  TIM_Channel_4, TIM4_IRQn,           0, IOCFG_AF_PP_PD, GPIO_AF_TIM4  }, // M8 (no DMA, doesn't work for DShot)
-
-    { TIM4,  IO_TAG(PB8),  TIM_Channel_3, TIM4_IRQn,           0, IOCFG_AF_PP_PD, GPIO_AF_TIM4  }, // LED_STRIP / TRANSPONDER - DMA1_ST7 (can be used for DShot, conflicts with OSD TX)
+    { TIM3,  IO_TAG(PB0), TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM3  }, // M1
+    { TIM3,  IO_TAG(PB1), TIM_Channel_4, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM3  }, // M2
+    { TIM5,  IO_TAG(PA1), TIM_Channel_2, TIM5_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM5  }, // M3
+    { TIM5,  IO_TAG(PA0), TIM_Channel_1, TIM5_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM5  }, // M4
+    { TIM3,  IO_TAG(PC6), TIM_Channel_1, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM3  }, // M5
+    { TIM3,  IO_TAG(PC7), TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM3  }, // M6
+    { TIM3,  IO_TAG(PB5), TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_TIM3  }, // M7
+    { TIM11, IO_TAG(PB9), TIM_Channel_1, TIM1_TRG_COM_TIM11_IRQn, 0, IOCFG_AF_PP, GPIO_AF_TIM11 }, // M8
 };
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
@@ -43,14 +43,14 @@
 #define USE_ACC_MPU6050
 #define USE_ACC_SPI_MPU6500
 //#define ACC_ICM20689_ALIGN       CW270_DEG
-#define ACC_MPU6500_ALIGN       CW270_DEG
+#define ACC_MPU6050_ALIGN       CW270_DEG
 
 #define GYRO
 //#define USE_GYRO_SPI_ICM20689
 #define USE_GYRO_MPU6050
 #define USE_GYRO_SPI_MPU6500
 //#define GYRO_ICM20689_ALIGN      CW270_DEG
-#define GYRO_MPU6500_ALIGN      CW270_DEG
+#define GYRO_MPU6050_ALIGN      CW270_DEG
 
 #define BARO
 #define USE_BARO_BMP280
@@ -160,7 +160,7 @@
 #define WS2811_TIMER_CHANNEL            TIM_Channel_3
 #define WS2811_DMA_HANDLER_IDENTIFER    DMA1_ST7_HANDLER
 #define WS2811_DMA_STREAM               DMA1_Stream7
-#define WS2811_DMA_CHANNEL              DMA_Channel_6
+#define WS2811_DMA_CHANNEL              DMA_Channel_2
 #define WS2811_DMA_IRQ                  DMA1_Stream7_IRQn
 #define WS2811_DMA_FLAG                 DMA_FLAG_TCIF7
 #define WS2811_DMA_IT                   DMA_IT_TCIF7
@@ -193,4 +193,4 @@
 #define TARGET_IO_PORTD (BIT(2))
 
 #define USABLE_TIMER_CHANNEL_COUNT 10
-#define USED_TIMERS  ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4)  |  TIM_N(5) | TIM_N(8) | TIM_N(9))
+#define USED_TIMERS  ( TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) | TIM_N(11) )