From 763b279f8fba49dff31e62a779d4eda078f2814a Mon Sep 17 00:00:00 2001
From: Sean M <sean@gopassport.com>
Date: Tue, 7 Aug 2018 22:08:17 -0400
Subject: [PATCH] Folding in interpolation

---
 locales/en/messages.json  |  2 +-
 src/css/tabs/receiver.css | 46 ++++++++++++---------------------------
 src/js/tabs/receiver.js   |  4 ++--
 src/tabs/receiver.html    | 31 +++++++++++++++++++++++---
 4 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/locales/en/messages.json b/locales/en/messages.json
index cbf0a809..cd524e25 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -1322,7 +1322,7 @@
         "message": "Channels Smoothed"
     },
     "receiverRcInterpolation": {
-        "message": "Smoothing Type"
+        "message": "RC Interpolation"
     },
     "receiverRcInterpolationHelp": {
         "message": "RC TX/RX systems are not as fast as PID loops. That means that PID loop has gaps in the information stream from RC systems. This option enables interpolation of the RC input during the times when no RC frames are received. The option also offers cleaner P and D behaviour as there are no ramps in control input."
diff --git a/src/css/tabs/receiver.css b/src/css/tabs/receiver.css
index a577fad2..1ef407be 100644
--- a/src/css/tabs/receiver.css
+++ b/src/css/tabs/receiver.css
@@ -365,6 +365,20 @@
     width: calc(100% - 8px);
 }
 
+.tab-receiver .rcInterpolation select {
+    height: 22px;
+    padding-left: 5px;
+    border: 1px solid silver;
+    margin: 4px;
+    width: calc(100% - 8px);
+    float: left;
+}
+
+.tab-receiver .rcInterpolation-label {
+    margin-top: 6px;
+    border-right: 1px solid silver;
+}
+
 .tab-receiver .rcSmoothing-derivative-type select {
     height: 22px;
     padding-left: 5px;
@@ -383,42 +397,10 @@
     width: calc(100% - 78px);
 }
 
-
 .tab-receiver .rcSmoothing select {
     width: 66px;
 }
 
-.tab-receiver .rcInterpolation td {
-    padding: 5px;
-    width: 100%;
-    background-color: #f9f9f9 !important;
-}
-
-.tab-receiver .rcInterpolationInterval td {
-    padding: 5px;
-    width: 100%;
-    background-color: #f9f9f9 !important;
-    border-top: 1px solid silver;
-}
-
-.tab-receiver .rcInterpolation td:first-child {
-    width: 70px;
-    padding-bottom: 10px;
-    padding-top: 10px;
-    padding-left:8px;
-    border-right: none;
-}
-
-.tab-receiver .rcInterpolation td:last-child {
-    width: calc(100% - 78px);
-}
-
-
-.tab-receiver .rcInterpolation select {
-    border: 1px solid silver;
-    width: 66px;
-}
-
 .tab-receiver .rcInterpolation .slider input {
     -webkit-appearance: slider-horizontal;
 }
diff --git a/src/js/tabs/receiver.js b/src/js/tabs/receiver.js
index e550726c..467f8be7 100644
--- a/src/js/tabs/receiver.js
+++ b/src/js/tabs/receiver.js
@@ -585,9 +585,9 @@ TABS.receiver.cleanup = function (callback) {
 TABS.receiver.updateRcInterpolationParameters = function () {
     if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
         if ($('select[name="rcInterpolation-select"]').val() === '3') {
-            $('.tab-receiver .rcInterpolationInterval').show();
+            $('.tab-receiver .rc-interpolation-manual').show();
         } else {
-            $('.tab-receiver .rcInterpolationInterval').hide();
+            $('.tab-receiver .rc-interpolation-manual').hide();
         }
     }
 };
diff --git a/src/tabs/receiver.html b/src/tabs/receiver.html
index 5ed1d256..2b557772 100644
--- a/src/tabs/receiver.html
+++ b/src/tabs/receiver.html
@@ -78,7 +78,7 @@
                     </tr>
                 </table>
             </div>
-            <div class="gui_box grey tunings topspacer rcInterpolation">
+            <!-- <div class="gui_box grey tunings topspacer rcInterpolation">
                 <table class="rcInterpolation">
                     <tr>
                         <th colspan="2" i18n="receiverRcInterpolation"></th>
@@ -113,7 +113,7 @@
                         </td>
                     </tr>
                 </table>
-            </div>
+            </div> -->
             <div class="gui_box grey tunings topspacer rcSmoothing">
                 <table class="rcSmoothing-table">
                     <tr>
@@ -214,7 +214,7 @@
                     </tr>
                     <tr class="rcSmoothing-input-type">
                         <td style="width: 15%">
-                        <select name="rcSmoothingInputType-select" style="width: 90%">
+                            <select name="rcSmoothingInputType-select" style="width: 90%">
                                 <option value="0" i18n="receiverRcSmoothingInputTypePt1"/>
                                 <option value="1" i18n="receiverRcSmoothingInputTypeBiquad"/>
                             </select>
@@ -247,6 +247,31 @@
                             <div class="helpicon cf_tip" i18n_title="rcSmoothingDerivativeTypeHelp" style="margin-top:0px;"></div>
                         </td>
                     </tr>
+                    <tr class="rcInterpolation">
+                        <td style="width: 50px !important" colspan="3">
+                            <select name="rcInterpolation-select">
+                                <option value="0" i18n="receiverRcInterpolationOff"/>
+                                <option value="1" i18n="receiverRcInterpolationDefault"/>
+                                <option value="2" i18n="receiverRcInterpolationAuto"/>
+                                <option value="3" i18n="receiverRcInterpolationManual"/>
+                            </select>
+                            <div class="rcInterpolation-label">
+                                <label style="margin-left: 5px">
+                                    <span i18n="receiverRcInterpolation"></span>
+                                </label>
+                                <div class="helpicon cf_tip" i18n_title="receiverRcInterpolationHelp" style="margin-top: 2px"></div>
+                            </div>
+                        </td>
+                        <td class="rc-interpolation-manual" colspan="1" style="border-right: none"><input type="number" name="rcInterpolationInterval-number" step="1" min="1" max="50" /></td>
+                        <td class="rc-interpolation-manual" colspan="2">
+                            <div>
+                                <label style="margin-left: 5px" >
+                                    <span i18n="receiverRcInterpolationInterval"></span>
+                                </label>
+                                <div class="helpicon cf_tip" i18n_title="receiverRcInterpolationIntervalHelp" style="margin-top: 2px"></div>
+                            </div>
+                        </td>
+                    </tr>
                 </table>
             </div>
             <div class="gui_box grey tunings topspacer">