CRSF ppm center handling (#7870)
* Add ppm center handling to crsf * Improve * Cosmetics * Cosmetics * Fixing scaling * Fixing scaling * Fixing scaling
This commit is contained in:
@@ -20,8 +20,13 @@
|
|||||||
|
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
#define CROSSFIRE_CH_CENTER 0x3E0
|
|
||||||
#define CROSSFIRE_CH_BITS 11
|
#define CROSSFIRE_CH_BITS 11
|
||||||
|
#define CROSSFIRE_CENTER 0x3E0
|
||||||
|
#if defined(PPM_CENTER_ADJUSTABLE)
|
||||||
|
#define CROSSFIRE_CENTER_CH_OFFSET(ch) ((2 * limitAddress(ch)->ppmCenter) + 1) // + 1 is for rouding
|
||||||
|
#else
|
||||||
|
#define CROSSFIRE_CENTER_CH_OFFSET(ch) (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Range for pulses (channels output) is [-1024:+1024]
|
// Range for pulses (channels output) is [-1024:+1024]
|
||||||
uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses)
|
uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses)
|
||||||
@@ -34,7 +39,7 @@ uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses)
|
|||||||
uint32_t bits = 0;
|
uint32_t bits = 0;
|
||||||
uint8_t bitsavailable = 0;
|
uint8_t bitsavailable = 0;
|
||||||
for (int i=0; i<CROSSFIRE_CHANNELS_COUNT; i++) {
|
for (int i=0; i<CROSSFIRE_CHANNELS_COUNT; i++) {
|
||||||
uint32_t val = limit(0, CROSSFIRE_CH_CENTER + (((pulses[i]) * 4) / 5), 2*CROSSFIRE_CH_CENTER);
|
uint32_t val = limit(0, CROSSFIRE_CENTER + (CROSSFIRE_CENTER_CH_OFFSET(i) * 4) / 5 + (pulses[i] * 4) / 5, 2 * CROSSFIRE_CENTER);
|
||||||
bits |= val << bitsavailable;
|
bits |= val << bitsavailable;
|
||||||
bitsavailable += CROSSFIRE_CH_BITS;
|
bitsavailable += CROSSFIRE_CH_BITS;
|
||||||
while (bitsavailable >= 8) {
|
while (bitsavailable >= 8) {
|
||||||
|
|||||||
Reference in New Issue
Block a user