vivek-shankar
|
aa5c394722
|
launch file conflict correction
|
2017-02-17 16:50:38 -05:00 |
David St-Onge
|
d2b7655f1a
|
Merge branch 'test' of https://github.com/MISTLab/XbeeMav into test
Conflicts:
CMakeLists.txt
Resources/XBee_Config.xml
include/CommunicationManager.h
include/MultithreadingDeque.hpp
include/SerialDevice.h
include/XBeeFrame.h
launch/xbeemav.launch
src/CommunicationManager.cpp
src/SerialDevice.cpp
src/TestBuzz.cpp
src/XBeeFrame.cpp
src/XMLConfigParser.cpp
src/Xbee.cpp
|
2017-02-17 15:11:42 -05:00 |
|
vivek-shankar
|
a16cf8b196
|
First commit of new Xbee with multi packets
|
2017-02-17 14:20:52 -05:00 |
|
vivek-shankar
|
5bbcc4c630
|
lots of changes in communication for packets with reply
|
2017-01-29 03:05:38 -05:00 |
|
vivek-shankar
|
24494cee0a
|
changes in sending and lots of untested stuff
|
2017-01-25 23:33:04 -05:00 |
AymenMist
|
5eb4ef78b4
|
first commit
|
2017-01-10 12:14:41 -05:00 |