fix launch files

This commit is contained in:
dave 2017-05-09 14:33:35 -04:00
parent 149de3d60b
commit dbf0b6388c
8 changed files with 16 additions and 21 deletions

View File

@ -1,20 +1,16 @@
<!-- Launch file for ROSBuzz -->
<launch>
<node name="rosbuzz_node" pkg="rosbuzz" type="rosbuzz_node" respawn="false" output="screen" >
<rosparam file="$(find rosbuzz)/launch/launch_config/m100.yaml"/>
<param name="bzzfile_name" value="$(env ROS_WS)/src/testflockfev.bzz" />
<param name="rcclient" value="true" />
<param name="rcservice_name" value="/buzzcmd" />
<!--param name="fcclient_name" value="/dji_mavcmd" -->
<param name="in_payload" value="/inMavlink"/>
<param name="out_payload" value="/outMavlink"/>
<param name="xbee_status_srv" value="/xbee_status"/>
<param name="xbee_plugged" value="true"/>
<!--param name="robot_id" value="3"-->
<!--param name="No_of_Robots" value="3"-->
<param name="stand_by" value="$(env ROS_WS)/src/stand_by.bo"/>
</node>
<node name="rosbuzz_node" pkg="rosbuzz" type="rosbuzz_node" respawn="false" output="screen">
<rosparam file="$(find rosbuzz)/launch/launch_config/m100.yaml"/>
<param name="bzzfile_name" value="$(find rosbuzz)/script/testflockfev.bzz" />
<param name="rcclient" value="true" />
<param name="rcservice_name" value="buzzcmd" />
<param name="in_payload" value="inMavlink"/>
<param name="out_payload" value="outMavlink"/>
<param name="xbee_plugged" value="true"/>
<param name="name" value="m1001"/>
<param name="xbee_status_srv" value="xbee_status"/>
<param name="stand_by" value="$(find rosbuzz)/script/stand_by.bzz"/>
</node>
</launch>

View File

@ -1,7 +1,7 @@
# We need this for 2D vectors
# 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
# This should be here for the updater to work, changing position of code will crash the updater

BIN
script/testflockfev.bdb Normal file

Binary file not shown.

BIN
script/testflockfev.bo Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
# We need this for 2D vectors
# 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
# This should be here for the updater to work, changing position of code will crash the updater
@ -145,7 +145,6 @@ function land() {
# Executed once at init time.
function init() {
s = swarm.create(1)
# s.select(1)
s.join()
statef=idle
CURSTATE = "IDLE"

Binary file not shown.

Binary file not shown.

View File

@ -23,8 +23,8 @@ function step() {
log("The vstig has ", v.size(), " elements")
log(v.get("u"))
if (id==1) {
#tmp = { .x=3 }
#v.put("p",tmp)
tmp = { }
v.put("p",tmp)
v.put("u",2)
}
log(v.get("p"))