From e410336348a3e4122a47224320a42ed92157c383 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 22 Dec 2012 22:16:46 +0000 Subject: [PATCH] [arm] PPM_CENTER_ADJUSTABLE should now work --- src/pulses_arm.cpp | 2 +- src/pulses_avr.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pulses_arm.cpp b/src/pulses_arm.cpp index ee7011db0..810fedde4 100644 --- a/src/pulses_arm.cpp +++ b/src/pulses_arm.cpp @@ -93,7 +93,7 @@ void setupPulsesPPM() // Don't enable interrupts through here uint32_t rest = 22500u * 2; //Minimum Framelen=22.5 ms rest += (int32_t(g_model.ppmFrameLength)) * 1000; for (uint32_t i = 0; i < p; i++) { //NUM_CHNOUT - int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CENTER; + int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CH_CENTER(i); rest -= (v); *ptr++ = v; /* as Pat MacKenzie suggests */ } diff --git a/src/pulses_avr.cpp b/src/pulses_avr.cpp index 65c998567..1a1c0a752 100644 --- a/src/pulses_avr.cpp +++ b/src/pulses_avr.cpp @@ -173,11 +173,7 @@ void setupPulsesPPM(uint8_t proto) rest += (int32_t(g_model.ppmFrameLength))*1000; for (uint8_t i=(proto==PROTO_PPM16) ? p-8 : 0; ippmCenter); -#else - int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CENTER; -#endif + int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CH_CENTER(i); rest -= v; *ptr++ = q; *ptr++ = v - q; // total pulse width includes stop phase