From 953e9227441a417cc89777c8c466b73f1de70158 Mon Sep 17 00:00:00 2001 From: HThuren Date: Mon, 4 Sep 2023 19:26:29 +0200 Subject: [PATCH 1/9] small fixes --- src/js/tabs/gps.js | 12 ++++++------ src/js/tabs/setup.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 734d34d752..b26723f03b 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -193,10 +193,10 @@ gps.initialize = async function (callback) { $('.GPS_info span.colorToggle').text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); $('.GPS_info span.colorToggle').toggleClass('ready', FC.GPS_DATA.fix != 0); - const gspUnitText = i18n.getMessage('gpsPositionUnit'); + const gpsUnitText = i18n.getMessage('gpsPositionUnit'); $('.GPS_info td.alt').text(`${alt} m`); - $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} deg / ${lon.toFixed(4)} deg`); - $('.GPS_info td.heading').text(`${headingDeg.toFixed(4)} ${gspUnitText}`); + $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} / ${lon.toFixed(4)} ${gpsUnitText}`); + $('.GPS_info td.heading').text(`${headingDeg.toFixed(4)} ${gpsUnitText}`); $('.GPS_info td.speed').text(`${FC.GPS_DATA.speed} cm/s`); $('.GPS_info td.sats').text(FC.GPS_DATA.numSat); $('.GPS_info td.distToHome').text(`${FC.GPS_DATA.distanceToHome} m`); @@ -264,19 +264,19 @@ gps.initialize = async function (callback) { let healthy = i18n.getMessage(healthyArray[(FC.GPS_DATA.quality[i] & 0x30) >> 4]); // Add color to the text - if (quality.startsWith('fully locked')) { + if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked')) || quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { quality = `${quality}`; } else { quality = `${quality}`; } - if (used.startsWith('used')) { + if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) { used = `${used}`; } else { used = `${used}`; } - if (healthy.startsWith('healthy')) { + if (healthy.startsWith(i18n.getMessage('gnssHealthyHealthy'))) { healthy = `${healthy}`; } else { healthy = `${healthy}`; diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index 340c099b40..fb06b207ca 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -434,7 +434,7 @@ setup.initialize = function (callback) { const lon = FC.GPS_DATA.lon / 10000000; const url = `https://maps.google.com/?q=${lat},${lon}`; const gpsUnitText = i18n.getMessage('gpsPositionUnit'); - $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} ${gpsUnitText} / ${lon.toFixed(4)} ${gpsUnitText}`); + $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} / ${lon.toFixed(4)} ${gpsUnitText}`); } function get_fast_data() { From 29c84bf44fe76c2f3a6eb6776f1c0eed869990ef Mon Sep 17 00:00:00 2001 From: HThuren Date: Tue, 5 Sep 2023 03:22:30 +0200 Subject: [PATCH 2/9] Ajust Colours when translated --- src/css/main.less | 10 ++++++++-- src/js/tabs/gps.js | 50 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/css/main.less b/src/css/main.less index e7f02b0d10..b14b9b8b45 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -1725,13 +1725,19 @@ dialog { } } .colorToggle { - background-color: #e60000; + background-color: #ff0000; padding: 2px 5px; border-radius: 3px; color: #fff; font-size: 10px; + &.search { + background-color: #ffcc3f; + } + &.almostReady { + background-color: #ffa500; + } &.ready { - background-color: #56ac1d; + background-color: #008000; } } .buildInfoBtn { diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index b26723f03b..d59476c476 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -1,10 +1,11 @@ import { i18n } from "../localization"; import semver from 'semver'; -import { API_VERSION_1_43 } from '../data_storage'; +import { API_VERSION_1_43, API_VERSION_1_46 } from '../data_storage'; import GUI, { TABS } from '../gui'; import FC from '../fc'; import MSP from "../msp"; import MSPCodes from "../msp/MSPCodes"; +import $ from 'jquery'; import { have_sensor } from "../sensor_helpers"; import { mspHelper } from '../msp/MSPHelper'; import { updateTabList } from '../utils/updateTabList'; @@ -132,7 +133,10 @@ gps.initialize = async function (callback) { }).val(FC.GPS_CONFIG.provider).change(); - gpsAutoBaudElement.prop('checked', FC.GPS_CONFIG.auto_baud === 1); + // auto_baud is no longer used in API 1.46 + if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_46)) { + gpsAutoBaudElement.prop('checked', FC.GPS_CONFIG.auto_baud === 1); + } gpsAutoConfigElement.on('change', function () { const checked = $(this).is(":checked"); @@ -146,7 +150,7 @@ gps.initialize = async function (callback) { const enableSbasVisible = checked && ubloxSelected; gpsUbloxSbasGroup.toggle(enableSbasVisible); - gpsAutoBaudGroup.toggle(ubloxSelected || mspSelected); + gpsAutoBaudGroup.toggle((ubloxSelected || mspSelected) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_46)); gpsAutoConfigGroup.toggle(ubloxSelected || mspSelected); }).prop('checked', FC.GPS_CONFIG.auto_config === 1).trigger('change'); @@ -181,8 +185,9 @@ gps.initialize = async function (callback) { const lat = FC.GPS_DATA.lat / 10000000; const lon = FC.GPS_DATA.lon / 10000000; const url = `https://maps.google.com/?q=${lat},${lon}`; - const heading = hasMag ? Math.atan2(FC.SENSOR_DATA.magnetometer[1], FC.SENSOR_DATA.magnetometer[0]) : undefined; - const headingDeg = heading === undefined ? 0 : heading * 180 / Math.PI; + const magHeading = hasMag ? Math.atan2(FC.SENSOR_DATA.magnetometer[1], FC.SENSOR_DATA.magnetometer[0]) : undefined; + const magHeadingDeg = magHeading === undefined ? 0 : magHeading * 180 / Math.PI; + const gpsHeading = FC.GPS_DATA.ground_course / 100; const gnssArray = ['GPS', 'SBAS', 'Galileo', 'BeiDou', 'IMES', 'QZSS', 'Glonass']; const qualityArray = ['gnssQualityNoSignal', 'gnssQualitySearching', 'gnssQualityAcquired', 'gnssQualityUnusable', 'gnssQualityLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked']; @@ -193,10 +198,10 @@ gps.initialize = async function (callback) { $('.GPS_info span.colorToggle').text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); $('.GPS_info span.colorToggle').toggleClass('ready', FC.GPS_DATA.fix != 0); - const gpsUnitText = i18n.getMessage('gpsPositionUnit'); + const gspUnitText = i18n.getMessage('gpsPositionUnit'); $('.GPS_info td.alt').text(`${alt} m`); - $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} / ${lon.toFixed(4)} ${gpsUnitText}`); - $('.GPS_info td.heading').text(`${headingDeg.toFixed(4)} ${gpsUnitText}`); + $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} / ${lon.toFixed(4)} ${gspUnitText}`); + $('.GPS_info td.heading').text(`${magHeadingDeg.toFixed(4)} / ${gpsHeading.toFixed(4)} ${gspUnitText}`); $('.GPS_info td.speed').text(`${FC.GPS_DATA.speed} cm/s`); $('.GPS_info td.sats').text(FC.GPS_DATA.numSat); $('.GPS_info td.distToHome').text(`${FC.GPS_DATA.distanceToHome} m`); @@ -221,7 +226,7 @@ gps.initialize = async function (callback) { - ${FC.GPS_DATA.svid[i]} - + ${FC.GPS_DATA.quality[i]} `); @@ -232,7 +237,7 @@ gps.initialize = async function (callback) { - - - + `); @@ -253,21 +258,36 @@ gps.initialize = async function (callback) { if (FC.GPS_DATA.chn[i] >= 7) { rowContent += '-'; - rowContent += ``; + rowContent += ``; rowContent += ` `; } else { rowContent += `${FC.GPS_DATA.svid[i]}`; - rowContent += ``; + rowContent += ``; let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]); let used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]); let healthy = i18n.getMessage(healthyArray[(FC.GPS_DATA.quality[i] & 0x30) >> 4]); // Add color to the text - if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked')) || quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { + // yellow for searching and orange for locked, green only when fully locked, used and healthy + // 1st column: unusable = red, searching = yellow, locked = orange and fully locked = green + // 2nd column: unused = red, used = green + // 3d column: non healthy = red, healthy = green + + // || quality.startsWith(i18n.getMessage('gnssQualityLocked')) + + if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked'))) { quality = `${quality}`; } else { - quality = `${quality}`; + if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { + quality = `${quality}`; + } else { + if (quality.startsWith(i18n.getMessage('gnssQualitySearching'))) { + quality = `${quality}`; + } else { + quality = `${quality}`; + } + } } if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) { @@ -292,7 +312,7 @@ gps.initialize = async function (callback) { action: 'center', lat: lat, lon: lon, - heading: heading, + heading: magHeading, }; frame = document.getElementById('map'); From d31eee6907db383b2ebf15d5a09399a8db8bcdfe Mon Sep 17 00:00:00 2001 From: HThuren Date: Thu, 7 Sep 2023 19:58:37 +0200 Subject: [PATCH 3/9] new design --- locales/en/messages.json | 2 +- src/css/main.less | 3 +++ src/js/tabs/gps.js | 33 +++++++++++++++++---------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 0c2d11dafc..8659fe0059 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2836,7 +2836,7 @@ "message": "unused" }, "gnssUsedUsed": { - "message": "used" + "message": "USED " }, "gnssHealthyUnknown": { "message": "unknown" diff --git a/src/css/main.less b/src/css/main.less index b14b9b8b45..9fb6459c28 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -1731,6 +1731,9 @@ dialog { color: #fff; font-size: 10px; &.search { + background-color: #808080; + } + &.locked { background-color: #ffcc3f; } &.almostReady { diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index d59476c476..5f36e77345 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -269,18 +269,21 @@ gps.initialize = async function (callback) { let healthy = i18n.getMessage(healthyArray[(FC.GPS_DATA.quality[i] & 0x30) >> 4]); // Add color to the text - // yellow for searching and orange for locked, green only when fully locked, used and healthy - // 1st column: unusable = red, searching = yellow, locked = orange and fully locked = green - // 2nd column: unused = red, used = green - // 3d column: non healthy = red, healthy = green + // 1st column: unused = red, used = green + // 2nd column: unknown = red, non healthy = grey, healthy = orange + // 3d column: no signal = red, unusable = red, searching = grey, locked = yellow and fully locked = orange - // || quality.startsWith(i18n.getMessage('gnssQualityLocked')) + if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) { + used = ` ${used} `; + } else { + used = `${used}`; + } if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked'))) { - quality = `${quality}`; + quality = `${quality}`; } else { if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { - quality = `${quality}`; + quality = `${quality}`; } else { if (quality.startsWith(i18n.getMessage('gnssQualitySearching'))) { quality = `${quality}`; @@ -290,19 +293,17 @@ gps.initialize = async function (callback) { } } - if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) { - used = `${used}`; - } else { - used = `${used}`; - } - if (healthy.startsWith(i18n.getMessage('gnssHealthyHealthy'))) { - healthy = `${healthy}`; + healthy = `${healthy}`; } else { - healthy = `${healthy}`; + if (healthy.startsWith(i18n.getMessage('gnssHealthyUnhealthy'))) { + healthy = `${healthy}`; + } else { + healthy = `${healthy}`; + } } - rowContent += `${quality} | ${used} | ${healthy}`; + rowContent += `${used} | ${healthy} | ${quality}`; } eSsTable.append(`${rowContent}`); } From 2dac83aa8fa7623e525f5acc78aa46f4873f9862 Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 9 Sep 2023 20:35:19 +0200 Subject: [PATCH 4/9] new design --- src/css/main.less | 8 ++++---- src/js/tabs/gps.js | 40 +++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/css/main.less b/src/css/main.less index 9fb6459c28..f0e1f4b0e1 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -1730,14 +1730,14 @@ dialog { border-radius: 3px; color: #fff; font-size: 10px; - &.search { + &.low { background-color: #808080; } - &.locked { + &.notReady { background-color: #ffcc3f; } - &.almostReady { - background-color: #ffa500; + &.locked { + background-color: #ff9500; } &.ready { background-color: #008000; diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 5f36e77345..cb8aef46e7 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -192,7 +192,7 @@ gps.initialize = async function (callback) { const qualityArray = ['gnssQualityNoSignal', 'gnssQualitySearching', 'gnssQualityAcquired', 'gnssQualityUnusable', 'gnssQualityLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked']; const usedArray = ['gnssUsedUnused', 'gnssUsedUsed']; - const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; + // const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; let alt = FC.GPS_DATA.alt; $('.GPS_info span.colorToggle').text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); @@ -200,7 +200,7 @@ gps.initialize = async function (callback) { const gspUnitText = i18n.getMessage('gpsPositionUnit'); $('.GPS_info td.alt').text(`${alt} m`); - $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(4)} / ${lon.toFixed(4)} ${gspUnitText}`); + $('.GPS_info td.latLon a').prop('href', url).text(`${lat.toFixed(6)} / ${lon.toFixed(6)} ${gspUnitText}`); $('.GPS_info td.heading').text(`${magHeadingDeg.toFixed(4)} / ${gpsHeading.toFixed(4)} ${gspUnitText}`); $('.GPS_info td.speed').text(`${FC.GPS_DATA.speed} cm/s`); $('.GPS_info td.sats').text(FC.GPS_DATA.numSat); @@ -250,6 +250,7 @@ gps.initialize = async function (callback) { for (let i = 0; i < channels; i++) { let rowContent = ''; + let usedColor = ''; if (FC.GPS_DATA.chn[i] <= 6) { rowContent += `${gnssArray[FC.GPS_DATA.chn[i]]}`; } else { @@ -266,35 +267,38 @@ gps.initialize = async function (callback) { let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]); let used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]); - let healthy = i18n.getMessage(healthyArray[(FC.GPS_DATA.quality[i] & 0x30) >> 4]); + // let healthy = i18n.getMessage(healthyArray[(FC.GPS_DATA.quality[i] & 0x30) >> 4]); // Add color to the text - // 1st column: unused = red, used = green - // 2nd column: unknown = red, non healthy = grey, healthy = orange - // 3d column: no signal = red, unusable = red, searching = grey, locked = yellow and fully locked = orange - - if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) { - used = ` ${used} `; - } else { - used = `${used}`; - } - + // 2nd column: no signal = red, unusable = red, searching = red, locked = yellow and fully locked = green if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked'))) { - quality = `${quality}`; + usedColor = 'locked'; + quality = `${quality}`; } else { if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { + usedColor = 'notReady'; quality = `${quality}`; } else { + usedColor = ''; if (quality.startsWith(i18n.getMessage('gnssQualitySearching'))) { - quality = `${quality}`; + quality = `${quality}`; } else { quality = `${quality}`; } } } + // 1st column: unused = red, used = green + if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) { + used = ` ${used} `; + } else { + used = `${used}`; + } + + /* + // 3d column: unknown = red, non healthy = grey, healthy = orange if (healthy.startsWith(i18n.getMessage('gnssHealthyHealthy'))) { - healthy = `${healthy}`; + healthy = `${healthy}`; } else { if (healthy.startsWith(i18n.getMessage('gnssHealthyUnhealthy'))) { healthy = `${healthy}`; @@ -302,8 +306,10 @@ gps.initialize = async function (callback) { healthy = `${healthy}`; } } - rowContent += `${used} | ${healthy} | ${quality}`; + */ + + rowContent += `${used} | ${quality}`; } eSsTable.append(`${rowContent}`); } From fcaea7474604bc1b0a82ecebb39f9001463a60f9 Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 9 Sep 2023 21:52:09 +0200 Subject: [PATCH 5/9] new design --- src/js/tabs/gps.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index cb8aef46e7..b039d53f89 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -280,11 +280,7 @@ gps.initialize = async function (callback) { quality = `${quality}`; } else { usedColor = ''; - if (quality.startsWith(i18n.getMessage('gnssQualitySearching'))) { - quality = `${quality}`; - } else { - quality = `${quality}`; - } + quality = `${quality}`; } } From 89798f40fc7719afda209493c413d23682d24689 Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 9 Sep 2023 23:15:22 +0200 Subject: [PATCH 6/9] new design --- locales/en/messages.json | 2 +- src/js/tabs/gps.js | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 8659fe0059..1ca7b6e09e 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2812,7 +2812,7 @@ "message": "Sat ID" }, "gpsSignalStatusQly": { - "message": "Status / Quality" + "message": "Status     |  Quality" }, "gnssQualityNoSignal": { "message": "no signal" diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index b039d53f89..b5c30a840a 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -267,7 +267,6 @@ gps.initialize = async function (callback) { let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]); let used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]); - // let healthy = i18n.getMessage(healthyArray[(FC.GPS_DATA.quality[i] & 0x30) >> 4]); // Add color to the text // 2nd column: no signal = red, unusable = red, searching = red, locked = yellow and fully locked = green @@ -291,20 +290,6 @@ gps.initialize = async function (callback) { used = `${used}`; } - /* - // 3d column: unknown = red, non healthy = grey, healthy = orange - if (healthy.startsWith(i18n.getMessage('gnssHealthyHealthy'))) { - healthy = `${healthy}`; - } else { - if (healthy.startsWith(i18n.getMessage('gnssHealthyUnhealthy'))) { - healthy = `${healthy}`; - } else { - healthy = `${healthy}`; - } - } - rowContent += `${used} | ${healthy} | ${quality}`; - */ - rowContent += `${used} | ${quality}`; } eSsTable.append(`${rowContent}`); From 96df8dc3ef45812a3536234faf88f91361ad1e91 Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 9 Sep 2023 23:18:51 +0200 Subject: [PATCH 7/9] new design --- src/js/tabs/gps.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index b5c30a840a..1bfccaa215 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -192,7 +192,6 @@ gps.initialize = async function (callback) { const qualityArray = ['gnssQualityNoSignal', 'gnssQualitySearching', 'gnssQualityAcquired', 'gnssQualityUnusable', 'gnssQualityLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked']; const usedArray = ['gnssUsedUnused', 'gnssUsedUsed']; - // const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; let alt = FC.GPS_DATA.alt; $('.GPS_info span.colorToggle').text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); From caa758327844ce67bc6e7eaad82cf11229ae6ec7 Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 9 Sep 2023 23:22:40 +0200 Subject: [PATCH 8/9] new design --- src/js/tabs/gps.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 1bfccaa215..4fac5ffedc 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -249,7 +249,6 @@ gps.initialize = async function (callback) { for (let i = 0; i < channels; i++) { let rowContent = ''; - let usedColor = ''; if (FC.GPS_DATA.chn[i] <= 6) { rowContent += `${gnssArray[FC.GPS_DATA.chn[i]]}`; } else { @@ -266,6 +265,7 @@ gps.initialize = async function (callback) { let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]); let used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]); + let usedColor = ''; // Add color to the text // 2nd column: no signal = red, unusable = red, searching = red, locked = yellow and fully locked = green @@ -277,7 +277,6 @@ gps.initialize = async function (callback) { usedColor = 'notReady'; quality = `${quality}`; } else { - usedColor = ''; quality = `${quality}`; } } From 8b4b6dee9bad139e0e6cbc8675807cdf085942cd Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 9 Sep 2023 23:27:07 +0200 Subject: [PATCH 9/9] new design --- src/js/tabs/gps.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 4fac5ffedc..67df120f82 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -272,13 +272,11 @@ gps.initialize = async function (callback) { if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked'))) { usedColor = 'locked'; quality = `${quality}`; + } else if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { + usedColor = 'notReady'; + quality = `${quality}`; } else { - if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) { - usedColor = 'notReady'; - quality = `${quality}`; - } else { - quality = `${quality}`; - } + quality = `${quality}`; } // 1st column: unused = red, used = green