Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-20 23:05:15 +03:00
Code Issues Wiki Activity

Map now shows up on satfix and updates the position of the marker

Browse source
This commit is contained in:
NightHawk32 2015-12-01 16:00:37 -05:00
parent 938d8b522c
commit f596abee0f
2 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

63
tabs/gps.js
View file

@ -15,6 +15,18 @@ TABS.gps.initialize = function (callback) {
MSP.send_message(MSP_codes.MSP_STATUS, false, false, load_html); MSP.send_message(MSP_codes.MSP_STATUS, false, false, load_html);
function set_online(){
$('#connect').hide();
$('#waiting').show();
$('#loadmap').show();
}
function set_offline(){
$('#connect').show();
$('#waiting').hide();
$('#loadmap').hide();
}
function process_html() { function process_html() {
// translate to user-selected languageconsole.log('Online'); // translate to user-selected languageconsole.log('Online');
localize(); localize();
@ -54,13 +66,29 @@ TABS.gps.initialize = function (callback) {
$('td', row).eq(1).text(GPS_DATA.quality[i]); $('td', row).eq(1).text(GPS_DATA.quality[i]);
$('td', row).eq(2).find('progress').val(GPS_DATA.cno[i]); $('td', row).eq(2).find('progress').val(GPS_DATA.cno[i]);
} }
var message = {
action: 'center',
lat: lat,
lon: lon,
};
var frame = document.getElementById('map');
if(lat != 0 && lon != 0){
frame.contentWindow.postMessage(message, '*');
$('#waiting').hide();
$('#loadmap').show();
}else{
$('#loadmap').hide();
$('#waiting').show();
}
} }
// enable data pulling // enable data pulling
GUI.interval_add('gps_pull', function gps_update() { 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. // avoid usage of the GPS commands until a GPS sensor is detected for targets that are compiled without GPS support.
if (!have_sensor(CONFIG.activeSensors, 'gps')) { if (!have_sensor(CONFIG.activeSensors, 'gps')) {
return; //return;
} }
get_raw_gps_data(); get_raw_gps_data();
@ -75,30 +103,19 @@ TABS.gps.initialize = function (callback) {
//check for internet connection on load //check for internet connection on load
if (navigator.onLine) { if (navigator.onLine) {
console.log('Online'); console.log('Online');
$('#connect').hide(); set_online();
$('#waiting').show();
$('#loadmap').show();
} else { } else {
console.log('Offline'); console.log('Offline');
$('#connect').show(); set_offline();
$('#waiting').hide();
$('#loadmap').hide();
} }
$("#check").on('click',function(){ $("#check").on('click',function(){
if (navigator.onLine) { if (navigator.onLine) {
console.log('Online'); console.log('Online');
$('#connect').hide(); set_online();
$('#waiting').show();
$('#loadmap').show();
} else { } else {
console.log('Offline'); console.log('Offline');
$('#connect').show(); set_offline();
$('#waiting').hide();
$('#loadmap').hide();
} }
}); });
@ -107,17 +124,17 @@ TABS.gps.initialize = function (callback) {
$('#zoom_in').click(function() { $('#zoom_in').click(function() {
console.log('zoom in'); console.log('zoom in');
var message = { var message = {
action: 'zoom_in', action: 'zoom_in',
}; };
frame.contentWindow.postMessage(message, '*'); frame.contentWindow.postMessage(message, '*');
}); });
$('#zoom_out').click(function() { $('#zoom_out').click(function() {
console.log('zoom out'); console.log('zoom out');
var message = { var message = {
action: 'zoom_out' action: 'zoom_out'
}; };
frame.contentWindow.postMessage(message, '*'); frame.contentWindow.postMessage(message, '*');
}); });
GUI.content_ready(callback); GUI.content_ready(callback);

2
tabs/map.html
View file

@ -29,6 +29,8 @@
zoom--; zoom--;
map.setZoom(zoom); map.setZoom(zoom);
break; break;
case 'center':
map.setCenter(new google.maps.LatLng(e.data.lat, e.data.lon));
} }
} catch (e) { } catch (e) {
console.log('message error'); console.log('message error');