Spiri
/
ROSBuzz_MISTLab
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bzz include

This commit is contained in:
dave 2017-05-09 13:28:32 -04:00
parent f8917cd39e
commit 149de3d60b
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/testflocksim.bzz
View File

@ -1,6 +1,6 @@
# We need this for 2D vectors # We need this for 2D vectors
# Make sure you pass the correct include path to "bzzc -I <path1:path2> ..." # Make sure you pass the correct include path to "bzzc -I <path1:path2> ..."
include "/home/ubuntu/buzz/src/include/vec2.bzz" include "vec2.bzz"
#################################################################################################### ####################################################################################################
# Updater related # Updater related
# This should be here for the updater to work, changing position of code will crash the updater # This should be here for the updater to work, changing position of code will crash the updater

BIN
script/teststig.bdb
View File

Binary file not shown.

BIN
script/teststig.bo
View File

Binary file not shown.

7
script/teststig.bzz
View File

@ -1,3 +1,4 @@
include "vec2.bzz"
#################################################################################################### ####################################################################################################
# Updater related # Updater related
# This should be here for the updater to work, changing position of code will crash the updater # This should be here for the updater to work, changing position of code will crash the updater
@ -12,8 +13,8 @@ function init(){
s = swarm.create(1) s = swarm.create(1)
s.join() s.join()
v = stigmergy.create(5) v = stigmergy.create(5)
#t= {} t= {}
#v.put("p",t) v.put("p",t)
v.put("u",1) v.put("u",1)
} }
@ -26,7 +27,7 @@ function step() {
#v.put("p",tmp) #v.put("p",tmp)
v.put("u",2) v.put("u",2)
} }
#log(v.get("p")) log(v.get("p"))
} }
# Executed once when the robot (or the simulator) is reset. # Executed once when the robot (or the simulator) is reset.

2
src/roscontroller.cpp
View File

@ -271,7 +271,7 @@ namespace rosbzz_node{
//bzzfile_in_compile.str(""); //bzzfile_in_compile.str("");
std::string name = bzzfile_name.substr(bzzfile_name.find_last_of("/\\") + 1); std::string name = bzzfile_name.substr(bzzfile_name.find_last_of("/\\") + 1);
name = name.substr(0,name.find_last_of(".")); name = name.substr(0,name.find_last_of("."));
bzzfile_in_compile << "bzzc -I " << path << "script/include/"; //<<" "<<path<< name<<".basm"; bzzfile_in_compile << "bzzc -I " << path << "include/"; //<<" "<<path<< name<<".basm";
//bzzfile_in_compile.str(""); //bzzfile_in_compile.str("");
//bzzfile_in_compile <<"bzzasm "<<path<<name<<".basm "<<path<<name<<".bo "<<path<<name<<".bdbg"; //bzzfile_in_compile <<"bzzasm "<<path<<name<<".basm "<<path<<name<<".bo "<<path<<name<<".bdbg";
//system(bzzfile_in_compile.str().c_str()); //system(bzzfile_in_compile.str().c_str());