Merge pull request #6540 from AlienWiiBF/FortiniF4_update

Fortini F4 Rev3 CAM control update
This commit is contained in:
Michael Keller 2018-08-11 15:18:36 +12:00 committed by GitHub
commit 43159e95af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions

View File

@ -39,6 +39,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
#endif
DEF_TIM(TIM4, CH4, PB9, TIM_USE_PPM, 0, 0 ), // PPM IN
#if defined(FF_FORTINIF4_REV03)
DEF_TIM(TIM4, CH2, PB7, TIM_USE_ANY, 0, 0 ), // FC CAM - DMA1_ST3
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0 ), // LED - DMA1_ST0
#else
DEF_TIM(TIM4, CH2, PB7, TIM_USE_LED, 0, 0 ), // LED - DMA1_ST3

View File

@ -226,6 +226,10 @@
/*---------------------------------*/
/*--------------TIMERS-------------*/
#if defined(FF_FORTINIF4_REV03)
#define USABLE_TIMER_CHANNEL_COUNT 7
#else
#define USABLE_TIMER_CHANNEL_COUNT 6
#endif
#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(4) )
/*---------------------------------*/