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

Merge branch 'master' of github.com:eschnou/ardrone-webflight

Ver Código-Fonte 
Conflicts:
	views/index.ejs
Esse commit está contido em:
Bernhard K. Weisshuhn
2013-08-31 13:45:13 +02:00
pai 305b5e807a 089e1bad52
commit 71c85d0c81
6 arquivos alterados com 8 adições e 6 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
.gitignore
+2
Ver Arquivo
@@ -1,9 +1,11 @@
*.swp
.DS_Store .DS_Store
.project .project
.settings .settings
config.js config.js
node_modules node_modules
components components
bower_components
_site _site
pictures pictures
temp.js temp.js
app.js
+1 -1
Ver Arquivo
@@ -34,7 +34,7 @@ app.configure(function () {
app.use(express.logger('dev')); app.use(express.logger('dev'));
app.use(app.router); app.use(app.router);
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
app.use("/components", express.static(path.join(__dirname, 'components'))); app.use("/components", express.static(path.join(__dirname, 'bower_components')));
}); });
app.configure('development', function () { app.configure('development', function () {
bower.json
-2
Ver Arquivo
@@ -1,7 +1,5 @@
{ {
"name": "ardrone-webflight", "name": "ardrone-webflight",
"description": "Extensible remote-control environment for the AR Drone.",
"version": "0.1.0",
"dependencies": { "dependencies": {
"jquery": "~1.9.1", "jquery": "~1.9.1",
"bootstrap.css": "~2.1.1" "bootstrap.css": "~2.1.1"
package.json
+1 -1
Ver Arquivo
@@ -17,7 +17,7 @@
"artificial horizon" "artificial horizon"
], ],
"dependencies": { "dependencies": {
"ar-drone": "git+ssh://git@github.com:felixge/node-ar-drone.git#master", "ar-drone": "0.2.0",
"express": "3.0.x", "express": "3.0.x",
"ejs": "~0.8.3", "ejs": "~0.8.3",
"socket.io": "~0.9.4", "socket.io": "~0.9.4",
plugins/pilot/public/js/pilot.js
+4
Ver Arquivo
@@ -87,6 +87,10 @@ PILOT_ACCELERATION = 0.04;
this.moving = false; this.moving = false;
this.keys = {}; this.keys = {};
// Add the buttons to the control area
$('#controls').append('<input type="button" id="ftrim" value="Flat trim">');
$('#controls').append('<input type="button" id="calibratemagneto" value="Calibrate magneto">');
// Start with magneto calibration disabled. // Start with magneto calibration disabled.
$('#calibratemagneto').prop('disabled', true); $('#calibratemagneto').prop('disabled', true);
views/index.ejs
-2
Ver Arquivo
@@ -25,8 +25,6 @@
<body> <body>
<div class="header-container"> <div class="header-container">
<span id="controls"> <span id="controls">
<input type="button" id="ftrim" value="Flat trim">
<input type="button" id="calibratemagneto" value="Calibrate magneto">
</span> </span>
<header class="wrapper clearfix"> <header class="wrapper clearfix">
<span class="brand">WebFlight</span> <span class="brand">WebFlight</span>