diff --git a/locales/en/messages.json b/locales/en/messages.json
index dfe2e2f1e0..3b4682c69e 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -2479,6 +2479,9 @@
"gpsLon": {
"message": "Longitude:"
},
+ "gpsHeading": {
+ "message": "Heading:"
+ },
"gpsSpeed": {
"message": "Speed:"
},
@@ -4875,7 +4878,7 @@
},
"osdTextElementVTXchannelVariantPower": {
"message": "VTX power",
- "description": "One of the variants of the VTX channel element of the OSD"
+ "description": "One of the variants of the VTX channel element of the OSD"
},
"osdTextElementVTXchannelVariantFull": {
"message": "Band:Channel:Pwr:Pit",
diff --git a/src/js/VirtualFC.js b/src/js/VirtualFC.js
index 226acad251..04281c8b96 100644
--- a/src/js/VirtualFC.js
+++ b/src/js/VirtualFC.js
@@ -156,6 +156,8 @@ const VirtualFC = {
mag_hardware: 1,
};
+ virtualFC.SENSOR_DATA = { ...FC.SENSOR_DATA };
+
virtualFC.RC = {
channels: Array.from({length: 16}),
active_channels: 16,
@@ -180,8 +182,20 @@ const VirtualFC = {
// 11 1111 (pass bitchecks)
virtualFC.CONFIG.activeSensors = 63;
+
+ virtualFC.GPS_CONFIG = {
+ provider: 1,
+ ublox_sbas: 1,
+ auto_config: 1,
+ auto_baud: 0,
+ home_point_once: 1,
+ ublox_use_galileo: 1,
+ };
+
+ virtualFC.GPS_DATA = sampleGpsData;
},
- setupVirtualOSD(){
+
+ setupVirtualOSD() {
const virtualOSD = OSD;
virtualOSD.data.video_system = 1;
@@ -221,4 +235,21 @@ const VirtualFC = {
},
};
+const sampleGpsData = {
+ "fix": 2,
+ "numSat": 10,
+ "lat": 474919409,
+ "lon": 190539766,
+ "alt": 0,
+ "speed": 0,
+ "ground_course": 1337,
+ "distanceToHome": 0,
+ "directionToHome": 0,
+ "update": 0,
+ "chn": [0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 6, 6, 6, 6, 6, 6, 6, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255],
+ "svid": [1, 2, 10, 15, 18, 23, 26, 123, 136, 1, 15, 2, 3, 4, 9, 10, 16, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ "quality": [3, 95, 95, 95, 95, 95, 95, 23, 23, 1, 31, 20, 31, 23, 20, 17, 31, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ "cno": [27, 37, 43, 37, 34, 47, 44, 42, 39, 0, 40, 24, 40, 35, 26, 0, 35, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+};
+
export default VirtualFC;
diff --git a/src/js/fc.js b/src/js/fc.js
index 89d2e267a4..29737d4922 100644
--- a/src/js/fc.js
+++ b/src/js/fc.js
@@ -300,7 +300,7 @@ const FC = {
speed: 0,
ground_course: 0,
distanceToHome: 0,
- ditectionToHome: 0,
+ directionToHome: 0,
update: 0,
chn: [],
diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js
index 3d2807ef68..51bf243141 100644
--- a/src/js/tabs/gps.js
+++ b/src/js/tabs/gps.js
@@ -21,6 +21,8 @@ gps.initialize = async function (callback) {
await MSP.promise(MSPCodes.MSP_GPS_CONFIG);
await MSP.promise(MSPCodes.MSP_STATUS);
+ const hasMag = have_sensor(FC.CONFIG.activeSensors, 'mag');
+
load_html();
function load_html() {
@@ -52,7 +54,11 @@ gps.initialize = async function (callback) {
}
function get_gpsvinfo_data() {
- MSP.send_message(MSPCodes.MSP_GPS_SV_INFO, false, false, update_ui);
+ MSP.send_message(MSPCodes.MSP_GPS_SV_INFO, false, false, hasMag ? get_imu_data : update_ui);
+ }
+
+ function get_imu_data() {
+ MSP.send_message(MSPCodes.MSP_RAW_IMU, false, false, update_ui);
}
// To not flicker the divs while the fix is unstable
@@ -178,6 +184,8 @@ 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 gnssArray = ['GPS', 'SBAS', 'Galileo', 'BeiDou', 'IMES', 'QZSS', 'Glonass'];
const qualityArray = ['gnssQualityNoSignal', 'gnssQualitySearching', 'gnssQualityAcquired', 'gnssQualityUnusable', 'gnssQualityLocked',
'gnssQualityFullyLocked', 'gnssQualityFullyLocked', 'gnssQualityFullyLocked'];
@@ -189,6 +197,7 @@ gps.initialize = async function (callback) {
$('.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`);
+ $('.GPS_info td.heading').text(`${headingDeg.toFixed(4)} deg`);
$('.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`);
@@ -263,6 +272,7 @@ gps.initialize = async function (callback) {
action: 'center',
lat: lat,
lon: lon,
+ heading: heading,
};
frame = document.getElementById('map');
@@ -271,7 +281,9 @@ gps.initialize = async function (callback) {
if (FC.GPS_DATA.fix) {
gpsWasFixed = true;
- frame.contentWindow.postMessage(message, '*');
+ if (!!frame.contentWindow) {
+ frame.contentWindow.postMessage(message, '*');
+ }
$('#loadmap').show();
$('#waiting').hide();
} else if (!gpsWasFixed) {
@@ -279,7 +291,9 @@ gps.initialize = async function (callback) {
$('#waiting').show();
} else {
message.action = 'nofix';
- frame.contentWindow.postMessage(message, '*');
+ if (!!frame.contentWindow) {
+ frame.contentWindow.postMessage(message, '*');
+ }
}
} else {
gpsWasFixed = false;
@@ -291,11 +305,6 @@ gps.initialize = async function (callback) {
// enable data pulling
GUI.interval_add('gps_pull', function gps_update() {
- // avoid usage of the GPS commands until a GPS sensor is detected for targets that are compiled without GPS support.
- if (!have_sensor(FC.CONFIG.activeSensors, 'gps')) {
- //return;
- }
-
get_raw_gps_data();
}, 75, true);
diff --git a/src/js/tabs/map.js b/src/js/tabs/map.js
index 7c9f0217c6..bc014a9314 100644
--- a/src/js/tabs/map.js
+++ b/src/js/tabs/map.js
@@ -76,31 +76,30 @@ function initializeMap() {
}
function processMapEvents(e) {
-
try {
- switch(e.data.action) {
-
- case 'zoom_in':
- mapView.setZoom(mapView.getZoom() + 1);
- break;
-
- case 'zoom_out':
- mapView.setZoom(mapView.getZoom() - 1);
- break;
-
- case 'center':
- iconFeature.setStyle(iconStyle);
- const center = ol.proj.fromLonLat([e.data.lon, e.data.lat]);
- mapView.setCenter(center);
- iconGeometry.setCoordinates(center);
- break;
-
- case 'nofix':
- iconFeature.setStyle(iconStyleNoFix);
- break;
+ switch (e.data.action) {
+ case 'zoom_in':
+ mapView.setZoom(mapView.getZoom() + 1);
+ break;
+
+ case 'zoom_out':
+ mapView.setZoom(mapView.getZoom() - 1);
+ break;
+
+ case 'center':
+ iconFeature.setStyle(iconStyle);
+ const center = ol.proj.fromLonLat([e.data.lon, e.data.lat]);
+ mapView.setCenter(center);
+ const heading = e.data.heading === undefined ? 0 : e.data.heading;
+ mapView.setRotation(heading);
+ iconGeometry.setCoordinates(center);
+ break;
+
+ case 'nofix':
+ iconFeature.setStyle(iconStyleNoFix);
+ break;
}
-
- } catch (err) {
- console.log(`Map error ${err}`);
- }
+ } catch (err) {
+ console.error('Map error', err);
+ }
}
diff --git a/src/tabs/gps.html b/src/tabs/gps.html
index f9e5d33e48..ef94e12d49 100644
--- a/src/tabs/gps.html
+++ b/src/tabs/gps.html
@@ -100,6 +100,10 @@
|
0.0000 deg |
+
+ |
+ 0.0000 deg |
+
|
0 cm/s |