Commit Graph

234 Commits

Author SHA1 Message Date
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
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
David St-Onge 8d8928d914 clean and comment 2017-02-27 18:39:23 -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
vivek-shankar 2fc36ebf09 addition of arm/disarm for neighbours 2017-02-23 21:14:42 -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
David def06f4c7e test 2017-02-23 00:59:11 +00:00
David St-Onge fd1b55588e test 2017-02-22 19:47:55 -05:00
David a30f9dbf95 test 2017-02-23 00:37:00 +00:00
David St-Onge ee516c1dc7 test 2017-02-22 18:04:48 -05:00
David St-Onge d8e35e59bd test 2017-02-22 17:34:17 -05:00
David e12bd4e983 test 2017-02-22 22:22:12 +00:00
David St-Onge 271e4e5004 test 2017-02-22 17:14:27 -05:00
David St-Onge 9aee21a4ef test 2017-02-22 17:02:40 -05:00
David St-Onge 2e2193fcf9 fix height 2017-02-22 02:53:17 -05:00
David St-Onge bbde4dc950 test 2017-02-22 02:45:42 -05:00
David 80ccc87b63 tesT 2017-02-22 07:39:04 +00:00
David 00242676c1 test 2017-02-22 07:23:24 +00:00
vivek-shankar aab285928a addition of barrier work around 2017-02-22 01:11:53 -05:00
vivek-shankar 5319f3f384 barrier workaround packet loss 2017-02-22 01:07:15 -05:00
David St-Onge 4886ee186b new test script 2017-02-21 19:34:34 -05:00
David St-Onge 524e317150 test 2017-02-20 17:55:25 -05:00
David St-Onge f4ce19a7bb test 2017-02-20 16:46:35 -05:00
David St-Onge 1f10d531ca Merge branch 'master' of https://github.com/MISTLab/ROSBuzz 2017-02-20 16:12:52 -05:00
vivek-shankar a6f6f374b5 bzz file include correction 2017-02-19 23:39:08 -05:00
vivek-shankar f755507bcd addition of xbee robot id 2017-02-19 23:30:45 -05:00
vivek-shankar 3385058943 update crash fix after new xbee 2017-02-19 22:07:41 -05:00
vivek-shankar 7d24e03af5 test merge Merge branch 'solo-playground' of https://github.com/MISTLab/ROSBuzz 2017-02-19 21:15:58 -05:00
vivek-shankar f603ba6f8c sysid and fixes for update 2017-02-19 21:04:29 -05:00
vivek-shankar a2555e17ef sysid and fixes for update 2017-02-19 21:04:07 -05:00
vivek-shankar 73f7662fc4 addition of sysid and message id 2017-02-19 19:22:47 -05:00
David St-Onge 1491526600 test 2017-02-19 18:54:31 -05:00
David St-Onge fe0670c9d6 test 2017-02-19 18:51:21 -05:00
David St-Onge 2fe5122a98 test 2017-02-19 18:45:42 -05:00
vivek-shankar 25fc91e432 Attempt to Merge branch 'solo-playground' of https://github.com/MISTLab/ROSBuzz 2017-02-19 18:43:49 -05:00
vivek-shankar 2ba7171b38 attempt to merge of solo-playground 2017-02-19 18:42:39 -05:00
David St-Onge 225143a6a1 test 2017-02-19 18:41:45 -05:00
David St-Onge 3695ced541 test 2017-02-19 18:31:20 -05:00
David St-Onge 98ebdf39ea test 2017-02-19 18:15:57 -05:00
David 03c35afc17 test 2017-02-19 23:06:01 +00:00
David St-Onge 34b70eb851 testalone 2017-02-19 17:02:00 -05:00
David St-Onge a0fb91adb3 arm fixes 2017-02-19 16:42:53 -05:00