Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 09:45:28 +03:00
Code Issues Wiki Activity

GPS tab: New design for gps Status / Quality (#3566)

Browse source 
* small fixes

* Ajust Colours when translated

* new design

* new design

* new design

* new design

* new design

* new design

* new design
This commit is contained in:
HThuren 2023-09-10 00:42:01 +02:00 • committed by GitHub
parent 5f13c076f7
commit bb76112c99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
locales/en/messages.json
View file

@ -2805,7 +2805,7 @@
"message": "Sat ID" "message": "Sat ID"
}, },
"gpsSignalStatusQly": { "gpsSignalStatusQly": {
"message": "Status / Quality" "message": "Status     |  Quality"
}, },
"gnssQualityNoSignal": { "gnssQualityNoSignal": {
"message": "no signal" "message": "no signal"
@ -2829,7 +2829,7 @@
"message": "unused" "message": "unused"
}, },
"gnssUsedUsed": { "gnssUsedUsed": {
"message": "used" "message": "USED "
}, },
"gnssHealthyUnknown": { "gnssHealthyUnknown": {
"message": "unknown" "message": "unknown"

13
src/css/main.less
View file

@ -1725,13 +1725,22 @@ dialog {
} }
} }
.colorToggle { .colorToggle {
background-color: #e60000; background-color: #ff0000;
padding: 2px 5px; padding: 2px 5px;
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
font-size: 10px; font-size: 10px;
&.low {
background-color: #808080;
}
&.notReady {
background-color: #ffcc3f;
}
&.locked {
background-color: #ff9500;
}
&.ready { &.ready {
background-color: #56ac1d; background-color: #008000;
} }
} }
.buildInfoBtn { .buildInfoBtn {

27
src/js/tabs/gps.js
View file

@ -192,7 +192,6 @@ gps.initialize = async function (callback) {
const qualityArray = ['gnssQualityNoSignal', 'gnssQualitySearching', 'gnssQualityAcquired', 'gnssQualityUnusable', 'gnssQualityLocked', const qualityArray = ['gnssQualityNoSignal', 'gnssQualitySearching', 'gnssQualityAcquired', 'gnssQualityUnusable', 'gnssQualityLocked',
'gnssQualityFullyLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked']; 'gnssQualityFullyLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked'];
const usedArray = ['gnssUsedUnused', 'gnssUsedUsed']; const usedArray = ['gnssUsedUnused', 'gnssUsedUsed'];
const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown'];
let alt = FC.GPS_DATA.alt; let alt = FC.GPS_DATA.alt;
$('.GPS_info span.colorToggle').text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); $('.GPS_info span.colorToggle').text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse'));
@ -200,7 +199,7 @@ gps.initialize = async function (callback) {
const gspUnitText = i18n.getMessage('gpsPositionUnit'); const gspUnitText = i18n.getMessage('gpsPositionUnit');
$('.GPS_info td.alt').text(`${alt} m`); $('.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.heading').text(`${magHeadingDeg.toFixed(4)} / ${gpsHeading.toFixed(4)} ${gspUnitText}`);
$('.GPS_info td.speed').text(`${FC.GPS_DATA.speed} cm/s`); $('.GPS_info td.speed').text(`${FC.GPS_DATA.speed} cm/s`);
$('.GPS_info td.sats').text(FC.GPS_DATA.numSat); $('.GPS_info td.sats').text(FC.GPS_DATA.numSat);
@ -266,28 +265,28 @@ gps.initialize = async function (callback) {
let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]); let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]);
let used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]); 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 usedColor = '';
// Add color to the text // Add color to the text
if (quality.startsWith('fully locked')) { // 2nd column: no signal = red, unusable = red, searching = red, locked = yellow and fully locked = green
if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked'))) {
usedColor = 'locked';
quality = `<span class="colorToggle ready">${quality}</span>`; quality = `<span class="colorToggle ready">${quality}</span>`;
} else if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) {
usedColor = 'notReady';
quality = `<span class="colorToggle locked">${quality}</span>`;
} else { } else {
quality = `<span class="colorToggle">${quality}</span>`; quality = `<span class="colorToggle">${quality}</span>`;
} }
if (used.startsWith('used')) { // 1st column: unused = red, used = green
used = `<span class="colorToggle ready">${used}</span>`; if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) {
used = `<span class="colorToggle ready">&nbsp${used}&nbsp</span>`;
} else { } else {
used = `<span class="colorToggle">${used}</span>`; used = `<span class="colorToggle ${usedColor}">${used}</span>`;
} }
if (healthy.startsWith('healthy')) { rowContent += `<td>${used} | ${quality}</td>`;
healthy = `<span class="colorToggle ready">${healthy}</span>`;
} else {
healthy = `<span class="colorToggle">${healthy}</span>`;
}
rowContent += `<td>${quality} | ${used} | ${healthy}</td>`;
} }
eSsTable.append(`<tr>${rowContent}</tr>`); eSsTable.append(`<tr>${rowContent}</tr>`);
} }

2
src/js/tabs/setup.js
View file

@ -435,7 +435,7 @@ setup.initialize = function (callback) {
const lon = FC.GPS_DATA.lon / 10000000; const lon = FC.GPS_DATA.lon / 10000000;
const url = `https://maps.google.com/?q=${lat},${lon}`; const url = `https://maps.google.com/?q=${lat},${lon}`;
const gpsUnitText = i18n.getMessage('gpsPositionUnit'); 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() { function get_fast_data() {