3djc/telem rename (#3678)
* Rename EXT option to TELEMETRY * Change test accordingly * Rename FRSKY to TELEMETRY_FRSKY * Rename ARDUPILOT to TELEMETRY_ARDUPILOT * More renames (JETI, MAVLINK, NMEA) * Fixes to make commit-test happy * Further tests added to commit-test * Cleanup * Rename EXTSTD to TELEMETRY_NONE
This commit is contained in:
@@ -163,7 +163,7 @@ NOINLINE void processFrskyTelemetryData(uint8_t data)
|
||||
#endif
|
||||
} // switch
|
||||
|
||||
#if defined(FRSKY_SPORT)
|
||||
#if defined(TELEMETRY_FRSKY_SPORT)
|
||||
if (IS_FRSKY_SPORT_PROTOCOL() && telemetryRxBufferCount >= FRSKY_SPORT_PACKET_SIZE) {
|
||||
processSportPacket(telemetryRxBuffer);
|
||||
dataState = STATE_DATA_IDLE;
|
||||
|
||||
@@ -21,19 +21,19 @@
|
||||
#ifndef _TELEMETRY_H_
|
||||
#define _TELEMETRY_H_
|
||||
|
||||
#if defined(FRSKY)
|
||||
#if defined(TELEMETRY_FRSKY)
|
||||
// FrSky Telemetry
|
||||
#include "frsky.h"
|
||||
#elif defined(JETI)
|
||||
#elif defined(TELEMETRY_JETI)
|
||||
// Jeti-DUPLEX Telemetry
|
||||
#include "jeti.h"
|
||||
#elif defined(ARDUPILOT)
|
||||
#elif defined(TELEMETRY_ARDUPILOT)
|
||||
// ArduPilot Telemetry
|
||||
#include "ardupilot.h"
|
||||
#elif defined(NMEA)
|
||||
#elif defined(TELEMETRY_NMEA)
|
||||
// NMEA Telemetry
|
||||
#include "nmea.h"
|
||||
#elif defined(MAVLINK)
|
||||
#elif defined(TELEMETRY_MAVLINK)
|
||||
// Mavlink Telemetry
|
||||
#include "mavlink.h"
|
||||
#endif
|
||||
|
||||
@@ -483,12 +483,12 @@ void setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t subId, u
|
||||
int index = availableTelemetryIndex();
|
||||
if (index >= 0) {
|
||||
switch (protocol) {
|
||||
#if defined(FRSKY_SPORT)
|
||||
#if defined(TELEMETRY_FRSKY_SPORT)
|
||||
case TELEM_PROTO_FRSKY_SPORT:
|
||||
frskySportSetDefault(index, id, subId, instance);
|
||||
break;
|
||||
#endif
|
||||
#if defined(FRSKY)
|
||||
#if defined(TELEMETRY_FRSKY)
|
||||
case TELEM_PROTO_FRSKY_D:
|
||||
frskyDSetDefault(index, id);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user