Skip to content

Commit d277924

Browse files
authored
Fix gps color (#4241)
* Fix gps color * Refactor and ease usedColor * [chore]Refactor lexical scoping
1 parent 186cc71 commit d277924

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

src/js/tabs/gps.js

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -265,31 +265,18 @@ gps.initialize = async function (callback) {
265265
rowContent += `<td>${FC.GPS_DATA.svid[i]}</td>`;
266266
rowContent += `<td><meter value="${FC.GPS_DATA.cno[i]}" max="55"></meter></td>`;
267267

268-
let quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]);
269-
let used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]);
270-
let usedColor = '';
268+
const quality = i18n.getMessage(qualityArray[FC.GPS_DATA.quality[i] & 0x7]);
269+
const used = i18n.getMessage(usedArray[(FC.GPS_DATA.quality[i] & 0x8) >> 3]);
271270

272271
// Add color to the text
273-
// 2nd column: no signal = red, unusable = red, searching = red, locked = yellow and fully locked = green
274-
if (quality.startsWith(i18n.getMessage('gnssQualityFullyLocked'))) {
275-
usedColor = 'locked';
276-
quality = `<span class="colorToggle ready">${quality}</span>`;
277-
} else if (quality.startsWith(i18n.getMessage('gnssQualityLocked'))) {
278-
usedColor = 'notReady';
279-
quality = `<span class="colorToggle locked">${quality}</span>`;
280-
} else {
281-
quality = `<span class="colorToggle">${quality}</span>`;
282-
}
283-
284-
// 1st column: unused = red, used = green
285-
if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) {
286-
used = `<span class="colorToggle ready">${used}</span>`;
287-
} else {
288-
used = `<span class="colorToggle ${usedColor}">${used}</span>`;
289-
}
290-
291-
rowContent += `<td style="text-align: left; width: 17%;">${used}</td>
292-
<td style="text-align: left; width: 33%;">${quality}</td>`;
272+
const qualityColor = quality.startsWith(i18n.getMessage('gnssQualityFullyLocked')) ? 'ready' : quality.startsWith(i18n.getMessage('gnssQualityLocked')) ? 'locked' : 'low';
273+
const qualityHtml = `<span class="colorToggle ${qualityColor}">${quality}</span>`;
274+
275+
const usedColor = used.startsWith(i18n.getMessage('gnssUsedUsed')) ? 'ready' : 'low';
276+
const usedHtml = `<span class="colorToggle ${usedColor}">${used}</span>`;
277+
278+
rowContent += `<td style="text-align: left; width: 17%;">${usedHtml}</td>
279+
<td style="text-align: left; width: 33%;">${qualityHtml}</td>`;
293280
}
294281
eSsTable.append(`<tr>${rowContent}</tr>`);
295282
}

0 commit comments

Comments
 (0)