Commit Graph

453 Commits

Author SHA1 Message Date
dave a745de8f31 more topics fix and merge log 2017-08-30 22:05:57 -04:00
vivek-shankar 397a6ccda9 logger addition 2017-08-30 21:02:37 -04:00
dave 32c10dbc42 fix topic naming and rosbuzz launch 2017-08-30 14:58:44 -04:00
dave 13267a9e97 add gps goal control, re-structured launch dir and add height to buzz moveto closure 2017-08-25 17:05:40 -04:00
dave 5804aace94 integrate PY comments and start waypoints control 2017-08-18 17:13:57 -04:00
dave 94ead5f496 fix MP gps and add status 2017-08-10 20:38:26 -04:00
dave 9a0332aed9 tweak graph control, fix obstacles and and rc_client fleet_status 2017-08-09 19:23:42 -04:00
dave 74846c5df8 merging dji_mav_mist 2017-07-26 10:10:15 -04:00
dave b9c0dfb117 re-fix msgOut (vivek), debug bandwidth-optimised graph and add vstig of uav status 2017-07-24 22:56:26 -04:00
dave d31154602e graph test 2017-07-22 14:14:06 -04:00
pyhs f24fb63723 Fixed code for new buzz (especially commit a854c5cdc6830e4c1ec246b46886d4298ac872f1) 2017-07-11 15:28:24 -04:00
pyhs edc1b31174 Fixed if condition in roscontroller.cpp 2017-07-07 15:00:22 -04:00
pyhs 0f37bc22e0 Combined Xbee status info into a structure for the buzz VM 2017-07-06 14:50:29 -04:00
pyhs 8552cf79c8 Added xbee status update functions 2017-07-05 09:37:35 -04:00
dave eb130be1bb merge rosbuzz 2017-06-26 14:35:15 -04:00
dave d7ca910e21 fixed graph formation 2017-06-26 14:09:33 -04:00
pyhs 8e5acd264d Untabification and Added get functions for Xbee_status 2017-06-23 10:39:14 -04:00
dave 956b282ad3 fixes in ROSBuzz max msg size 2017-06-19 13:21:19 -04:00
dave 0093556096 graph integrated, not working 2017-06-16 19:31:54 -04:00
Administrator 118b3ddde5 remove prints 2017-06-09 16:22:25 -04:00
dave 79282cc2ab Merge branch 'test' of https://github.com/MISTLab/ROSBuzz into dev 2017-05-23 23:32:29 -04:00
dave 0810963359 tuned user tracking 2017-05-23 23:32:25 -04:00
vivek-shankar 95f80f5e9d addition of relative pos for logging 2017-05-18 15:33:43 -04:00
vivek-shankar a1a8090670 local swarm number age for update 2017-05-18 02:15:26 -04:00
vivek-shankar 39626de75e local swarm number for update 2017-05-18 02:07:57 -04:00
vivek-shankar 8218474082 ROBOTS variable adaptation for updates 2017-05-17 23:03:42 -04:00
vivek-shankar 0124083b25 change in update age for ros rate change 2017-05-17 18:01:36 -04:00
vivek-shankar f39cab4617 Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into test 2017-05-17 18:01:00 -04:00
dave 833c2b30c3 Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev 2017-05-17 16:23:59 -04:00
dave f6be6ce034 clean prints 2017-05-17 16:23:51 -04:00
vivek-shankar 2d0824be00 logger correction 2017-05-17 14:39:19 -04:00
vivek-shankar 07d14f9479 Logger debug 2017-05-17 14:12:37 -04:00
vivek-shankar 8c3771a447 update log file correction 2017-05-17 14:02:08 -04:00
vivek-shankar 745cc75c56 logger 2017-05-17 13:54:32 -04:00
vivek-shankar 904bdc199b static no of robots during update 2017-05-17 12:24:27 -04:00
vivek-shankar 6b36c948ce cleanup 2017-05-15 20:10:55 -04:00
David St-Onge 99aaee0e71 minor fix to user rb 2017-05-15 16:29:33 -04:00
David St-Onge 62b17c964a fix m100 launch 2017-05-12 11:29:31 -04:00
isvogor b95deef1cb drifting params increased 2017-05-12 11:26:11 -04:00
isvogor c93605eb81 local pos yaml 2017-05-12 11:11:42 -04:00
isvogor f900057989 localpos topic to yaml 2017-05-12 11:04:42 -04:00
David St-Onge 9ff3e83e2c change topic name to test with M100 2017-05-12 10:54:03 -04:00
isvogor 1e8f0d054a local pos 2017-05-12 10:46:39 -04:00
isvogor 788e9422b4 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	script/testflockfev.bzz
	src/roscontroller.cpp
2017-05-10 22:18:34 -04:00
Ivan Svogor 2b9c62df0e update from solo - xbee fix 2017-05-11 01:57:41 +00:00
dave e5aa343648 merge with field changes 2017-05-10 21:35:47 -04:00
dave a08e121228 full v.stig. users 2017-05-10 21:32:10 -04:00
David St-Onge cab2cc03a1 fixed local setpoint 2017-05-10 18:39:28 -04:00
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