Commit Graph

405 Commits

Author SHA1 Message Date
dave 5368728d79 Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev 2017-05-10 07:35:04 -04:00
dave 7ae5e39785 compute user rb 2017-05-10 07:34:57 -04:00
isvogor 6a1c51fbd3 open loop, xbee wait 2017-05-09 21:38:14 -04:00
isvogor cbdc5a6db2 open loop 2017-05-09 19:48:38 -04:00
vivek-shankar b095536db6 in messages with local buff 2017-05-09 19:05:57 -04:00
dave 15b8a911d1 first working implementation of users vstig 2017-05-09 18:25:37 -04:00
isvogor 013bac1c5b merged.. 2017-05-09 15:48:38 -04:00
isvogor c960c96cb5 Merged branch dev into solo-playground 2017-05-09 15:25:58 -04:00
dave 149de3d60b fix bzz include 2017-05-09 13:28:32 -04:00
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 8b971e410b added nonraw topic 2017-04-12 17:51:22 -04: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
David St-Onge 7499d59834 Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev 2017-04-02 22:49:23 -04:00
David St-Onge 4b71014572 test lj 2017-04-02 22:49:04 -04:00
vivek-shankar df6557ff9c Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev 2017-04-02 22:48:09 -04:00
vivek-shankar 2647f9dc9a inertia for no.of robots 2017-04-02 22:46:48 -04:00
David St-Onge 71f72e5e59 test lj 2017-04-02 22:44:47 -04:00
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 4f9a891216 for testing #2 - waypoints included 2017-02-23 10:57:23 -05:00
isvogor 321a1c84a4 first waypoint implementation - sitl works 2017-02-23 10:57:23 -05:00
isvogor 4b0e18b762 minor updates in controller 2017-02-23 10:57:23 -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
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
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
vivek-shankar f2c4977fe4 Barrier change in bzz 2017-02-18 20:03:09 -05:00
David ea95bb1b48 added arm/mode dummies 2017-02-17 22:00:50 -05:00
David St-Onge 77355ab177 Merge branch 'solo-playground' of https://github.com/MISTLab/ROSBuzz into solo-playground 2017-02-17 20:03:48 -05:00
David St-Onge 2b76c3cc6b fix for m100 2017-02-17 20:03:09 -05:00