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 |
|
David St-Onge
|
4b71014572
|
test lj
|
2017-04-02 22:49:04 -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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
isvogor
|
8be25947d9
|
added solo specifics
|
2017-03-01 15:48:16 -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
|
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 |
|
David St-Onge
|
4886ee186b
|
new test script
|
2017-02-21 19:34:34 -05:00 |
|