From 357ad3a62527a4080774f9f76451dd6a6d6a565a Mon Sep 17 00:00:00 2001 From: raluca-elena Date: Tue, 19 Aug 2014 23:40:13 -0700 Subject: [PATCH] drone app --- directory_server/register.js | 7 +- frontend/index.html | 14 +- frontend/lib/bootstrap-combined.min.css | 859 ++++++++++++++++++++++++ frontend/lib/bootstrap.min.js | 7 + frontend/lib/jquery.min.js | 5 + frontend/lib/rot.js | 3 +- slave/config.json | 2 +- slave/deviceServers/droneServer.js | 18 +- 8 files changed, 893 insertions(+), 22 deletions(-) create mode 100644 frontend/lib/bootstrap-combined.min.css create mode 100644 frontend/lib/bootstrap.min.js create mode 100644 frontend/lib/jquery.min.js diff --git a/directory_server/register.js b/directory_server/register.js index 2221f7f..567e965 100644 --- a/directory_server/register.js +++ b/directory_server/register.js @@ -1,9 +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"; + $.ajax({"url":baseurl + "/ls"}).done(function (data) { if (Object.keys(data).length === 0) { diff --git a/frontend/index.html b/frontend/index.html index 2a2f605..d505a45 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,10 +1,14 @@ + + + + - + - - - + + +
@@ -12,7 +16,7 @@ -