From 86c1785824441201fdeddff72c2d58f52b570885 Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 15 Apr 2023 11:57:24 +0200 Subject: [PATCH 1/7] VTX ready change if device get ready --- locales/en/messages.json | 6 ++++++ src/js/tabs/vtx.js | 20 +++++++++++------- src/tabs/vtx.html | 45 +++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index bce8b815b2..32ad3bcb2e 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -6143,6 +6143,12 @@ "message": "Device ready", "description": "Text of one of the fields of the VTX tab" }, + "vtxReadyTrue": { + "message": "Yes" + }, + "vtxReadyFalse": { + "message": "No" + }, "vtxPower": { "message": "Power", "description": "Text of one of the fields of the VTX tab" diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index 0a01ef5f04..eb09f32213 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -40,12 +40,19 @@ vtx.isVtxDeviceStatusNotReady = function() vtx.updateVtxDeviceStatus = function() { - MSP.send_message(MSPCodes.MSP2_GET_VTX_DEVICE_STATUS, false, false, vtxDeviceStatusReceived); - function vtxDeviceStatusReceived() { $("#vtx_type_description").text(TABS.vtx.getVtxTypeString()); } + + function vtxDeviceStatusReady() + { + // update device ready state + $("#vtx_device_ready_description").html(FC.VTX_CONFIG.vtx_device_ready ? i18n.getMessage("vtxReadyTrue") : i18n.getMessage("vtxReadyFalse")); + } + + MSP.send_message(MSPCodes.MSP2_GET_VTX_DEVICE_STATUS, false, false, vtxDeviceStatusReceived); + MSP.send_message(MSPCodes.MSP_VTX_CONFIG, false, false, vtxDeviceStatusReady); }; vtx.getVtxTypeString = function() @@ -101,7 +108,7 @@ vtx.initialize = function (callback) { function read_vtx_config(callback_after_msp) { vtx_config(); - + function vtx_config() { MSP.send_message(MSPCodes.MSP_VTX_CONFIG, false, false, vtxConfigReceived); } @@ -205,7 +212,6 @@ vtx.initialize = function (callback) { // Bands and channels FC.VTX_CONFIG.vtx_table_bands = vtxConfig.vtx_table.bands_list.length; - let maxChannels = 0; TABS.vtx.VTXTABLE_BAND_LIST = []; for (let i = 1; i <= FC.VTX_CONFIG.vtx_table_bands; i++) { @@ -290,14 +296,12 @@ vtx.initialize = function (callback) { $("#vtx_low_power_disarm").val(FC.VTX_CONFIG.vtx_low_power_disarm); // Values of the current values - const yesMessage = i18n.getMessage("yes"); - const noMessage = i18n.getMessage("no"); + $("#vtx_device_ready_description").html(FC.VTX_CONFIG.vtx_device_ready ? i18n.getMessage("vtxReadyTrue") : i18n.getMessage("vtxReadyFalse")); - $("#vtx_device_ready_description").text(FC.VTX_CONFIG.vtx_device_ready ? yesMessage : noMessage); $("#vtx_type_description").text(self.getVtxTypeString()); $("#vtx_channel_description").text(FC.VTX_CONFIG.vtx_channel); $("#vtx_frequency_description").text(FC.VTX_CONFIG.vtx_frequency); - $("#vtx_pit_mode_description").text(FC.VTX_CONFIG.vtx_pit_mode ? yesMessage : noMessage); + $("#vtx_pit_mode_description").text(FC.VTX_CONFIG.vtx_pit_mode ? i18n.getMessage("Yes") : i18n.getMessage("No")); $("#vtx_pit_mode_frequency_description").text(FC.VTX_CONFIG.vtx_pit_mode_frequency); $("#vtx_low_power_disarm_description").text(i18n.getMessage(`vtxLowPowerDisarmOption_${FC.VTX_CONFIG.vtx_low_power_disarm}`)); diff --git a/src/tabs/vtx.html b/src/tabs/vtx.html index 5632728d05..e7fa5adff9 100644 --- a/src/tabs/vtx.html +++ b/src/tabs/vtx.html @@ -126,49 +126,46 @@
- - - +
+ + + + + - - - - - + - - + + - + - - + + - - + + - - + + - - + + - - - -
- + + +
From 6abbccca94411e8cd06527e40dc659db2ca7c1be Mon Sep 17 00:00:00 2001 From: HThuren Date: Sat, 15 Apr 2023 11:58:22 +0200 Subject: [PATCH 2/7] minor change --- src/js/tabs/vtx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index eb09f32213..22ba795bfc 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -108,7 +108,7 @@ vtx.initialize = function (callback) { function read_vtx_config(callback_after_msp) { vtx_config(); - + function vtx_config() { MSP.send_message(MSPCodes.MSP_VTX_CONFIG, false, false, vtxConfigReceived); } From 251cc1124af2ecf7d18ee778bf0c04fe775137ff Mon Sep 17 00:00:00 2001 From: HThuren Date: Sun, 16 Apr 2023 00:39:41 +0200 Subject: [PATCH 3/7] removed class from translated string --- locales/en/messages.json | 12 ------------ src/js/tabs/gps.js | 4 +++- src/js/tabs/setup.js | 3 ++- src/js/tabs/vtx.js | 6 +++--- src/js/utils/common.js | 8 ++++++++ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 32ad3bcb2e..0a38b1c5a0 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2559,12 +2559,6 @@ "gps3dFix": { "message": "3D Fix:" }, - "gpsFixTrue": { - "message": "True" - }, - "gpsFixFalse": { - "message": "False" - }, "gpsAltitude": { "message": "Altitude:" }, @@ -6143,12 +6137,6 @@ "message": "Device ready", "description": "Text of one of the fields of the VTX tab" }, - "vtxReadyTrue": { - "message": "Yes" - }, - "vtxReadyFalse": { - "message": "No" - }, "vtxPower": { "message": "Power", "description": "Text of one of the fields of the VTX tab" diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 0209cc3e75..5107c15600 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -10,6 +10,7 @@ import { have_sensor } from "../sensor_helpers"; import { mspHelper } from '../msp/MSPHelper'; import { reinitializeConnection } from '../serial_backend'; import { updateTabList } from '../utils/updateTabList'; +import { getColorYesNo } from "../utils/common"; const gps = {}; @@ -192,7 +193,8 @@ gps.initialize = async function (callback) { const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; let alt = FC.GPS_DATA.alt; - $('.GPS_info td.fix').html((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); + $('.GPS_info td.fix').html(getColorYesNo(FC.GPS_DATA.fix)); + $('.GPS_info td.alt').text(`${alt} m`); $('.GPS_info td.lat a').prop('href', url).text(`${lat.toFixed(4)} deg`); $('.GPS_info td.lon a').prop('href', url).text(`${lon.toFixed(4)} deg`); diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index fc19d9a46b..dee3f4a4a9 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -11,6 +11,7 @@ import Model from '../model'; import MSPCodes from '../msp/MSPCodes'; import CONFIGURATOR, { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_46 } from '../data_storage'; import { gui_log } from '../gui_log'; +import { getColorYesNo } from "../utils/common"; const setup = { yaw_fix: 0.0, @@ -428,7 +429,7 @@ setup.initialize = function (callback) { // GPS info is acquired in the background using update_live_status() in serial_backend.js - gpsFix_e.html((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); + gpsFix_e.html(getColorYesNo(FC.GPS_DATA.fix)); gpsSats_e.text(FC.GPS_DATA.numSat); gpsLat_e.text(`${(FC.GPS_DATA.lat / 10000000).toFixed(4)} deg`); gpsLon_e.text(`${(FC.GPS_DATA.lon / 10000000).toFixed(4)} deg`); diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index 22ba795bfc..46b467807b 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -13,7 +13,7 @@ import MSPCodes from "../msp/MSPCodes"; import { API_VERSION_1_42, API_VERSION_1_44 } from '../data_storage'; import UI_PHONES from "../phones_ui"; import { gui_log } from "../gui_log"; -import { checkChromeRuntimeError } from "../utils/common"; +import { checkChromeRuntimeError, getColorYesNo } from "../utils/common"; const vtx = { supported: false, @@ -48,7 +48,7 @@ vtx.updateVtxDeviceStatus = function() function vtxDeviceStatusReady() { // update device ready state - $("#vtx_device_ready_description").html(FC.VTX_CONFIG.vtx_device_ready ? i18n.getMessage("vtxReadyTrue") : i18n.getMessage("vtxReadyFalse")); + $("#vtx_device_ready_description").html(getColorYesNo(FC.VTX_CONFIG.vtx_device_ready)); } MSP.send_message(MSPCodes.MSP2_GET_VTX_DEVICE_STATUS, false, false, vtxDeviceStatusReceived); @@ -296,7 +296,7 @@ vtx.initialize = function (callback) { $("#vtx_low_power_disarm").val(FC.VTX_CONFIG.vtx_low_power_disarm); // Values of the current values - $("#vtx_device_ready_description").html(FC.VTX_CONFIG.vtx_device_ready ? i18n.getMessage("vtxReadyTrue") : i18n.getMessage("vtxReadyFalse")); + $("#vtx_device_ready_description").html(getColorYesNo(FC.VTX_CONFIG.vtx_device_ready)); $("#vtx_type_description").text(self.getVtxTypeString()); $("#vtx_channel_description").text(FC.VTX_CONFIG.vtx_channel); diff --git a/src/js/utils/common.js b/src/js/utils/common.js index a23331ed32..644c06774f 100644 --- a/src/js/utils/common.js +++ b/src/js/utils/common.js @@ -113,3 +113,11 @@ $.fn.sortSelect = function(text = "") { return this.empty().append(op); }; + +/* + * return Yes or No with Color from class fixtrue or fixfalse + */ + +export function getColorYesNo(value) { + return (value ? `${i18n.getMessage("Yes")}` : `${i18n.getMessage("No")}`); +} From f8c0ddb9ca520f08aec72023657efcf2f92aebd8 Mon Sep 17 00:00:00 2001 From: HThuren Date: Tue, 25 Apr 2023 00:26:33 +0200 Subject: [PATCH 4/7] Use of css way --- locales/en/messages.json | 14 ++++++++++++++ src/css/main.less | 26 +++++++++++++------------- src/js/tabs/gps.js | 4 ++-- src/js/tabs/setup.js | 5 +++-- src/js/tabs/vtx.js | 8 +++++--- src/js/utils/common.js | 8 -------- 6 files changed, 37 insertions(+), 28 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 0a38b1c5a0..9fc01376c2 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2559,6 +2559,12 @@ "gps3dFix": { "message": "3D Fix:" }, + "gpsFixTrue": { + "message": "True" + }, + "gpsFixFalse": { + "message": "False" + }, "gpsAltitude": { "message": "Altitude:" }, @@ -6133,6 +6139,14 @@ "message": "You can select here the frequency for your VTX if it is supported", "description": "Help text for the frequency field of the VTX tab" }, + "vtxReadyTrue": { + "message": "True", + "description": "vtx device are ready" + }, + "vtxReadyFalse": { + "message": "False", + "description": "vtx device are not ready" + }, "vtxDeviceReady": { "message": "Device ready", "description": "Text of one of the fields of the VTX tab" diff --git a/src/css/main.less b/src/css/main.less index 2f8a0a5ee0..e74fb8a594 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -1715,19 +1715,19 @@ dialog { height: auto; } } -.fixtrue { - background-color: #56ac1d; - padding: 2px 5px; - border-radius: 3px; - color: #fff; - font-size: 10px; -} -.fixfalse { - background-color: #e60000; - padding: 2px 5px; - border-radius: 3px; - color: #fff; - font-size: 10px; +.fix { + background-color: #e60000; + padding: 2px 5px; + border-radius: 3px; + color: #fff; + font-size: 10px; +} +.fix.active { + background-color: #56ac1d; + padding: 2px 5px; + border-radius: 3px; + color: #fff; + font-size: 10px; } .buildInfoBtn { position: relative; diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 5107c15600..c205979560 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -10,7 +10,6 @@ import { have_sensor } from "../sensor_helpers"; import { mspHelper } from '../msp/MSPHelper'; import { reinitializeConnection } from '../serial_backend'; import { updateTabList } from '../utils/updateTabList'; -import { getColorYesNo } from "../utils/common"; const gps = {}; @@ -193,7 +192,8 @@ gps.initialize = async function (callback) { const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; let alt = FC.GPS_DATA.alt; - $('.GPS_info td.fix').html(getColorYesNo(FC.GPS_DATA.fix)); + $('.GPS_info td.fix').text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); + $('.GPS_info td.fix').toggleClass("active", FC.GPS_DATA.fix !== 0); $('.GPS_info td.alt').text(`${alt} m`); $('.GPS_info td.lat a').prop('href', url).text(`${lat.toFixed(4)} deg`); diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index dee3f4a4a9..45584f72d7 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -11,7 +11,6 @@ import Model from '../model'; import MSPCodes from '../msp/MSPCodes'; import CONFIGURATOR, { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_46 } from '../data_storage'; import { gui_log } from '../gui_log'; -import { getColorYesNo } from "../utils/common"; const setup = { yaw_fix: 0.0, @@ -429,7 +428,9 @@ setup.initialize = function (callback) { // GPS info is acquired in the background using update_live_status() in serial_backend.js - gpsFix_e.html(getColorYesNo(FC.GPS_DATA.fix)); + gpsFix_e.text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); + gpsFix_e.toggleClass("active", FC.GPS_DATA.fix !== 0); + gpsSats_e.text(FC.GPS_DATA.numSat); gpsLat_e.text(`${(FC.GPS_DATA.lat / 10000000).toFixed(4)} deg`); gpsLon_e.text(`${(FC.GPS_DATA.lon / 10000000).toFixed(4)} deg`); diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index 46b467807b..889a47121b 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -13,7 +13,7 @@ import MSPCodes from "../msp/MSPCodes"; import { API_VERSION_1_42, API_VERSION_1_44 } from '../data_storage'; import UI_PHONES from "../phones_ui"; import { gui_log } from "../gui_log"; -import { checkChromeRuntimeError, getColorYesNo } from "../utils/common"; +import { checkChromeRuntimeError } from "../utils/common"; const vtx = { supported: false, @@ -48,7 +48,8 @@ vtx.updateVtxDeviceStatus = function() function vtxDeviceStatusReady() { // update device ready state - $("#vtx_device_ready_description").html(getColorYesNo(FC.VTX_CONFIG.vtx_device_ready)); + $("#vtx_device_ready_description").text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); + $("#vtx_device_ready_description").toggleClass("active", FC.VTX_CONFIG.vtx_device_ready !== 0); } MSP.send_message(MSPCodes.MSP2_GET_VTX_DEVICE_STATUS, false, false, vtxDeviceStatusReceived); @@ -296,7 +297,8 @@ vtx.initialize = function (callback) { $("#vtx_low_power_disarm").val(FC.VTX_CONFIG.vtx_low_power_disarm); // Values of the current values - $("#vtx_device_ready_description").html(getColorYesNo(FC.VTX_CONFIG.vtx_device_ready)); + $("#vtx_device_ready_description").text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); + $("#vtx_device_ready_description").toggleClass("active", FC.VTX_CONFIG.vtx_device_ready !== 0); $("#vtx_type_description").text(self.getVtxTypeString()); $("#vtx_channel_description").text(FC.VTX_CONFIG.vtx_channel); diff --git a/src/js/utils/common.js b/src/js/utils/common.js index 644c06774f..a23331ed32 100644 --- a/src/js/utils/common.js +++ b/src/js/utils/common.js @@ -113,11 +113,3 @@ $.fn.sortSelect = function(text = "") { return this.empty().append(op); }; - -/* - * return Yes or No with Color from class fixtrue or fixfalse - */ - -export function getColorYesNo(value) { - return (value ? `${i18n.getMessage("Yes")}` : `${i18n.getMessage("No")}`); -} From ff3b457862491282be5da6b0747998cbf3078b9f Mon Sep 17 00:00:00 2001 From: HThuren Date: Tue, 25 Apr 2023 19:36:34 +0200 Subject: [PATCH 5/7] Now use CSS style --- src/css/main.less | 14 ++++++++++++++ src/js/tabs/gps.js | 4 ++-- src/js/tabs/setup.js | 4 ++-- src/js/tabs/vtx.js | 11 +++++++---- src/tabs/gps.html | 6 ++---- src/tabs/setup.html | 4 ++-- src/tabs/vtx.html | 6 +++--- 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/css/main.less b/src/css/main.less index e74fb8a594..c50d7c3cfe 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -1729,6 +1729,20 @@ dialog { color: #fff; font-size: 10px; } +.vtx_device_ready { + background-color: #e60000; + padding: 2px 5px; + border-radius: 3px; + color: #fff; + font-size: 10px; +} +.vtx_device_ready.active { + background-color: #56ac1d; + padding: 2px 5px; + border-radius: 3px; + color: #fff; + font-size: 10px; +} .buildInfoBtn { position: relative; margin-bottom: 0px; diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index c205979560..3c098f6758 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -192,8 +192,8 @@ gps.initialize = async function (callback) { const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; let alt = FC.GPS_DATA.alt; - $('.GPS_info td.fix').text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); - $('.GPS_info td.fix').toggleClass("active", FC.GPS_DATA.fix !== 0); + $('.GPS_info span.fix').text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); + $('.GPS_info span.fix').toggleClass('active', FC.GPS_DATA.fix != 0); $('.GPS_info td.alt').text(`${alt} m`); $('.GPS_info td.lat a').prop('href', url).text(`${lat.toFixed(4)} deg`); diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index 45584f72d7..9129880b13 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -192,7 +192,7 @@ setup.initialize = function (callback) { rssi_e = $('.rssi'), cputemp_e = $('.cpu-temp'), arming_disable_flags_e = $('.arming-disable-flags'), - gpsFix_e = $('.gpsFix'), + gpsFix_e = $('.GPS_info span.fix'), gpsSats_e = $('.gpsSats'), gpsLat_e = $('.gpsLat'), gpsLon_e = $('.gpsLon'), @@ -429,7 +429,7 @@ setup.initialize = function (callback) { // GPS info is acquired in the background using update_live_status() in serial_backend.js gpsFix_e.text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); - gpsFix_e.toggleClass("active", FC.GPS_DATA.fix !== 0); + gpsFix_e.toggleClass("active", FC.GPS_DATA.fix != 0); gpsSats_e.text(FC.GPS_DATA.numSat); gpsLat_e.text(`${(FC.GPS_DATA.lat / 10000000).toFixed(4)} deg`); diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index 889a47121b..d2068f541f 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -47,9 +47,11 @@ vtx.updateVtxDeviceStatus = function() function vtxDeviceStatusReady() { + const vtxReady_e = $('.VTX_info span.vtx_device_ready'); + // update device ready state - $("#vtx_device_ready_description").text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); - $("#vtx_device_ready_description").toggleClass("active", FC.VTX_CONFIG.vtx_device_ready !== 0); + vtxReady_e.text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); + vtxReady_e.toggleClass('active', FC.VTX_CONFIG.vtx_device_ready); } MSP.send_message(MSPCodes.MSP2_GET_VTX_DEVICE_STATUS, false, false, vtxDeviceStatusReceived); @@ -297,8 +299,9 @@ vtx.initialize = function (callback) { $("#vtx_low_power_disarm").val(FC.VTX_CONFIG.vtx_low_power_disarm); // Values of the current values - $("#vtx_device_ready_description").text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); - $("#vtx_device_ready_description").toggleClass("active", FC.VTX_CONFIG.vtx_device_ready !== 0); + const vtxReady_e = $('.VTX_info span.vtx_device_ready'); + vtxReady_e.text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); + vtxReady_e.toggleClass("active", FC.VTX_CONFIG.vtx_device_ready); $("#vtx_type_description").text(self.getVtxTypeString()); $("#vtx_channel_description").text(FC.VTX_CONFIG.vtx_channel); diff --git a/src/tabs/gps.html b/src/tabs/gps.html index ef94e12d49..a307eedd61 100644 --- a/src/tabs/gps.html +++ b/src/tabs/gps.html @@ -7,7 +7,6 @@
-
@@ -77,7 +76,6 @@
-
@@ -85,8 +83,8 @@
- - + + diff --git a/src/tabs/setup.html b/src/tabs/setup.html index 0675c6f3e4..bed5a8cf73 100644 --- a/src/tabs/setup.html +++ b/src/tabs/setup.html @@ -116,12 +116,12 @@
-
+
- + diff --git a/src/tabs/vtx.html b/src/tabs/vtx.html index e7fa5adff9..e3a9d8d9a9 100644 --- a/src/tabs/vtx.html +++ b/src/tabs/vtx.html @@ -125,12 +125,12 @@
-
+
- + - + From 0b71aeda84461e4141285924fb13bb10659e46f6 Mon Sep 17 00:00:00 2001 From: HThuren Date: Wed, 26 Apr 2023 21:59:58 +0200 Subject: [PATCH 6/7] reduce size of main.less --- src/css/main.less | 26 ++++---------------------- src/js/tabs/gps.js | 4 ++-- src/js/tabs/setup.js | 4 ++-- src/js/tabs/vtx.js | 8 ++++---- src/tabs/gps.html | 2 +- src/tabs/setup.html | 2 +- src/tabs/vtx.html | 2 +- 7 files changed, 15 insertions(+), 33 deletions(-) diff --git a/src/css/main.less b/src/css/main.less index c50d7c3cfe..d7a6442ff9 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -1715,33 +1715,15 @@ dialog { height: auto; } } -.fix { +.colorToggle { background-color: #e60000; padding: 2px 5px; border-radius: 3px; color: #fff; font-size: 10px; -} -.fix.active { - background-color: #56ac1d; - padding: 2px 5px; - border-radius: 3px; - color: #fff; - font-size: 10px; -} -.vtx_device_ready { - background-color: #e60000; - padding: 2px 5px; - border-radius: 3px; - color: #fff; - font-size: 10px; -} -.vtx_device_ready.active { - background-color: #56ac1d; - padding: 2px 5px; - border-radius: 3px; - color: #fff; - font-size: 10px; + &.ready { + background-color: #56ac1d; + } } .buildInfoBtn { position: relative; diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index 3c098f6758..a54b5c5eeb 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -192,8 +192,8 @@ gps.initialize = async function (callback) { const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown']; let alt = FC.GPS_DATA.alt; - $('.GPS_info span.fix').text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); - $('.GPS_info span.fix').toggleClass('active', FC.GPS_DATA.fix != 0); + $('.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); $('.GPS_info td.alt').text(`${alt} m`); $('.GPS_info td.lat a').prop('href', url).text(`${lat.toFixed(4)} deg`); diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index 9129880b13..973cfffe03 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -192,7 +192,7 @@ setup.initialize = function (callback) { rssi_e = $('.rssi'), cputemp_e = $('.cpu-temp'), arming_disable_flags_e = $('.arming-disable-flags'), - gpsFix_e = $('.GPS_info span.fix'), + gpsFix_e = $('.GPS_info span.colorToggle'), gpsSats_e = $('.gpsSats'), gpsLat_e = $('.gpsLat'), gpsLon_e = $('.gpsLon'), @@ -429,7 +429,7 @@ setup.initialize = function (callback) { // GPS info is acquired in the background using update_live_status() in serial_backend.js gpsFix_e.text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); - gpsFix_e.toggleClass("active", FC.GPS_DATA.fix != 0); + gpsFix_e.toggleClass('ready', FC.GPS_DATA.fix != 0); gpsSats_e.text(FC.GPS_DATA.numSat); gpsLat_e.text(`${(FC.GPS_DATA.lat / 10000000).toFixed(4)} deg`); diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index d2068f541f..aa46d8fc9e 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -47,11 +47,11 @@ vtx.updateVtxDeviceStatus = function() function vtxDeviceStatusReady() { - const vtxReady_e = $('.VTX_info span.vtx_device_ready'); + const vtxReady_e = $('.VTX_info span.colorToggle'); // update device ready state vtxReady_e.text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); - vtxReady_e.toggleClass('active', FC.VTX_CONFIG.vtx_device_ready); + vtxReady_e.toggleClass('ready', FC.VTX_CONFIG.vtx_device_ready); } MSP.send_message(MSPCodes.MSP2_GET_VTX_DEVICE_STATUS, false, false, vtxDeviceStatusReceived); @@ -299,9 +299,9 @@ vtx.initialize = function (callback) { $("#vtx_low_power_disarm").val(FC.VTX_CONFIG.vtx_low_power_disarm); // Values of the current values - const vtxReady_e = $('.VTX_info span.vtx_device_ready'); + const vtxReady_e = $('.VTX_info span.colorToggle'); vtxReady_e.text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); - vtxReady_e.toggleClass("active", FC.VTX_CONFIG.vtx_device_ready); + vtxReady_e.toggleClass('ready', FC.VTX_CONFIG.vtx_device_ready); $("#vtx_type_description").text(self.getVtxTypeString()); $("#vtx_channel_description").text(FC.VTX_CONFIG.vtx_channel); diff --git a/src/tabs/gps.html b/src/tabs/gps.html index a307eedd61..d6b1730fc7 100644 --- a/src/tabs/gps.html +++ b/src/tabs/gps.html @@ -84,7 +84,7 @@
- + diff --git a/src/tabs/setup.html b/src/tabs/setup.html index bed5a8cf73..f8d85a1c68 100644 --- a/src/tabs/setup.html +++ b/src/tabs/setup.html @@ -121,7 +121,7 @@ - + diff --git a/src/tabs/vtx.html b/src/tabs/vtx.html index e3a9d8d9a9..41df191c94 100644 --- a/src/tabs/vtx.html +++ b/src/tabs/vtx.html @@ -130,7 +130,7 @@ - + From 14a3558717edc9060d082782fbdaba26b7954b4c Mon Sep 17 00:00:00 2001 From: HThuren Date: Wed, 26 Apr 2023 22:25:38 +0200 Subject: [PATCH 7/7] xVx --- src/js/tabs/gps.js | 2 +- src/js/tabs/setup.js | 2 +- src/js/tabs/vtx.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js index a54b5c5eeb..82ca12a805 100644 --- a/src/js/tabs/gps.js +++ b/src/js/tabs/gps.js @@ -192,7 +192,7 @@ gps.initialize = async function (callback) { 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')); + $('.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); $('.GPS_info td.alt').text(`${alt} m`); diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index 973cfffe03..fd9b409b53 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -428,7 +428,7 @@ setup.initialize = function (callback) { // GPS info is acquired in the background using update_live_status() in serial_backend.js - gpsFix_e.text((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); + gpsFix_e.text(FC.GPS_DATA.fix ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse')); gpsFix_e.toggleClass('ready', FC.GPS_DATA.fix != 0); gpsSats_e.text(FC.GPS_DATA.numSat); diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js index aa46d8fc9e..82450c99b5 100644 --- a/src/js/tabs/vtx.js +++ b/src/js/tabs/vtx.js @@ -50,7 +50,7 @@ vtx.updateVtxDeviceStatus = function() const vtxReady_e = $('.VTX_info span.colorToggle'); // update device ready state - vtxReady_e.text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); + vtxReady_e.text(FC.VTX_CONFIG.vtx_device_ready ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); vtxReady_e.toggleClass('ready', FC.VTX_CONFIG.vtx_device_ready); } @@ -300,7 +300,7 @@ vtx.initialize = function (callback) { // Values of the current values const vtxReady_e = $('.VTX_info span.colorToggle'); - vtxReady_e.text((FC.VTX_CONFIG.vtx_device_ready) ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); + vtxReady_e.text(FC.VTX_CONFIG.vtx_device_ready ? i18n.getMessage('vtxReadyTrue') : i18n.getMessage('vtxReadyFalse')); vtxReady_e.toggleClass('ready', FC.VTX_CONFIG.vtx_device_ready); $("#vtx_type_description").text(self.getVtxTypeString());