From 4bd6f4671073b46b60712032820695d7d12c0b85 Mon Sep 17 00:00:00 2001
From: "Pawel Spychalski (DzikuVx)" <pspychalski@gmail.com>
Date: Fri, 23 Dec 2016 11:12:46 +0100
Subject: [PATCH] RSSI rework

---
 _locales/en/messages.json |  6 +++---
 js/fc.js                  |  2 +-
 tabs/configuration.css    |  7 +++++++
 tabs/configuration.html   | 42 +++++++--------------------------------
 tabs/configuration.js     |  4 ++--
 5 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b67bdbcc..aa45c655 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -555,6 +555,9 @@
     "featurePWM_SERVO_DRIVERTip": {
         "message": "Use external PCA9685 PMW driver to connect up to 16 servos to flight controller. PCA9685 has to be connected to enable this feature."
     },
+    "featureRSSI_ADCTip": {
+        "message": "RSSI is a measurement of signal strength and is very handy so you know when your aircraft is going out of range or if it is suffering RF interference."
+    },
     "configurationFeatureEnabled": {
         "message": "Enabled"
     },
@@ -576,9 +579,6 @@
     "configurationRSSI": {
         "message": "RSSI (Signal Strength)"
     },
-    "configurationRSSIHelp": {
-        "message": "RSSI is a measurement of signal strength and is very handy so you know when your aircraft is going out of range or if it is suffering RF interference."
-    },
     "configurationEscFeatures": {
         "message": "ESC/Motor Features"
     },
diff --git a/js/fc.js b/js/fc.js
index 15b3ecfa..2b8553c6 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -344,7 +344,7 @@ var FC = {
             {bit: 12, group: 'other', name: '3D'},
             {bit: 13, group: 'rxMode', mode: 'group', name: 'RX_PARALLEL_PWM'},
             {bit: 14, group: 'rxMode', mode: 'group', name: 'RX_MSP'},
-            {bit: 15, group: 'rssi', name: 'RSSI_ADC'},
+            {bit: 15, group: 'other', name: 'RSSI_ADC', haveTip: true},
             {bit: 16, group: 'other', name: 'LED_STRIP'},
             {bit: 17, group: 'other', name: 'DISPLAY'},
             {bit: 19, group: 'other', name: 'BLACKBOX', haveTip: true}
diff --git a/tabs/configuration.css b/tabs/configuration.css
index f13e32c6..5ba08ad3 100644
--- a/tabs/configuration.css
+++ b/tabs/configuration.css
@@ -241,6 +241,13 @@ hr
     float: left;
 }
 
+.tab-configuration .gui_box h3 {
+    text-decoration: underline;
+    font-size: 1.07em;
+    color: #333;
+    margin-left: 2px;
+}
+
 .tab-configuration .rssi td {
     border-bottom: none;
     padding-bottom: 0;
diff --git a/tabs/configuration.html b/tabs/configuration.html
index fd462e46..2d0b5344 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -127,30 +127,20 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
-
-            <div class="gui_box grey rxprovider">
-                <div class="gui_box_titlebar">
-                    <div class="spacer_box_title" data-i18n="configurationSerialRX"></div>
-                </div>
                 <div class="spacer_box">
+                    <h3 data-i18n="configurationSerialRX"></h3>
                     <div class="note">
                         <div class="note_spacer">
                             <p data-i18n="configurationSerialRXHelp"></p>
                         </div>
                     </div>
-                    <select class="serialRX" size="4">
+                    <select id="serial-rx-protocol" class="serialRX" size="1">
                         <!-- list generated here -->
                     </select>
                 </div>
-            </div>
-
-            <div class="gui_box grey nrf24provider">
-                <div class="gui_box_titlebar">
-                    <div class="spacer_box_title" data-i18n="configurationNrf24Protocol"></div>
-                </div>
                 <div class="spacer_box">
-                    <select class="nrf24Protocol" size="4">
+                    <h3 data-i18n="configurationNrf24Protocol"></h3>
+                    <select id="nrf24-protocol" class="nrf24Protocol" size="1">
                         <!-- list generated here -->
                     </select>
                 </div>
@@ -227,6 +217,9 @@
             </div>
 
         </div>
+
+        <!--Right column begins here-->
+
         <div class="rightWrapper">
             <div class="motorstop gui_box grey">
                 <div class="gui_box_titlebar">
@@ -484,27 +477,6 @@
                 </div>
             </div>
 
-            <div class="gui_box grey rssi">
-                <div class="gui_box_titlebar">
-                    <div class="spacer_box_title" data-i18n="configurationRSSI"></div>
-                    <div class="helpicon cf_tip" data-i18n_title="configurationRSSIHelp"></div>
-                </div>
-                <div class="spacer_box">
-                    <table cellpadding="0" cellspacing="0">
-                        <thead>
-                        <tr>
-                            <th data-i18n="configurationFeatureEnabled"></th>
-                            <th data-i18n="configurationFeatureDescription"></th>
-                            <th data-i18n="configurationFeatureName"></th>
-                        </tr>
-                        </thead>
-                        <tbody class="features rssi">
-                        <!-- table generated here -->
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
         </div>
 
         <div class="clear-both"></div>
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 4d2dac96..a748490e 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -222,7 +222,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         // generate serial RX
         var serialRxTypes = FC.getSerialRxTypes();
 
-        var serialRX_e = $('select.serialRX');
+        var serialRX_e = $('#serial-rx-protocol');
         for (i = 0; i < serialRxTypes.length; i++) {
             serialRX_e.append('<option value="' + i + '">' + serialRxTypes[i] + '</option>');
         }
@@ -242,7 +242,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
         var nrf24ProtocolTypes = FC.getNrf24ProtocolTypes();
 
-        var nrf24Protocol_e = $('select.nrf24Protocol');
+        var nrf24Protocol_e = $('#nrf24-protocol');
         for (i = 0; i < nrf24ProtocolTypes.length; i++) {
             nrf24Protocol_e.append('<option value="' + i + '">' + nrf24ProtocolTypes[i] + '</option>');
         }