rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update common telemetry code so that it verifies that the telemetry 

configuration is valid.

Internally this uses a flag so that the configuration is not continually
verified.
This commit is contained in:
Dominic Clifton 2014-04-07 22:23:11 +01:00
parent 1c0e0618e5
commit 9b86d0d833
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/telemetry_common.c
View File

@ -4,6 +4,8 @@
#include "telemetry_frsky.h"
#include "telemetry_hott.h"
static bool isTelemetryConfigurationValid = false; // flag used to avoid repeated configuration checks
bool isTelemetryProviderFrSky(void)
{
return mcfg.telemetry_provider == TELEMETRY_PROVIDER_FRSKY;
@ -14,12 +16,37 @@ bool isTelemetryProviderHoTT(void)
return mcfg.telemetry_provider == TELEMETRY_PROVIDER_HOTT;
}
bool canUseTelemetryWithCurrentConfiguration(void) {
if (!feature(FEATURE_TELEMETRY)) {
return false;
}
if (!feature(FEATURE_SOFTSERIAL)) {
if (mcfg.telemetry_port == TELEMETRY_PORT_SOFTSERIAL_1 || mcfg.telemetry_port == TELEMETRY_PORT_SOFTSERIAL_1) {
// softserial feature must be enabled to use telemetry on softserial ports
return false;
}
}
if (isTelemetryProviderHoTT()) {
if (mcfg.telemetry_port == TELEMETRY_PORT_UART) {
// HoTT requires a serial port that supports RX/TX mode swapping
return false;
}
}
return true;
}
void initTelemetry(void)
{
// Sanity check for softserial vs. telemetry port
// Force telemetry to uart when softserial disabled
if (!feature(FEATURE_SOFTSERIAL))
mcfg.telemetry_port = TELEMETRY_PORT_UART;
isTelemetryConfigurationValid = canUseTelemetryWithCurrentConfiguration();
if (mcfg.telemetry_port == TELEMETRY_PORT_SOFTSERIAL_1)
core.telemport = &(softSerialPorts[0].port);
else if (mcfg.telemetry_port == TELEMETRY_PORT_SOFTSERIAL_2)
@ -51,7 +78,7 @@ bool shouldChangeTelemetryStateNow(bool telemetryCurrentlyEnabled)
return telemetryCurrentlyEnabled != telemetryEnabled;
}
void configureTelemetryPort(void) {
static void configureTelemetryPort(void) {
if (isTelemetryProviderFrSky()) {
configureFrSkyTelemetryPort();
}
@ -73,7 +100,7 @@ void freeTelemetryPort(void) {
void checkTelemetryState(void)
{
if (!feature(FEATURE_TELEMETRY)) {
if (!isTelemetryConfigurationValid) {
return;
}
@ -93,7 +120,7 @@ void checkTelemetryState(void)
void handleTelemetry(void)
{
if (!isTelemetryEnabled())
if (!isTelemetryConfigurationValid || !isTelemetryEnabled())
return;
if (isTelemetryProviderFrSky()) {