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

Rename some telemetry variables and methods to better indicate the

Browse source 
intent of the code and thus the readability and maintainability of it.
This commit is contained in:
Dominic Clifton 2014-04-07 22:31:20 +01:00
parent 9b86d0d833
commit c26d6362b1
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/telemetry_common.c
View file

@ -59,23 +59,23 @@ void initTelemetry(void)
static bool telemetryEnabled = false; static bool telemetryEnabled = false;
bool isTelemetryEnabled(void) bool determineNewTelemetryEnabledState(void)
{ {
bool telemetryCurrentlyEnabled = true; bool enabled = true;
if (mcfg.telemetry_port == TELEMETRY_PORT_UART) { if (mcfg.telemetry_port == TELEMETRY_PORT_UART) {
if (!mcfg.telemetry_switch) if (!mcfg.telemetry_switch)
telemetryCurrentlyEnabled = f.ARMED; enabled = f.ARMED;
else else
telemetryCurrentlyEnabled = rcOptions[BOXTELEMETRY]; enabled = rcOptions[BOXTELEMETRY];
} }
return telemetryCurrentlyEnabled; return enabled;
} }
bool shouldChangeTelemetryStateNow(bool telemetryCurrentlyEnabled) bool shouldChangeTelemetryStateNow(bool newState)
{ {
return telemetryCurrentlyEnabled != telemetryEnabled; return newState != telemetryEnabled;
} }
static void configureTelemetryPort(void) { static void configureTelemetryPort(void) {
@ -104,23 +104,23 @@ void checkTelemetryState(void)
return; return;
} }
bool telemetryCurrentlyEnabled = isTelemetryEnabled(); bool newEnabledState = determineNewTelemetryEnabledState();
if (!shouldChangeTelemetryStateNow(telemetryCurrentlyEnabled)) { if (!shouldChangeTelemetryStateNow(newEnabledState)) {
return; return;
} }
if (telemetryCurrentlyEnabled) if (newEnabledState)
configureTelemetryPort(); configureTelemetryPort();
else else
freeTelemetryPort(); freeTelemetryPort();
telemetryEnabled = telemetryCurrentlyEnabled; telemetryEnabled = newEnabledState;
} }
void handleTelemetry(void) void handleTelemetry(void)
{ {
if (!isTelemetryConfigurationValid || !isTelemetryEnabled()) if (!isTelemetryConfigurationValid || !determineNewTelemetryEnabledState())
return; return;
if (isTelemetryProviderFrSky()) { if (isTelemetryProviderFrSky()) {

1
src/telemetry_common.h
View file

@ -12,6 +12,5 @@
void initTelemetry(void); void initTelemetry(void);
void checkTelemetryState(void); void checkTelemetryState(void);
void handleTelemetry(void); void handleTelemetry(void);
bool isTelemetryEnabled(void);
#endif /* TELEMETRY_COMMON_H_ */ #endif /* TELEMETRY_COMMON_H_ */