From 4cf6fe6571daf3147819ca01f3cd547fd7f88762 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Fri, 13 Mar 2015 23:48:42 +0100
Subject: [PATCH] Rename 'frsky_hiprec_vfas' to 'frsky_vfas_precision' and
 introduce enum for FRSKY_VFAS_PRECISION_LOW and FRSKY_VFAS_PRECISION_HIGH.

Improves naming for humans.  'hiprec' was meaningless and
untranslatable. See
https://cleancoders.com/episode/clean-code-episode-2/show
---
 docs/Telemetry.md              | 4 ++--
 src/main/config/config.c       | 2 +-
 src/main/io/serial_cli.c       | 3 ++-
 src/main/telemetry/frsky.c     | 2 +-
 src/main/telemetry/frsky.h     | 5 +++++
 src/main/telemetry/telemetry.h | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/Telemetry.md b/docs/Telemetry.md
index 47a52f9d6..4a0a146f8 100644
--- a/docs/Telemetry.md
+++ b/docs/Telemetry.md
@@ -52,12 +52,12 @@ set telemetry_inversion = 1
 Cleanflight can send VFAS (FrSky Ampere Sensor Voltage) in two ways:
 
 ```
-set frsky_hiprec_vfas  = 0
+set frsky_vfas_precision  = 0
 ```
 This is default setting which supports VFAS resolution of 0.2 volts and is supported on all FrSky hardware.
 
 ```
-set frsky_hiprec_vfas  = 1
+set frsky_vfas_precision  = 1
 ```
 This is new setting which supports VFAS resolution of 0.1 volts and is only supported by OpenTX radios (this method uses custom ID 0x39).
 
diff --git a/src/main/config/config.c b/src/main/config/config.c
index 50f44dfa5..50f02873b 100644
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -226,7 +226,7 @@ void resetTelemetryConfig(telemetryConfig_t *telemetryConfig)
     telemetryConfig->gpsNoFixLongitude = 0;
     telemetryConfig->frsky_coordinate_format = FRSKY_FORMAT_DMS;
     telemetryConfig->frsky_unit = FRSKY_UNIT_METRICS;
-    telemetryConfig->frsky_hiprec_vfas = 0;
+    telemetryConfig->frsky_vfas_precision = 0;
 }
 
 void resetBatteryConfig(batteryConfig_t *batteryConfig)
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index ebf5b57ef..2fa9578c1 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -72,6 +72,7 @@
 #include "flight/failsafe.h"
 
 #include "telemetry/telemetry.h"
+#include "telemetry/frsky.h"
 
 #include "config/runtime_config.h"
 #include "config/config.h"
@@ -346,7 +347,7 @@ const clivalue_t valueTable[] = {
     { "frsky_default_longitude",    VAR_FLOAT  | MASTER_VALUE,  &masterConfig.telemetryConfig.gpsNoFixLongitude, -180.0, 180.0 },
     { "frsky_coordinates_format",   VAR_UINT8  | MASTER_VALUE,  &masterConfig.telemetryConfig.frsky_coordinate_format, 0, FRSKY_FORMAT_NMEA },
     { "frsky_unit",                 VAR_UINT8  | MASTER_VALUE,  &masterConfig.telemetryConfig.frsky_unit, 0, FRSKY_UNIT_IMPERIALS },
-    { "frsky_hiprec_vfas",          VAR_UINT8  | MASTER_VALUE,  &masterConfig.telemetryConfig.frsky_hiprec_vfas, 0, 1 },
+    { "frsky_vfas_precision",       VAR_UINT8  | MASTER_VALUE,  &masterConfig.telemetryConfig.frsky_vfas_precision, FRSKY_VFAS_PRECISION_LOW, FRSKY_VFAS_PRECISION_HIGH },
 
     { "battery_capacity",           VAR_UINT16 | MASTER_VALUE,  &masterConfig.batteryConfig.batteryCapacity, 0, 20000 },
     { "vbat_scale",                 VAR_UINT8  | MASTER_VALUE,  &masterConfig.batteryConfig.vbatscale, VBAT_SCALE_MIN, VBAT_SCALE_MAX },
diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c
index 16de75e8d..5a6bca3ae 100644
--- a/src/main/telemetry/frsky.c
+++ b/src/main/telemetry/frsky.c
@@ -372,7 +372,7 @@ static void sendVoltage(void)
  */
 static void sendVoltageAmp(void)
 {
-    if (telemetryConfig->frsky_hiprec_vfas) {
+    if (telemetryConfig->frsky_vfas_precision == FRSKY_VFAS_PRECISION_HIGH) {
         /*
          * Use new ID 0x39 to send voltage directly in 0.1 volts resolution
          */
diff --git a/src/main/telemetry/frsky.h b/src/main/telemetry/frsky.h
index 859fd52d1..efcaacff3 100644
--- a/src/main/telemetry/frsky.h
+++ b/src/main/telemetry/frsky.h
@@ -18,6 +18,11 @@
 #ifndef TELEMETRY_FRSKY_H_
 #define TELEMETRY_FRSKY_H_
 
+typedef enum {
+    FRSKY_VFAS_PRECISION_LOW = 0,
+    FRSKY_VFAS_PRECISION_HIGH
+} frskyVFasPrecision_e;
+
 void handleFrSkyTelemetry(void);
 void checkFrSkyTelemetryState(void);
 
diff --git a/src/main/telemetry/telemetry.h b/src/main/telemetry/telemetry.h
index ddba4cb4f..010331ac2 100644
--- a/src/main/telemetry/telemetry.h
+++ b/src/main/telemetry/telemetry.h
@@ -42,7 +42,7 @@ typedef struct telemetryConfig_s {
     float gpsNoFixLongitude;  
     frskyGpsCoordFormat_e frsky_coordinate_format;   
     frskyUnit_e frsky_unit;
-    uint8_t frsky_hiprec_vfas;
+    uint8_t frsky_vfas_precision;
 } telemetryConfig_t;
 
 void checkTelemetryState(void);