Commit Graph

730 Commits

Author SHA1 Message Date
dave cf35d9696b fix obstacle detection 2017-06-14 13:18:00 -04:00
David St-Onge cfde657e6f remove robot_upstart 2017-06-13 14:10:28 -04:00
David St-Onge 98e376ff07 update dji_mist and launch files 2017-06-13 13:38:28 -04:00
Administrator 118b3ddde5 remove prints 2017-06-09 16:22:25 -04:00
dave b5a08f2512 fix script name 2017-05-23 23:54:18 -04:00
dave 15a7acf5f6 merge 2017-05-23 23:52:49 -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 86af1027b3 ROS rate to 10 2017-05-17 23:10:10 -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
vivek-shankar 4170697dec update simulation script delete 2017-05-15 20:07:40 -04:00
David St-Onge 99aaee0e71 minor fix to user rb 2017-05-15 16:29:33 -04:00
David St-Onge 1920f86326 field changes to barrier 2017-05-15 15:08:36 -04:00
David St-Onge f4cce4fcd9 fix launch 2017-05-12 11:34:20 -04:00
David St-Onge 62b17c964a fix m100 launch 2017-05-12 11:29:31 -04:00
isvogor 9fb8dccf92 Merged branch solo-playground into dev 2017-05-12 11:27:55 -04:00
isvogor b95deef1cb drifting params increased 2017-05-12 11:26:11 -04:00
isvogor a5c1cf7754 Merged dev into solo-playground 2017-05-12 11:12:24 -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 60553fd55d Merged branch solo-playground into dev 2017-05-12 10:48:24 -04:00
isvogor 1e8f0d054a local pos 2017-05-12 10:46:39 -04:00
isvogor b1f24d91f2 Merged solo-playground into dev 2017-05-12 10:46:00 -04:00
isvogor 9dc997e45c Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	src/roscontroller.cpp
2017-05-12 08:42:05 -04:00
vivek-shankar a99b889b16 correction to sim flockfev 2017-05-11 22:18:50 -04:00
vivek-shankar 1b408b9dc3 Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into HEAD 2017-05-11 22:13:20 -04:00
vivek-shankar 664e7e4dc0 changes to the updater 2017-05-11 22:12:59 -04:00
dave f2925ae56e Merge branch 'dev' of https://github.com/MISTLab/ROSBuzz into dev 2017-05-11 21:17:55 -04:00
dave 61d31e672d change gps mgt 2017-05-11 21:17:50 -04:00
isvogor e384bcf83b merge fix 2017-05-10 22:25:18 -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
David St-Onge b871c2e25a stig in flight bzz 2017-05-10 22:04:04 -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