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

Fixes #2592 - No more reset on 9XR-PRO when leaving PXX protocol

Browse Source 
I would like a code review for this one (both Taranis and 9XR-PRO),
thanks!
This commit is contained in:
Bertrand Songis
2015-08-05 18:49:41 +02:00
parent 3353d989bb
commit 23e16b26f1
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/ppm_arm.cpp
+12 -3
View File
@@ -58,7 +58,15 @@ void setupPulsesPPM(unsigned int port) // Don't enable interru
pwmptr->PWM_CH_NUM[pwmCh].PWM_CMR |= 0x00000200 ; // CPOL
#endif
uint16_t * ptr = (port == TRAINER_MODULE ? trainerPulsesData.ppm.pulses : modulePulsesData[port].ppm.pulses);
PpmPulsesData * ppmPulsesData = (port == TRAINER_MODULE ? &trainerPulsesData.ppm : &modulePulsesData[port].ppm);
uint16_t * ptr = ppmPulsesData->pulses;
#if defined(PCBSKY9X)
ppmPulsesData->index = 0;
#else
ppmPulsesData->ptr = ptr;
#endif
int32_t rest = 22500u * 2;
rest += (int32_t(g_model.moduleData[port].ppmFrameLength)) * 1000;
for (uint32_t i=firstCh; i<lastCh; i++) {
@@ -81,10 +89,11 @@ void setupPulsesPPM(unsigned int port) // Don't enable interru
else if (port == EXTERNAL_MODULE) {
set_external_ppm_parameters(rest, ppmDelay, !g_model.moduleData[EXTERNAL_MODULE].ppmPulsePol);
}
#endif
#if defined(TARANIS_INTERNAL_PPM)
else if (port == INTERNAL_MODULE) {
set_internal_ppm_parameters(rest, ppmDelay, !g_model.moduleData[INTERNAL_MODULE].ppmPulsePol);
}
#endif // #if defined(TARANIS_INTERNAL_PPM)
#endif
#endif // #if defined(TARANIS_INTERNAL_PPM)
}