Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Removed 'tlm_switch', replaced with 'isModeActivationConditionPresent(BOXTELEMETRY)'.

Browse source
This commit is contained in:
mikeller 2018-05-08 01:14:18 +12:00
parent 7b831f94ee
commit 19a360b867
6 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/fc/fc_core.c
View file

@ -775,8 +775,8 @@ bool processRx(timeUs_t currentTimeUs)
#ifdef USE_TELEMETRY #ifdef USE_TELEMETRY
if (feature(FEATURE_TELEMETRY)) { if (feature(FEATURE_TELEMETRY)) {
if ((!telemetryConfig()->telemetry_switch && ARMING_FLAG(ARMED)) || if ((!isModeActivationConditionPresent(BOXTELEMETRY) && ARMING_FLAG(ARMED)) ||
(telemetryConfig()->telemetry_switch && IS_RC_MODE_ACTIVE(BOXTELEMETRY))) { (isModeActivationConditionPresent(BOXTELEMETRY) && IS_RC_MODE_ACTIVE(BOXTELEMETRY))) {
releaseSharedTelemetryPorts(); releaseSharedTelemetryPorts();
} else { } else {

2
src/main/interface/msp_box.c
View file

@ -246,7 +246,7 @@ void initActiveBoxIds(void)
BME(BOXOSD); BME(BOXOSD);
#ifdef USE_TELEMETRY #ifdef USE_TELEMETRY
if (feature(FEATURE_TELEMETRY) && telemetryConfig()->telemetry_switch) { if (feature(FEATURE_TELEMETRY)) {
BME(BOXTELEMETRY); BME(BOXTELEMETRY);
} }
#endif #endif

1
src/main/interface/settings.c
View file

@ -771,7 +771,6 @@ const clivalue_t valueTable[] = {
// PG_TELEMETRY_CONFIG // PG_TELEMETRY_CONFIG
#ifdef USE_TELEMETRY #ifdef USE_TELEMETRY
{ "tlm_switch", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, telemetry_switch) },
{ "tlm_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, telemetry_inverted) }, { "tlm_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, telemetry_inverted) },
{ "tlm_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, halfDuplex) }, { "tlm_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, halfDuplex) },
#if defined(USE_TELEMETRY_FRSKY_HUB) #if defined(USE_TELEMETRY_FRSKY_HUB)

2
src/main/io/serial.c
View file

@ -276,7 +276,7 @@ bool isSerialConfigValid(const serialConfig_t *serialConfigToCheck)
* rules: * rules:
* - 1 MSP port minimum, max MSP ports is defined and must be adhered to. * - 1 MSP port minimum, max MSP ports is defined and must be adhered to.
* - MSP is allowed to be shared with EITHER any telemetry OR blackbox. * - MSP is allowed to be shared with EITHER any telemetry OR blackbox.
* (using either / or, switching based on armed / disarmed or an AUX channel if 'telemetry_switch' is true * (using either / or, switching based on armed / disarmed or the AUX channel configured for BOXTELEMETRY)
* - serial RX and FrSky / LTM / MAVLink telemetry can be shared * - serial RX and FrSky / LTM / MAVLink telemetry can be shared
* (serial RX using RX line, telemetry using TX line) * (serial RX using RX line, telemetry using TX line)
* - No other sharing combinations are valid. * - No other sharing combinations are valid.

5
src/main/telemetry/telemetry.c
View file

@ -57,12 +57,11 @@
#include "telemetry/ibus.h" #include "telemetry/ibus.h"
#include "telemetry/msp_shared.h" #include "telemetry/msp_shared.h"
PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 1); PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 2);
PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig,
.telemetry_inverted = false, .telemetry_inverted = false,
.halfDuplex = 1, .halfDuplex = 1,
.telemetry_switch = 0,
.gpsNoFixLatitude = 0, .gpsNoFixLatitude = 0,
.gpsNoFixLongitude = 0, .gpsNoFixLongitude = 0,
.frsky_coordinate_format = FRSKY_FORMAT_DMS, .frsky_coordinate_format = FRSKY_FORMAT_DMS,
@ -120,7 +119,7 @@ bool telemetryDetermineEnabledState(portSharing_e portSharing)
bool enabled = portSharing == PORTSHARING_NOT_SHARED; bool enabled = portSharing == PORTSHARING_NOT_SHARED;
if (portSharing == PORTSHARING_SHARED) { if (portSharing == PORTSHARING_SHARED) {
if (telemetryConfig()->telemetry_switch) if (isModeActivationConditionPresent(BOXTELEMETRY))
enabled = IS_RC_MODE_ACTIVE(BOXTELEMETRY); enabled = IS_RC_MODE_ACTIVE(BOXTELEMETRY);
else else
enabled = ARMING_FLAG(ARMED); enabled = ARMING_FLAG(ARMED);

1
src/main/telemetry/telemetry.h
View file

@ -44,7 +44,6 @@ typedef enum {
typedef struct telemetryConfig_s { typedef struct telemetryConfig_s {
int16_t gpsNoFixLatitude; int16_t gpsNoFixLatitude;
int16_t gpsNoFixLongitude; int16_t gpsNoFixLongitude;
uint8_t telemetry_switch; // Use aux channel to change serial output & baudrate( MSP / Telemetry ). It disables automatic switching to Telemetry when armed.
uint8_t telemetry_inverted; uint8_t telemetry_inverted;
uint8_t halfDuplex; uint8_t halfDuplex;
frskyGpsCoordFormat_e frsky_coordinate_format; frskyGpsCoordFormat_e frsky_coordinate_format;