diff --git a/README.md b/README.md index 7d146e3..8798ab1 100644 --- a/README.md +++ b/README.md @@ -1,53 +1,12 @@ -# AESCAPE LAB UI +# Aescape Lab UI +## To run +Set your master to be what you want - default is `phoebe`. +Then run +``` +roslaunch aescape_lab_ui lab_ui.launch +``` - -The purpose of this project is an example of how to write a web page that can be accessed by any device on the same network as the host computer by accessing the IP of that host computer. - -The best way to contribute to this project is to make a new brach from the master branch called the name of the robot that it is used for. This will also alow maximum colaberation between labs. This can be accomplished by going to the tabs Commits->Branches then select "New Branch" - -### Quick Start Guide - -If you are connecting to a remote computer that is running the roscore, you need to run the following lines in the terminal: - - sudo route add 192.168.2.1 gw - export ROS_MASTER_URI=http://:11311 - export ROS_IP= - -Make sure you have the web_video_server installed: - - sudo apt-get install ros-indigo-web-video-server - -Make sure you have ROSBridge installed: - - sudo apt-get install ros-indigo-rosbridge-suite - -Then run the bash file in the working directory by running the following in the terminal. - - . launch.bash - -#### Just display the webpage - -If you just want to test the webpage, navigate to the working directory in the terminal and type - - python -m SimpleHTTPServer - -Then open http://localhost:8000/. or yourIPAddress:8000 - -# Making Changes - -Feel free to clone this project, make a new branch and use it as a base for your own GUI. - -You can easily customise the "Data Display" pannel by changing the HTML "data\_dsisplay\data\_display.html" file. - -All ROS related Javascript should go in the "data\_display/js/ros\_scripts.js" file. -All functions that are used to update the GUI should go in the "data\_display/js/update_guis.js" file. - -DO NOT MAKE CHANGES OUTISDE OF THIS DIECTORY AS IT WILL CAUSE MERG PROBLEMS. - -By using ROSBridge, this GUI will attempt to display relevant information over the web for any device. - -# Screen Shots - -Screen shots are in the root working directory - +## To access +Use Hamachi network: +http://titan.aescape.co:8000 \ No newline at end of file diff --git a/audio/beep-04.mp3 b/audio/beep-04.mp3 deleted file mode 100644 index a71eb4d..0000000 Binary files a/audio/beep-04.mp3 and /dev/null differ diff --git a/audio/beep-07.wav b/audio/beep-07.wav deleted file mode 100644 index 015e1f6..0000000 Binary files a/audio/beep-07.wav and /dev/null differ diff --git a/backend/js/update_guis.js b/backend/js/update_guis.js index f6173b8..ae3549d 100644 --- a/backend/js/update_guis.js +++ b/backend/js/update_guis.js @@ -110,7 +110,7 @@ window.setInterval(function(){ updateTopicsGUI(); updateNodesGUI(); -}, 500); +}, 5000); function validateForm() { diff --git a/data/bagfile_2015-07-01-09-17-42.bag.active b/data/bagfile_2015-07-01-09-17-42.bag.active deleted file mode 100644 index 347c1e6..0000000 Binary files a/data/bagfile_2015-07-01-09-17-42.bag.active and /dev/null differ diff --git a/data/test_bag_2015-07-01-12-38-32.bag b/data/test_bag_2015-07-01-12-38-32.bag deleted file mode 100644 index 4ca6e05..0000000 Binary files a/data/test_bag_2015-07-01-12-38-32.bag and /dev/null differ diff --git a/data_screenshot.jpg b/data_screenshot.jpg deleted file mode 100644 index 55b063f..0000000 Binary files a/data_screenshot.jpg and /dev/null differ diff --git a/index.html b/index.html index d858f71..40cd3ff 100644 --- a/index.html +++ b/index.html @@ -27,8 +27,6 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp - -