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 |
|
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
|
6884504c8e
|
clean script
|
2017-05-09 14:35:38 -04:00 |
|
dave
|
dbf0b6388c
|
fix launch files
|
2017-05-09 14:33:35 -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 |