wellton/ardrone-webflight
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Added magnetometer calibration to pilot plugin.

Ver Código-Fonte 
Also pass some events through the websocket.
Esse commit está contido em:
John Wiseman
2013-05-28 18:41:56 -07:00
pai a80b0552f8
commit 7e20174c38
6 arquivos alterados com 178 adições e 109 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
plugins/hud/public/js/compass.js
+5 -5
Ver Arquivo
@@ -13,13 +13,13 @@
// Add required UI elements
$('#cockpit').append('<div id="compass"></div>');
var div = $('#compass').get(0);
// Listen to navdata updates
var compass = this;
this.cockpit.socket.on('navdata', function(data) {
if (!jQuery.isEmptyObject(data)) {
requestAnimationFrame(function() {
compass.moveTo(data.demo.rotation.clockwise);
this.cockpit.socket.on('navdata', function(data) {
if (!jQuery.isEmptyObject(data)) {
requestAnimationFrame(function() {
compass.moveTo(data.magneto.heading.fusionUnwrapped);
});
}
});
plugins/pilot/index.js
+4
Ver Arquivo
@@ -10,6 +10,10 @@ function pilot(name, deps) {
console.log("drone", cmd);
return typeof deps.client[_name = cmd.action] === "function" ? deps.client[_name]() : void 0;
});
socket.on('/pilot/calibrate', function (cmd) {
console.log("calibrate", cmd);
return deps.client.calibrate(cmd.device_num);
});
});
};
plugins/pilot/public/js/pilot.js
+117 -95
Ver Arquivo
@@ -1,111 +1,133 @@
PILOT_ACCELERATION = 0.08;
(function(window, document) {
'use strict';
'use strict';
// Static keymap used within this module
var Keymap = {
90 : {
ev : 'move',
action : 'front'
},
83 : {
ev : 'move',
action : 'back'
},
81 : {
ev : 'move',
action : 'left'
},
68 : {
ev : 'move',
action : 'right'
},
38 : {
ev : 'move',
action : 'up'
},
40 : {
ev : 'move',
action : 'down'
},
37 : {
ev : 'move',
action : 'counterClockwise'
},
39 : {
ev : 'move',
action : 'clockwise'
},
32 : {
ev : 'drone',
action : 'stop'
},
84 : {
ev : 'drone',
action : 'takeoff'
},
76 : {
ev : 'drone',
action : 'land'
},
69 : {
ev : 'drone',
action : 'disableEmergency'
}
};
// Static keymap used within this module
var Keymap = {
90 : {
ev : 'move',
action : 'front'
},
83 : {
ev : 'move',
action : 'back'
},
81 : {
ev : 'move',
action : 'left'
},
68 : {
ev : 'move',
action : 'right'
},
38 : {
ev : 'move',
action : 'up'
},
40 : {
ev : 'move',
action : 'down'
},
37 : {
ev : 'move',
action : 'counterClockwise'
},
39 : {
ev : 'move',
action : 'clockwise'
},
32 : {
ev : 'drone',
action : 'stop'
},
84 : {
ev : 'drone',
action : 'takeoff'
},
76 : {
ev : 'drone',
action : 'land'
},
69 : {
ev : 'drone',
action : 'disableEmergency'
}
};
/*
* Constructuor
*/
var Pilot = function Pilot(cockpit) {
/*
* Constructuor
*/
var Pilot = function Pilot(cockpit) {
console.log("Loading Pilot plugin.");
this.cockpit = cockpit;
this.speed = 0;
this.listen();
};
this.cockpit = cockpit;
this.speed = 0;
// Start with magneto calibration disabled.
$('#calibratemagneto').prop('disabled', true);
/*
* Register keyboard event listener
*/
Pilot.prototype.listen = function listen() {
var pilot = this;
$(document).keydown(function(ev) {
pilot.keyDown(ev);
});
this.listen();
};
$(document).keyup(function(ev) {
pilot.keyUp(ev);
});
};
/*
* Register keyboard event listener
*/
Pilot.prototype.listen = function listen() {
var pilot = this;
$(document).keydown(function(ev) {
pilot.keyDown(ev);
});
Pilot.prototype.keyDown = function keyDown(ev) {
console.log("Keydown: " + ev.keyCode);
if (Keymap[ev.keyCode] == null) {
return;
$(document).keyup(function(ev) {
pilot.keyUp(ev);
});
$('#calibratemagneto').click(function(ev) {
ev.preventDefault();
pilot.calibrate(0);
});
this.cockpit.socket.on('hovering', function() {
$('#calibratemagneto').prop('disabled', false);
});
this.cockpit.socket.on('landed', function() {
$('#calibratemagneto').prop('disabled', true);
});
};
Pilot.prototype.keyDown = function keyDown(ev) {
console.log("Keydown: " + ev.keyCode);
if (Keymap[ev.keyCode] == null) {
return;
}
var evData;
ev.preventDefault();
this.speed = this.speed >= 1 ? 1 : this.speed + PILOT_ACCELERATION / (1 - this.speed);
evData = Keymap[ev.keyCode];
this.cockpit.socket.emit("/pilot/" + evData.ev, {
action : evData.action,
speed : this.speed
});
};
var evData;
ev.preventDefault();
this.speed = this.speed >= 1 ? 1 : this.speed + PILOT_ACCELERATION / (1 - this.speed);
evData = Keymap[ev.keyCode];
this.cockpit.socket.emit("/pilot/" + evData.ev, {
action : evData.action,
speed : this.speed
});
};
Pilot.prototype.keyUp = function keyUp(ev) {
console.log("Keyup: " + ev.keyCode);
if (Keymap[ev.keyCode] == null) {
return;
Pilot.prototype.keyUp = function keyUp(ev) {
console.log("Keyup: " + ev.keyCode);
if (Keymap[ev.keyCode] == null) {
return;
}
ev.preventDefault();
this.speed = 0;
this.cockpit.socket.emit("/pilot/drone", {
action : "stop"
});
};
this.speed = 0;
this.cockpit.socket.emit("/pilot/drone", {
action : "stop"
});
};
window.Cockpit.plugins.push(Pilot);
Pilot.prototype.calibrate = function calibrate(deviceNum) {
this.cockpit.socket.emit("/pilot/calibrate", {
device_num : 0
});
};
window.Cockpit.plugins.push(Pilot);
}(window, document));