Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_RCProtocol: fixed DSM parser for 8 channels

Browse Source 
this ensures we remember channels from the previous frame, avoiding a
bug with more than 7 channels
This commit is contained in:
Andrew Tridgell 2018-11-15 17:04:54 +11:00
parent a75d678e7f
commit da0301c208
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_RCProtocol/AP_RCProtocol_DSM.cpp
View File

@ -381,11 +381,9 @@ void AP_RCProtocol_DSM::_process_byte(uint32_t timestamp_us, uint8_t b)
byte_input.last_byte_us = timestamp_us; byte_input.last_byte_us = timestamp_us;
byte_input.buf[byte_input.ofs++] = b; byte_input.buf[byte_input.ofs++] = b;
if (byte_input.ofs == 16) { if (byte_input.ofs == 16) {
uint16_t values[8]; if (dsm_decode(timestamp_us, byte_input.buf, &last_values[0], &num_channels, AP_DSM_MAX_CHANNELS) &&
uint16_t num_values=0; num_channels >= MIN_RCIN_CHANNELS) {
if (dsm_decode(timestamp_us, byte_input.buf, values, &num_values, 8) && add_input(num_channels, last_values, false);
num_values >= MIN_RCIN_CHANNELS) {
add_input(num_values, values, false);
} }
byte_input.ofs = 0; byte_input.ofs = 0;

5
libraries/AP_RCProtocol/AP_RCProtocol_DSM.h
View File

@ -20,6 +20,8 @@
#include "AP_RCProtocol.h" #include "AP_RCProtocol.h"
#include "SoftSerial.h" #include "SoftSerial.h"
#define AP_DSM_MAX_CHANNELS 12
class AP_RCProtocol_DSM : public AP_RCProtocol_Backend { class AP_RCProtocol_DSM : public AP_RCProtocol_Backend {
public: public:
AP_RCProtocol_DSM(AP_RCProtocol &_frontend) : AP_RCProtocol_Backend(_frontend) {} AP_RCProtocol_DSM(AP_RCProtocol &_frontend) : AP_RCProtocol_Backend(_frontend) {}
@ -59,6 +61,9 @@ private:
} bind_state; } bind_state;
uint32_t bind_last_ms; uint32_t bind_last_ms;
uint16_t last_values[AP_DSM_MAX_CHANNELS];
uint16_t num_channels;
struct { struct {
uint8_t buf[16]; uint8_t buf[16];
uint8_t ofs; uint8_t ofs;