From 815fef458c7bfc5c80e4c6fd9efa8a9e8a13c54e Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Thu, 6 Aug 2015 14:31:50 +0200
Subject: [PATCH] Fixes #2652:  Add missing presets to frskyDSetDefault()

---
 radio/src/telemetry/frsky_d.cpp     | 15 ++++++++++++---
 radio/src/telemetry/frsky_sport.cpp |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/radio/src/telemetry/frsky_d.cpp b/radio/src/telemetry/frsky_d.cpp
index c4e7cccf0..bfe775577 100644
--- a/radio/src/telemetry/frsky_d.cpp
+++ b/radio/src/telemetry/frsky_d.cpp
@@ -665,17 +665,26 @@ void frskyDSetDefault(int index, uint16_t id)
     TelemetryUnit unit = sensor->unit;
     uint8_t prec = min<uint8_t>(2, sensor->prec);
     telemetrySensor.init(sensor->name, unit, prec);
-    if (id >= D_A1_ID && id <= D_A2_ID) {
+    if (id == D_RSSI_ID) {
+      telemetrySensor.filter = 1;
+      telemetrySensor.logs = true;
+    }
+    else if (id >= D_A1_ID && id <= D_A2_ID) {
       telemetrySensor.custom.ratio = 132;
       telemetrySensor.filter = 1;
     }
-    else if (id == D_RSSI_ID) {
-      telemetrySensor.filter = 1;
+    else if (id == CURRENT_ID) {
+      telemetrySensor.onlyPositive = 1;
     }
     else if (unit == UNIT_RPMS) {
       telemetrySensor.custom.ratio = 1;
       telemetrySensor.custom.offset = 1;
     }
+    else if (unit == UNIT_METERS) {
+      if (IS_IMPERIAL_ENABLE()) {
+        telemetrySensor.unit = UNIT_FEET;
+      }
+    }
   }
   else {
     telemetrySensor.init(id);
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index 4aa5912b2..430133567 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -267,6 +267,7 @@ void frskySportSetDefault(int index, uint16_t id, uint8_t instance)
     uint8_t prec = min<uint8_t>(2, sensor->prec);
     telemetrySensor.init(sensor->name, unit, prec);
     if (id == RSSI_ID) {
+      telemetrySensor.filter = 1;
       telemetrySensor.logs = true;
     }
     else if (id >= ADC1_ID && id <= BATT_ID) {