diff options
| author | Pawel Spychalski (DzikuVx) <pspychalski@gmail.com> | 2022-10-06 16:16:36 +0300 |
|---|---|---|
| committer | Pawel Spychalski (DzikuVx) <pspychalski@gmail.com> | 2022-10-06 16:16:36 +0300 |
| commit | 8fc911897c085cb3b0abbf3d6f9f09c964f5466b (patch) | |
| tree | be0ff6f7ff8928449ec5d4b633a0fabc176be3eb | |
| parent | 6513757be34096f87577fc17bb5f76e7870225e3 (diff) | |
| parent | 0917397880d8eaba4ca8ffb65d9af0e52e252cf0 (diff) | |
Merge remote-tracking branch 'origin/master' into dzikuvx-3d-matrix-configuration
| -rwxr-xr-x | _locales/en/messages.json | 3 | ||||
| -rw-r--r-- | tabs/gps.html | 2 | ||||
| -rw-r--r-- | tabs/gps.js | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/_locales/en/messages.json b/_locales/en/messages.json index f690216f..4e765764 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -4346,5 +4346,8 @@ }, "pidTuning_MatrixFilterTypeHelp": { "message": "Defines the type of Matrix Filter. Default 2D filter is recommended for most users. 7-inch and larger quads may benefit from 3D filter." + }, + "nmeaWarning": { + "message": "NMEA protocol is deprecated and might be removed in the future. Please use UBLOX or UBLOX7 protocol instead." } } diff --git a/tabs/gps.html b/tabs/gps.html index 15c84190..b8493250 100644 --- a/tabs/gps.html +++ b/tabs/gps.html @@ -20,7 +20,7 @@ <label for="feature-7"><span data-i18n="featureGPS"></span></label> <div for="feature-7" class="helpicon cf_tip" data-i18n_title="featureGPSTip"></div> </div> - + <div id="nmeaWarning" data-i18n="nmeaWarning" class="warning-box"></div> <div class="select"> <select id="gps_protocol" class="gps_protocol"> <!-- list generated here --> diff --git a/tabs/gps.js b/tabs/gps.js index 0d103ea8..7254369c 100644 --- a/tabs/gps.js +++ b/tabs/gps.js @@ -76,9 +76,15 @@ TABS.gps.initialize = function (callback) { gps_protocol_e.change(function () { MISC.gps_type = parseInt($(this).val()); + if (MISC.gps_type == 0) { + $('#nmeaWarning').show(); + } else { + $('#nmeaWarning').hide(); + } }); gps_protocol_e.val(MISC.gps_type); + gps_protocol_e.change(); var gps_ubx_sbas_e = $('#gps_ubx_sbas'); for (i = 0; i < gpsSbas.length; i++) { |