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

Conflicts: views/index.ejs
2013-08-31 13:45:13 +02:00
commit 71c85d0c81
@@ -1,9 +1,11 @@
+*.swp
 .DS_Store
 .project
 .settings
 config.js
 node_modules
 components
+bower_components
 _site
 pictures
 temp.js
@@ -34,7 +34,7 @@ app.configure(function () {
    app.use(express.logger('dev'));
    app.use(app.router);
    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 () {
@@ -1,7 +1,5 @@
 {
  "name": "ardrone-webflight",
-  "description": "Extensible remote-control environment for the AR Drone.",
-  "version": "0.1.0",
  "dependencies": {
    "jquery": "~1.9.1",
    "bootstrap.css": "~2.1.1"
@@ -17,7 +17,7 @@
    "artificial horizon"
  ],
  "dependencies": {
-    "ar-drone": "git+ssh://git@github.com:felixge/node-ar-drone.git#master",
+    "ar-drone": "0.2.0",
    "express": "3.0.x",
    "ejs": "~0.8.3",
    "socket.io": "~0.9.4",
@@ -87,6 +87,10 @@ PILOT_ACCELERATION = 0.04;
                this.moving = false;
                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.
                $('#calibratemagneto').prop('disabled', true);

@@ -25,8 +25,6 @@
  <body>
    <div class="header-container">
      <span id="controls">
-        <input type="button" id="ftrim" value="Flat trim">
-        <input type="button" id="calibratemagneto" value="Calibrate magneto">
      </span>
      <header class="wrapper clearfix">
        <span class="brand">WebFlight</span>