Merge branch 'master' of https://github.com/betaflight/betaflight-configurator

Author: borisbstyle

_locales/en/messages.json

@@ -515,6 +515,9 @@
     "featureDISPLAY": {
         "message": "OLED Screen Display"
     },
+    "featureDISPLAYTip": {
+        "message": "If this feature is enabled, and no display device is connected (or the display device is not powered up), there will be a delay of approx. 10 seconds on every reboot of the flight controller."
+    },
     "featureONESHOT125": {
         "message": "ONESHOT ESC support"
     },
@@ -1833,6 +1836,9 @@
     "configurationEscProtocol": {
         "message": "ESC/Motor protocol"
     },
+    "configurationEscProtocolHelp": {
+        "message": "Select here your motor protocol. <br>Make sure to verify product site of your ESC to what protocol is supported. <br> <b>Be carefull using DSHOT900 and DSHOT1200 as not many ESC's support it!</b>"
+    },
     "configurationunsyndePwm": {
         "message": "Motor PWM speed Separated from PID speed"
     },

js/Features.js

@@ -20,7 +20,7 @@ var Features = function (config) {
         {bit: 14, group: 'rxMode', mode: 'select', name: 'RX_MSP'},
         {bit: 15, group: 'rssi', name: 'RSSI_ADC'},
         {bit: 16, group: 'other', name: 'LED_STRIP'},
-        {bit: 17, group: 'other', name: 'DISPLAY'},
+        {bit: 17, group: 'other', name: 'DISPLAY', haveTip: true},
         {bit: 19, group: 'other', name: 'BLACKBOX', haveTip: true}
     ];
 

tabs/configuration.html

@@ -38,6 +38,7 @@
                                 <!-- list generated here -->
                             </select>
                             <span i18n="configurationEscProtocol"></span>
+                            <div class="helpicon cf_tip" i18n_title="configurationEscProtocolHelp"></div>
                         </label>
                     </div>
                     <div class="checkboxPwm" style="border-bottom: 1px solid #ddd; padding-bottom: 5px;">

tabs/configuration.js

@@ -227,12 +227,15 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
                 $('div.minthrottle').hide();
                 $('div.maxthrottle').hide();
                 $('div.mincommand').hide();
+                $('div.checkboxPwm').hide();
+                $('div.unsyncedpwmfreq').hide();
 
                 $('div.digitalIdlePercent').show();
             } else {
                 $('div.minthrottle').show();
                 $('div.maxthrottle').show();
                 $('div.mincommand').show();
+                $('div.checkboxPwm').show();
 
                 $('div.digitalIdlePercent').hide();
             }