Commit Graph

13 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
vivek-shankar aebaf6d514 crash fix 2017-01-30 22:47:34 -05:00
vivek-shankar 88a6b12b14 test 2017-01-29 18:14:24 -05:00
vivek-shankar 7e1be92538 A first try of memcpy 2017-01-29 09:20:51 -05:00
vivek-shankar 64feacf3cf separation of multi msgs from pub and sub 2017-01-29 05:25:35 -05:00
vivek-shankar 5bbcc4c630 lots of changes in communication for packets with reply 2017-01-29 03:05:38 -05:00
vivek-shankar 48c89fe77c debu prints 2017-01-27 00:18:15 -05:00
vivek-shankar 03a12678ee counter bug fix 2017-01-26 22:45:12 -05:00
vivek-shankar 118f5ebc46 map implementation of multi packet 2017-01-26 21:33:22 -05:00
vivek-shankar 249fbd7f1d xbee split and merge messages 2017-01-25 22:42:32 -05:00
AymenMist 5eb4ef78b4 first commit 2017-01-10 12:14:41 -05:00