Merge remote-tracking branch 'origin/master' into mmosca-github-build

_locales/en/messages.json

@@ -14,6 +14,9 @@
     "options_showProfileParameters": {
         "message": "Highlight parameters that change when switching battery or control profiles"
     },
+    "options_cliAutocomplete": {
+        "message": "Advanced CLI AutoComplete"
+    },
     "options_unit_type": {
         "message": "Set how the units render on the configurator only"
     },
@@ -3593,6 +3596,12 @@
     "osdAlarmGFORCE_AXIS_MAX_HELP": {
         "message": "The axes g force elements will start blinking when greater than this value"
     },
+    "osdAlarmADSB_MAX_DISTANCE_WARNING": {
+        "message": "Distance in meters of ADSB aircraft that is displayed"
+    },
+    "osdAlarmADSB_MAX_DISTANCE_ALERT": {
+        "message": "Distance inside which ADSB data flashes for proximity warning"
+    },
     "osd_current_alarm": {
         "message": "Current (A)"
     },
@@ -3632,6 +3641,12 @@
     "osd_rssi_dbm_alarm": {
         "message": "CRSF RSSI dBm Alarm"
     },
+    "osd_adsb_distance_warning": {
+        "message": "ADSB distance warning"
+    },
+    "osd_adsb_distance_alert": {
+        "message": "ADSB distance alert"
+    },
     "osd_rssi_dbm_alarm_HELP": {
         "message": "RSSI indicator blinks below this value. Range: [-130,0]. Zero disables this alarm."
     },

gulpfile.js

@@ -138,6 +138,8 @@ sources.js = [
     './node_modules/openlayers/dist/ol.js',
     './js/libraries/plotly-latest.min.js',
     './js/sitl.js',
+    './js/CliAutoComplete.js',
+    './node_modules/jquery-textcomplete/dist/jquery.textcomplete.js'
 ];
 
 sources.receiverCss = [