voyager 3.0

juliocesar-io · Apr 7, 2016 · 827999d · 827999d
1 parent f777194
commit 827999d
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 29 deletions.
diff --git a/app.js b/app.js
@@ -5,7 +5,6 @@ var express = require('express'),
     fs = require('fs'),
     five = require("johnny-five"),
     path = require('path');
-    oldAng = 90;
 
 var spawn = require('child_process').spawn;
 var proc;
@@ -27,6 +26,15 @@ app.get('/', function(req, res) {
 app.get('/keypress.js', function(req, res) {
   res.sendFile(__dirname + '/keypress.js');
 });
+app.get('/jquery.min.js', function(req, res) {
+  res.sendFile(__dirname + '/jquery.min.js');
+});
+app.get('/font-awesome.min.css', function(req, res) {
+  res.sendFile(__dirname + '/font-awesome.min.css');
+});
+app.get('/bootstrap.min.css', function(req, res) {
+  res.sendFile(__dirname + '/bootstrap.min.css');
+});
 
 var sockets = {};
 
@@ -38,12 +46,11 @@ io.on('connection', function(socket) {
 
 });
 
-board = new five.Board({ port: "/dev/ttyACM0" });
+board = new five.Board();
 
 board.on("ready", function() {
-  that = this;
-  led = new five.Led(13);
 
+  that = this;
 
 
   STBY = 5;
@@ -55,6 +62,7 @@ board.on("ready", function() {
   lMotorN3 = 7;
   lMotorN4 = 6;
   lMotorNB = 8;
+  luz = 52;
 
   // Set H bridge pins
  this.pinMode(STBY, five.Pin.OUTPUT);
@@ -63,23 +71,34 @@ board.on("ready", function() {
  this.pinMode(rMotorNA, five.Pin.PWM);
  this.pinMode(lMotorN3, five.Pin.OUTPUT);
  this.pinMode(lMotorN4, five.Pin.OUTPUT);
+ this.pinMode(luz, five.Pin.OUTPUT);
  this.pinMode(lMotorNB, five.Pin.PWM);
 
+ this.digitalWrite(luz, 1);
 
- myServo = new five.Servo(9);
+ //
 
-  board.repl.inject({
-    servo: myServo
+  var servoBrazo = new five.Servo({
+    pin: 9,
+    startAt: 90
   });
 
+  var servoPinza = new five.Servo({
+     pin: 10,
+     startAt: 180
+  });
+
+  var servoCam = new five.Servo({
+     pin: 11,
+     startAt: 90
+   });
+
+   var servoDisparador = new five.Servo({
+     pin: 12,
+     startAt: 70
+   });
 
-  myServo.sweep();
 
-  this.wait(5000, function(){
-    myServo.stop();
-    myServo.to(oldAng);
-	    myServo.stop();
-  });
 
 
   io.sockets.on('connection', function (socket) {
@@ -94,20 +113,61 @@ board.on("ready", function() {
 
     });
 
+    socket.on('luzOn-Off', function (luzEstado) {
+      if (luzEstado == true) {
 
+        luzEstado = 0
+
+
+      } else if (luzEstado == false) {
+
+        luzEstado = 1;
+
+      }
+        that.digitalWrite(luz, luzEstado);
 
-/*
-    socket.on('brazoA', function () {
-      console.log("Brazo abierto! ");
-      servo.sweep();
-      servo.to(90);
     });
 
-    socket.on('brazoB', function () {
-      console.log("Brazo cerrado! ");
-      servo.to(180);
+    socket.on('DisparadorOn-Off', function (disparadorEstado) {
+
+      if (disparadorEstado == true) {
+
+        disparadorEstado = 170
+
+
+      } else if (disparadorEstado == false) {
+
+        disparadorEstado = 70;
+
+      }
+        servoDisparador.to(disparadorEstado);
+
     });
-*/
+
+    socket.on('pinzaA', function () {
+      servoPinza.to(180)
+    });
+
+    socket.on('pinzaD', function () {
+      servoPinza.to(90)
+    });
+
+    socket.on('brazoW', function () {
+      servoBrazo.to(180)
+    });
+
+    socket.on('brazoS', function () {
+      servoBrazo.to(90)
+    });
+
+    socket.on('servoCam', function (gradosCam) {
+      servoCam.to(gradosCam)
+    });
+
+
+
+
+
     socket.on('stop', function () {
         console.log("Server: Stop! ");
         // Turn off right motor

diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/font-awesome.min.css b/font-awesome.min.css
diff --git a/index.html b/index.html
@@ -2,10 +2,9 @@
 <head>
     <!-- Bootstrap CSS -->
   <link rel="stylesheet" href="/status.css" media="screen" title="no title" charset="utf-8">
-  <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-  <script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+  <link href="/bootstrap.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="/font-awesome.min.css">
+  <script src="/jquery.min.js"></script>
   <script src="/keypress.js"></script>
   <script src="/socket.io/socket.io.js"></script>
 
@@ -24,6 +23,11 @@
       var listener = new window.keypress.Listener();
       var socket = io.connect();
 
+      var luzEstado = 1;
+      var disparadorEstado = 1;
+
+      var gradosCam = 90;
+
       var my_combos = listener.register_many([
           {
               "keys": "up",
@@ -70,13 +74,78 @@
           },{
             "keys": "a",
             "on_keydown": function() {
-                console.log("Moviendo Brazo!");
-                //socket.emit('brazoA');
+                socket.emit('pinzaA');
+            },
+            "on_keyup": function(e) {
+                console.log("--");
+            }
+          },{
+            "keys": "d",
+            "on_keydown": function() {
+                socket.emit('pinzaD');
+            },
+            "on_keyup": function(e) {
+                console.log("--");
+            }
+          },{
+            "keys": "w",
+            "on_keydown": function() {
+                socket.emit('brazoW');
             },
             "on_keyup": function(e) {
-                console.log("Moviendo Brazo!");
+                console.log("--");
                 //socket.emit('brazoB');
             }
+          },{
+            "keys": "s",
+            "on_keydown": function() {
+                socket.emit('brazoS');
+            },
+            "on_keyup": function(e) {
+                console.log("--");
+            }
+          },{
+            "keys": "shift",
+            "on_keydown": function() {
+
+                luzEstado = !luzEstado;
+                console.log(luzEstado);
+                socket.emit('luzOn-Off', luzEstado );
+            },
+            "on_keyup": function(e) {
+              console.log("--");
+
+            }
+          },{
+            "keys": "space",
+            "on_keydown": function() {
+                disparadorEstado = !disparadorEstado;
+
+                socket.emit('DisparadorOn-Off', disparadorEstado);
+            },
+            "on_keyup": function(e) {
+              console.log("--");
+            }
+          },{
+            "keys": "q",
+            "on_keydown": function() {
+                gradosCam = gradosCam + 1
+                console.log(gradosCam);
+                socket.emit('servoCam', gradosCam);
+            },
+            "on_keyup": function(e) {
+              console.log("--");
+            }
+          },{
+            "keys": "e",
+            "on_keydown": function() {
+                gradosCam = gradosCam - 1
+                console.log(gradosCam);
+                socket.emit('servoCam', gradosCam);
+            },
+            "on_keyup": function(e) {
+              console.log("--");
+            }
           }
 
         ]);

diff --git a/jquery.min.js b/jquery.min.js
diff --git a/servo.js b/servo.js
@@ -0,0 +1,19 @@
+var five = require("johnny-five");
+var board = new five.Board();
+
+board.on("ready", function() {
+
+  var servo = new five.Servo({
+    pin: 10,
+    startAt: 70
+  });
+
+  // Angle change takes 500ms to complete
+  servo.to(70, 50);
+
+  setTimeout(function() {
+    servo.to(170, 50);
+  }, 3000);
+
+
+});