piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Taranis] "About Us" screen

Browse Source 
[Taranis/sky9x] Lang directory added in TTS script
[Taranis] PPM delay taken into account in Trainer (slave)
This commit is contained in:
bsongis@gmail.com
2013-05-16 10:34:14 +00:00
parent 931294081c
commit 1e500d56bf
10 changed files with 165 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/targets/taranis/trainer_driver.cpp
+1 -2
View File
@@ -57,7 +57,7 @@ void init_trainer_ppm()
TIM3->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 2000000 - 1 ; // 0.5uS
TIM3->CCER = TIM_CCER_CC4E ;
TIM3->CCMR2 = TIM_CCMR2_OC4M_1 | TIM_CCMR2_OC4M_2 | TIM_CCMR2_OC4PE ; // PWM mode 1
TIM3->CCR4 = 600 ; // 300 uS pulse
TIM3->CCR4 = (g_model.moduleData[TRAINER_MODULE].ppmDelay*50+300)*2;
TIM3->BDTR = TIM_BDTR_MOE ;
TIM3->EGR = 1 ;
// TIM3->DIER = TIM_DIER_UDE ;
@@ -148,7 +148,6 @@ extern "C" void TIM3_IRQHandler()
TrainerPulsePtr = ppmStream[TRAINER_MODULE];
TIM3->DIER |= TIM_DIER_UDE ;
TIM3->SR &= ~TIM_SR_UIF ; // Clear this flag
TIM3->DIER |= TIM_DIER_UIE ; // Enable this interrupt
}