Commit Graph

330 Commits

Author SHA1 Message Date
David St-Onge c83f50d0d4 test lj 2017-04-02 22:18:16 -04:00
David St-Onge 99a405984e test lj 2017-04-02 21:51:39 -04:00
vivek-shankar 4dbcecf2da Robots variable fix 2017-04-02 21:43:36 -04:00
David St-Onge 60d220b248 tests lj 2017-04-02 19:19:46 -04:00
David St-Onge a8ee6ca9d9 test lj 2017-04-02 19:08:02 -04:00
David St-Onge 40588be698 lj tests 2017-04-02 18:59:44 -04:00
David St-Onge 4a8d628c32 lj test 2017-04-02 18:54:11 -04:00
vivek-shankar ef4f4e23e6 correction robots var 2017-04-02 15:42:46 -04:00
vivek-shankar fcc26231a1 robots variable correction 2017-04-02 15:31:13 -04:00
vivek-shankar 4c1c3dff43 addition of robots variable inside BVM and for updates barrier 2017-04-02 15:06:36 -04:00
David St-Onge 29b234cd9d extend xbeestatus 2017-04-02 14:19:45 -04:00
vivek-shankar 05f51194cc changes to new robot id service 2017-04-01 02:48:37 -04:00
vivek-shankar 86d4b47584 id from xbee fix 2017-04-01 00:18:30 -04:00
vivek-shankar 39cfdee6de local enum for internal command passing and proxy table to fit argos 2017-03-31 23:46:44 -04:00
isvogor dfa7519bd5 stream rate wait 2017-03-31 15:13:25 -04:00
isvogor a9335d973a set stream rate fix 2017-03-29 17:32:56 -04:00
isvogor e0ac252f9d set stream rate 2017-03-29 14:57:31 -04:00
David St-Onge 583b20c113 LJ test 2017-03-27 17:41:06 -04:00
David St-Onge da3b35a9c3 LJ test 2017-03-27 17:30:34 -04:00
David St-Onge f0d2be3969 LJ test 2017-03-27 17:12:56 -04:00
David St-Onge cff0a226a5 simplify ned transform 2017-03-27 16:53:56 -04:00
David St-Onge 6533af3c7e LJ test 2017-03-27 16:38:53 -04:00
David St-Onge 7e1bb56910 LJ test 2017-03-27 16:36:00 -04:00
David St-Onge 5b99a9ae2b lj test 2017-03-27 16:29:35 -04:00
David St-Onge 68ef2451fb fix merge 2017-03-15 17:36:19 -04:00
David St-Onge 7c4c41dbb6 fix mask 2017-03-15 17:00:59 -04:00
David St-Onge f4c4478e38 Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev
Conflicts:
	src/roscontroller.cpp
	src/testflockfev.bzz

	modified:   include/buzzuav_closures.h
	modified:   include/roscontroller.h
	modified:   launch/rosbuzz_2_parallel.launch
	modified:   src/buzz_utility.cpp
	modified:   src/buzzuav_closures.cpp
	modified:   src/rosbuzz.cpp
	modified:   src/roscontroller.cpp
	modified:   src/testflockfev.bzz
2017-03-15 16:57:56 -04:00
David St-Onge abdef63da6 timeout in bzz 2017-03-15 16:53:32 -04:00
isvogor 91a398c02b merged with dev, tested, adapted for solo 2017-03-15 11:54:42 -04:00
isvogor 0cd59a91f0 Merge branch 'dev'
Conflicts:
	include/roscontroller.h
	src/buzz_utility.cpp
	src/roscontroller.cpp
2017-03-15 09:42:51 -04:00
isvogor 002baf636d PositionTarget.msg testing 2017-03-14 11:09:01 -04:00
vivek-shankar 141f05807d slight refactoring and comments addition 2017-03-13 23:08:18 -04:00
David St-Onge e1def9d976 local setpoint 2017-03-13 18:11:01 -04:00
David St-Onge 4c37be5b26 fix takeoff bug 2017-03-02 01:32:45 -05:00
isvogor 8be25947d9 added solo specifics 2017-03-01 15:48:16 -05:00
isvogor decbf170c1 Merge branch 'master'
Conflicts:
	src/roscontroller.cpp
2017-03-01 14:20:15 -05:00
David St-Onge 8d8928d914 clean and comment 2017-02-27 18:39:23 -05:00
isvogor 100d0c0599 merge with master 2017-02-24 14:58:30 -05:00
vivek-shankar 6593215a57 bzz har code include correction 2017-02-23 23:10:01 -05:00
vivek-shankar f166d4e5b4 arm and disarm simplification 2017-02-23 23:09:04 -05:00
isvogor f5899ecac0 fixes 2017-02-23 22:34:19 -05:00
isvogor 133f6dbd02 fixes 2017-02-23 22:13:44 -05:00
vivek-shankar 2fc36ebf09 addition of arm/disarm for neighbours 2017-02-23 21:14:42 -05:00
isvogor 5f4aaeb1e0 Ready for final test :feelsgood: -- SOLO 2017-02-23 21:10:49 -05:00
isvogor 12ca11b275 rebase 2017-02-23 19:39:59 -05:00
David St-Onge 87b2861503 arm debug 2017-02-23 16:44:57 -05:00
David St-Onge 9461d4a55c arm/disarm 2017-02-23 11:49:10 -05:00
isvogor 4ac9d89f7c Merge branch 'solo-unstable' of https://github.com/MISTLab/ROSBuzz into solo-unstable 2017-02-23 10:58:53 -05:00
isvogor 94b2f4f4ac ... 2017-02-23 10:57:23 -05:00
isvogor 76027ffc09 🔧 2017-02-23 10:57:23 -05:00