Spiri
/
XbeeMav
Archived
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
85 Commits 2 Branches 0 Tags 2.6 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
vivek-shankar a55662ff3e merge conflict fix 2017-02-17 16:41:50 -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
AymenMist 5eb4ef78b4 first commit 2017-01-10 12:14:41 -05:00