Commit Graph

335 Commits

Author SHA1 Message Date
isvogor aa68d7d761 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	script/testflockfev.bzz
	src/roscontroller.cpp
	src/testflockfev.bzz
2017-05-09 13:21:59 -04:00
dave f8917cd39e fix bzz compilation and moved scripts and include 2017-05-09 13:07:11 -04:00
dave 9edceb77b1 merge vstig in update 2017-05-07 16:03:44 -04:00
dave 2566ac5de2 more work on vstig 2017-05-07 16:02:23 -04:00
vivek-shankar 75af18d17e addition of v-stig table into update parts 2017-05-07 15:08:57 -04:00
dave a38ce4f010 merged and fix first vstig 2017-05-07 00:41:20 -04:00
dave 5070268491 vstig tables work 2017-05-06 23:40:50 -04:00
vivek-shankar a921c3819c updates addition and swarm table correction 2017-05-06 23:07:52 -04:00
vivek-shankar 50327cb6b6 Swarm table fix 2017-05-06 18:42:27 -04:00
David St-Onge 817b2951d6 fix test bzz 2017-05-03 15:07:36 -04:00
isvogor 31718bc01e set home only once 2017-04-27 12:36:12 -04:00
isvogor 187e05aca8 Merge branch 'dev'
Conflicts:
	src/roscontroller.cpp
2017-04-25 21:06:53 -04:00
dave 52bed0536f first uesrs stigmergy 2017-04-25 20:27:28 -04:00
dave bb1ec20e37 fix namespace use 2017-04-24 17:55:54 -04:00
dave 61d1cab41b implement vstig users 2017-04-24 14:20:59 -04:00
dave 421d78bacc new fix for localpose 2017-04-21 16:31:05 -04:00
dave 84d64a1979 test bzz script 2017-04-21 13:29:53 -04:00
dave ee8ae38aaf local pose tests 2017-04-21 12:22:39 -04:00
dave 0bc4001542 merge fix 2017-04-20 23:33:56 -04:00
dave a14b753b7e minor fixes 2017-04-20 23:23:36 -04:00
dave 3e1653cdaa modif for sim 2017-04-20 16:07:36 -04:00
isvogor e01e6e6c5e initialization 2017-04-17 11:51:07 -04:00
dave 73c81fb22b swarm table test 2017-04-15 18:17:19 -04:00
dave 2cafc1cbe1 merge solo-playground 2017-04-14 14:55:29 -04:00
dave fcf9b17f0f without xbee 2017-04-14 14:54:29 -04:00
isvogor 3af2a03ffc topic fix 2017-04-13 09:39:45 -04:00
David St-Onge 02e15997d1 swarm test 2017-04-12 19:42:28 -04:00
David St-Onge ea573d888e swarm test 2017-04-12 19:26:56 -04:00
David St-Onge 458099a8a6 added comm failsafe and setpoint non-offset 2017-04-12 19:23:53 -04:00
David St-Onge 78ff07f935 Merge branch 'solo-playground' of https://github.com/MISTLab/ROSBuzz into solo-playground 2017-04-12 17:53:09 -04:00
David St-Onge 8b971e410b added nonraw topic 2017-04-12 17:51:22 -04:00
FranckHumanitas 3ee97bcf20 solo launch file 2017-04-12 21:38:07 +00:00
isvogor 77adf24d30 Merge branch 'solo-playground' of http://github.com/mistlab/rosbuzz into solo-playground 2017-04-12 15:29:42 -04:00
isvogor 6a1f18d656 test: suspecting offset is ignored 2017-04-12 15:29:27 -04:00
vivek-shankar 8df538d056 delete correction to free 2017-04-11 20:43:57 -04:00
vivek-shankar 4c99bb6acc delete corrected to free for malloc 2017-04-11 20:23:21 -04:00
isvogor a926feea8d Merge branch 'solo-playground' of http://github.com/mistlab/rosbuzz into solo-playground 2017-04-11 09:03:41 -04:00
isvogor fbc2d4875d temp with setpoint_local - tested outside: working - TODO: handle local position home 2017-04-10 20:23:04 -04:00
David St-Onge c5df7e00a4 test swarm table 2017-04-10 19:24:05 -04:00
David St-Onge 8f0b4dd79b swarm table test 2017-04-10 19:08:03 -04:00
David St-Onge 1cc44d3d56 swarm test 2017-04-10 14:49:01 -04:00
David St-Onge 6fb86e7dd0 setpoint launch 2017-04-05 18:11:27 -04:00
David St-Onge 7c5340cdd6 timeout change 2017-04-05 17:58:03 -04:00
David St-Onge 0dbccdde44 ensure compatibility with M100 2017-04-05 17:02:35 -04:00
isvogor 9f3a02e8ec changes to NED and REL_ALT 2017-04-03 19:50:09 -04:00
isvogor 96ebb3f470 merge 2017-04-03 15:41:03 -04:00
isvogor f7eb8d8031 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	include/roscontroller.h
	launch/rosbuzz.launch
	src/buzz_utility.cpp
	src/roscontroller.cpp
2017-04-03 08:45:38 -04:00
vivek-shankar 6db4069f0d robot var fix 2017-04-02 23:41:44 -04:00
vivek-shankar 854edc3697 robots var 2017-04-02 23:11:19 -04:00
vivek-shankar 4aa8e36eb3 robots variable fix 2017-04-02 22:55:39 -04:00