Rename some telemetry variables and methods to better indicate the

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

View File

@ -59,23 +59,23 @@ void initTelemetry(void)
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_switch)
telemetryCurrentlyEnabled = f.ARMED;
enabled = f.ARMED;
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) {
@ -104,23 +104,23 @@ void checkTelemetryState(void)
return;
}
bool telemetryCurrentlyEnabled = isTelemetryEnabled();
bool newEnabledState = determineNewTelemetryEnabledState();
if (!shouldChangeTelemetryStateNow(telemetryCurrentlyEnabled)) {
if (!shouldChangeTelemetryStateNow(newEnabledState)) {
return;
}
if (telemetryCurrentlyEnabled)
if (newEnabledState)
configureTelemetryPort();
else
freeTelemetryPort();
telemetryEnabled = telemetryCurrentlyEnabled;
telemetryEnabled = newEnabledState;
}
void handleTelemetry(void)
{
if (!isTelemetryConfigurationValid || !isTelemetryEnabled())
if (!isTelemetryConfigurationValid || !determineNewTelemetryEnabledState())
return;
if (isTelemetryProviderFrSky()) {

View File

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