services-ros1-xbee_mav/Resources
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
..
Fig1.png First commit of new Xbee with multi packets 2017-02-17 14:20:52 -05:00
Fig2.png First commit of new Xbee with multi packets 2017-02-17 14:20:52 -05:00
XBee_Config.xml Merge branch 'test' of https://github.com/MISTLab/XbeeMav into test 2017-02-17 15:11:42 -05:00
Xbee_Manual.pdf First commit of new Xbee with multi packets 2017-02-17 14:20:52 -05:00
database.xml First commit of new Xbee with multi packets 2017-02-17 14:20:52 -05:00