Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev

2017-07-06 13:43:40 -04:00 · 2017-07-06 13:43:40 -04:00 · d48ddaa272
parent 8552cf79c8 eadf2f6f59
commit d48ddaa272
15 changed files with 2 additions and 2 deletions
--- a/buzz_scripts/Update.log
+++ b/buzz_scripts/Update.log
--- a/buzz_scripts/flock.bzz
+++ b/buzz_scripts/flock.bzz
--- a/buzz_scripts/graphform.bzz
+++ b/buzz_scripts/graphform.bzz
@ -793,9 +793,9 @@ function step(){
 #
 function Reset(){
    m_vecNodes={}
-    m_vecNodes = parse_graph("/home/dave/ROS_WS/src/rosbuzz/script/Graph_drone.graph")#change the .graph file when necessary
+    m_vecNodes = parse_graph("/home/ubuntu/ROS_WS/src/rosbuzz/buzz_scripts/include/Graph_drone.graph")#change the .graph file when necessary
    m_vecNodes_fixed={}
-    m_vecNodes_fixed=parse_graph_fixed("/home/dave/ROS_WS/src/rosbuzz/script/Graph_fixed.graph")
+    m_vecNodes_fixed=parse_graph_fixed("/home/ubuntu/ROS_WS/src/rosbuzz/buzz_scripts/include/Graph_fixed.graph")
    m_nLabel=-1

 	#start listening
--- a/buzz_scripts/include/Graph_drone.graph
+++ b/buzz_scripts/include/Graph_drone.graph
--- a/buzz_scripts/include/Graph_fixed.graph
+++ b/buzz_scripts/include/Graph_fixed.graph
--- a/buzz_scripts/include/barrier.bzz
+++ b/buzz_scripts/include/barrier.bzz
--- a/buzz_scripts/include/string.bzz
+++ b/buzz_scripts/include/string.bzz
--- a/buzz_scripts/include/uavstates.bzz
+++ b/buzz_scripts/include/uavstates.bzz
--- a/buzz_scripts/include/update.bzz
+++ b/buzz_scripts/include/update.bzz
--- a/buzz_scripts/include/vec2.bzz
+++ b/buzz_scripts/include/vec2.bzz
--- a/buzz_scripts/include/vstigenv.bzz
+++ b/buzz_scripts/include/vstigenv.bzz
--- a/buzz_scripts/stand_by.bzz
+++ b/buzz_scripts/stand_by.bzz
--- a/buzz_scripts/tentacle.bzz
+++ b/buzz_scripts/tentacle.bzz
--- a/buzz_scripts/testalone.bzz
+++ b/buzz_scripts/testalone.bzz
--- a/buzz_scripts/testflocksim.bzz
+++ b/buzz_scripts/testflocksim.bzz