modify eva

directory_server/register.js

@@ -1,11 +1,12 @@
-//var baseurl = "http://10.0.0.3:8080";
-//var url = "10.0.0.3";
+var baseurl = "http://10.0.0.3:8080";
+var url = "10.0.0.3";
+
 //var baseurl = "http://10.251.38.229:8080";
 //var url = "10.251.38.229";
 //var baseurl = "http://10.251.43.162:8080";
 //var url = "10.251.43.162";
-var baseurl = "http://192.168.1.2:8080";
-var url = "192.168.1.2";
+//var baseurl = "http://192.168.1.2:8080";
+//var url = "192.168.1.2";
 
 
 $.ajax({"url":baseurl + "/ls"}).done(function (data) {

frontend/apps/droneApp.js

@@ -3,7 +3,7 @@ function app(){
     id:"start",
     text: 'takeoff',
     click: function () {
-      ROT.writeTag("drone", "start", function(data){
+      ROT.writeTag("eva", "start", function(data){
         console.log("wrote data to drone");
       });
     }
@@ -14,7 +14,7 @@ function app(){
     id:"stop",
     text: 'land',
     click: function () {
-      ROT.writeTag("drone", "stop", function(data){
+      ROT.writeTag("eva", "stop", function(data){
         console.log("wrote data to drone ");
       });
     }

frontend/lib/rot.js

@@ -4,7 +4,8 @@ var ROT = {};
 //var baseurl = "http://10.0.0.3:8080";
 //var baseurl = "http://10.251.38.229:8080";
 //var baseurl = "http://10.251.43.162:8080";
-var baseurl = "http://192.168.1.2:8080";
+//var baseurl = "http://192.168.1.2:8080";
+var baseurl = "http://10.0.0.3:8080";
 var allUuids = [];
 var allThings = {};
 var allFeatures = {}

slave/config.json

@@ -1,5 +1,5 @@
 {
-    "directoryServer": "http://192.168.1.2:8080",
+    "directoryServer": "http://10.0.0.3:8080",
     "tagFile":"/tmp/tags.json",
     "port":3000,
     "proxyport":3000,
@@ -15,7 +15,7 @@
       "photocell":{"url":"http://localhost:4444"},
       "webiopi":{"url":"http://localhost:4545"},
       "some_drone":{"url":"http://192.168.1.2:7777"},
-      "some_robot":{"url":"http://192.168.1.3:7777"}
+      "some_robot":{"url":"http://10.0.0.10:7777"}
 
 
 

slave/deviceServers/evaServer.js

@@ -54,8 +54,8 @@ function step() {
     }
   , 200);
 }
-var run = 0;
-run = setInterval(step, 2500);
+
+var run = setInterval(step, 2500);
 var port = 7777;
 console.log("listening on port: ", port);
 var app = express();
@@ -82,9 +82,11 @@ app.put("/", function(req, res){
     console.log("Hello human. I am EVA");
   }
   if (req.text === "start") {
+    count = 0;
     run = setInterval(step, 2500);
   }
   if (req.text === "stop") {
+    count = 0;
     clearInterval(run);
   }
 });