Skip to content

Display heading on GPS Tab #3355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 2, 2023
Merged

Display heading on GPS Tab #3355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
139aee2
Add VFC support for GPS tab
atomgomba Feb 23, 2023
2298f4b
Display heading from mag
atomgomba Feb 23, 2023
c7d7964
Review fixes
atomgomba Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2479,6 +2479,9 @@
"gpsLon": {
"message": "Longitude:"
},
"gpsHeading": {
"message": "Heading:"
},
"gpsSpeed": {
"message": "Speed:"
},
Expand Down Expand Up @@ -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",
Expand Down
33 changes: 32 additions & 1 deletion src/js/VirtualFC.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down Expand Up @@ -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;
2 changes: 1 addition & 1 deletion src/js/fc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ const FC = {
speed: 0,
ground_course: 0,
distanceToHome: 0,
ditectionToHome: 0,
directionToHome: 0,
update: 0,

chn: [],
Expand Down
25 changes: 17 additions & 8 deletions src/js/tabs/gps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'];
Expand All @@ -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`);
Expand Down Expand Up @@ -263,6 +272,7 @@ gps.initialize = async function (callback) {
action: 'center',
lat: lat,
lon: lon,
heading: heading,
};

frame = document.getElementById('map');
Expand All @@ -271,15 +281,19 @@ 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) {
$('#loadmap').hide();
$('#waiting').show();
} else {
message.action = 'nofix';
frame.contentWindow.postMessage(message, '*');
if (!!frame.contentWindow) {
frame.contentWindow.postMessage(message, '*');
}
}
} else {
gpsWasFixed = false;
Expand All @@ -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);

Expand Down
49 changes: 24 additions & 25 deletions src/js/tabs/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member

@haslinghuis haslinghuis Feb 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove string interpolation?

Copy link
Contributor Author

@atomgomba atomgomba Feb 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So that we let the browser format the error object as it wishes and not force it to be a string manually.

Copy link
Contributor Author

@atomgomba atomgomba Feb 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plus, it won't really show since the map is running in its own webview with its own console. You have to have the console of the inner webview open to see the message anyway. It's bad, but I didn't take the time to look deeper into the issue

}
}
4 changes: 4 additions & 0 deletions src/tabs/gps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
<td i18n="gpsLon"></td>
<td class="lon"><a href="#" target="_blank">0.0000 deg</a></td>
</tr>
<tr>
<td i18n="gpsHeading"></td>
<td class="heading"><a href="#" target="_blank">0.0000 deg</a></td>
</tr>
<tr>
<td i18n="gpsSpeed"></td>
<td class="speed">0 cm/s</td>
Expand Down