Spiri
/
XbeeMav
Archived
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed debug prints

This commit is contained in:
vivek-shankar 2017-02-21 19:57:34 -05:00
parent 9177700c26
commit 0c0f417406
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -57,8 +57,8 @@ include_directories(
add_executable(xbee_mav src/Xbee.cpp src/XBeeFrame.cpp src/SerialDevice.cpp src/CommunicationManager.cpp src/PacketsHandler) add_executable(xbee_mav src/Xbee.cpp src/XBeeFrame.cpp src/SerialDevice.cpp src/CommunicationManager.cpp src/PacketsHandler)
target_link_libraries(xbee_mav ${catkin_LIBRARIES}) target_link_libraries(xbee_mav ${catkin_LIBRARIES})
#add_executable(config src/main.cpp src/XBeeModule.cpp src/XMLConfigParser.cpp) add_executable(config src/main.cpp src/XBeeModule.cpp src/XMLConfigParser.cpp)
#target_link_libraries(config ${catkin_LIBRARIES}) target_link_libraries(config ${catkin_LIBRARIES})
#add_executable(test_controller src/TestController.cpp) #add_executable(test_controller src/TestController.cpp)
#target_link_libraries(test_controller ${catkin_LIBRARIES}) #target_link_libraries(test_controller ${catkin_LIBRARIES})

8
Resources/XBee_Config.xml
View File

@ -5,10 +5,10 @@
<Parameter Command="CM" Description="Channel Mask">00FFFFFFFFFFFF7FFF</Parameter> <Parameter Command="CM" Description="Channel Mask">00FFFFFFFFFFFF7FFF</Parameter>
<Parameter Command="HP" Description="Preamble ID">1</Parameter> <Parameter Command="HP" Description="Preamble ID">1</Parameter>
<Parameter Command="ID" Description="Network ID">5FFF</Parameter> <Parameter Command="ID" Description="Network ID">5FFF</Parameter>
<Parameter Command="MT" Description="Broadcast Multi-Transmits">3</Parameter> <Parameter Command="MT" Description="Broadcast Multi-Transmits">1</Parameter>
<Parameter Command="PL" Description="TX Power Level">4</Parameter> <Parameter Command="PL" Description="TX Power Level">4</Parameter>
<Parameter Command="RR" Description="Unicast Retries">A</Parameter> <Parameter Command="RR" Description="Unicast Retries">A</Parameter>
<Parameter Command="CE" Description="Routing/Messaging Mode">0</Parameter> <Parameter Command="CE" Description="Routing/Messaging Mode">2</Parameter>
<Parameter Command="BH" Description="Broadcast Hops">0</Parameter> <Parameter Command="BH" Description="Broadcast Hops">0</Parameter>
<Parameter Command="NH" Description="Network Hops">7</Parameter> <Parameter Command="NH" Description="Network Hops">7</Parameter>
<Parameter Command="MR" Description="Mesh Unicast Retries">1</Parameter> <Parameter Command="MR" Description="Mesh Unicast Retries">1</Parameter>
@ -22,11 +22,7 @@
<Parameter Command="CI" Description="Cluster ID">11</Parameter> <Parameter Command="CI" Description="Cluster ID">11</Parameter>
<Parameter Command="EE" Description="Encryption Enbale">0</Parameter> <Parameter Command="EE" Description="Encryption Enbale">0</Parameter>
<Parameter Command="KY" Description="Encryption Key"></Parameter> <Parameter Command="KY" Description="Encryption Key"></Parameter>
<<<<<<< HEAD
<Parameter Command="BD" Description="Baud Rate">7</Parameter>
=======
<Parameter Command="BD" Description="Baud Rate">8</Parameter> <Parameter Command="BD" Description="Baud Rate">8</Parameter>
>>>>>>> a16cf8b196cb6b63ef52ea26b8cb9a8e861d84d1
<Parameter Command="NB" Description="Parity">0</Parameter> <Parameter Command="NB" Description="Parity">0</Parameter>
<Parameter Command="SB" Description="Stop Bits">0</Parameter> <Parameter Command="SB" Description="Stop Bits">0</Parameter>
<Parameter Command="RO" Description="Packetization Timeout">3</Parameter> <Parameter Command="RO" Description="Packetization Timeout">3</Parameter>

7
Resources/database.xml
View File

@ -2,8 +2,8 @@
<Addresses> <Addresses>
<Device Address= "1" >0013A20040D8CA1E</Device> <Device Address= "1" >0013A20040D8CA1E</Device>
<Device Address= "2" >0013A200415A9DDF</Device> <Device Address= "2" >0013A200415278B8</Device>
<Device Address= "3" >0013A200415A9DDE</Device> <Device Address= "3" >0013A2004103B363</Device>
<Device Address= "4" >0013A200415278AD</Device> <Device Address= "4" >0013A200415278AD</Device>
<Device Address= "5" >0013A2004103B356</Device> <Device Address= "5" >0013A2004103B356</Device>
<Device Address= "6" >0013A200415278B7</Device> <Device Address= "6" >0013A200415278B7</Device>
@ -11,4 +11,7 @@
<Device Address= "8" >0013A2004098A7BA</Device> <Device Address= "8" >0013A2004098A7BA</Device>
<Device Address= "9" >0013A200415A9DDD</Device> <Device Address= "9" >0013A200415A9DDD</Device>
<Device Address= "10" >0013A200415A9DE4</Device> <Device Address= "10" >0013A200415A9DE4</Device>
<Device Address= "11" >0013A200415A9DDF</Device>
<Device Address= "12" >0013A200415A9DDE</Device>
</Addresses> </Addresses>

2
src/CommunicationManager.cpp
View File

@ -430,7 +430,7 @@ inline void CommunicationManager::Check_In_Messages_and_Transfer_To_Server() //
inline void CommunicationManager::Send_Mavlink_Message_Callback( inline void CommunicationManager::Send_Mavlink_Message_Callback(
const mavros_msgs::Mavlink::ConstPtr& mavlink_msg) const mavros_msgs::Mavlink::ConstPtr& mavlink_msg)
{ {
std::cout << "Received Message From Buzz" << std::endl; // TO DO delete //std::cout << "Received Message From Buzz" << std::endl; // TO DO delete
packets_handler_.Handle_Mavlink_Message(mavlink_msg); packets_handler_.Handle_Mavlink_Message(mavlink_msg);
} }

3
src/XMLConfigParser.cpp
View File

@ -7,6 +7,7 @@
#include "XMLConfigParser.h" #include "XMLConfigParser.h"
//***************************************************************************** //*****************************************************************************
XMLConfigParser::XMLConfigParser(): XMLConfigParser::XMLConfigParser():
config_loaded_successfully_(false) config_loaded_successfully_(false)
@ -23,7 +24,7 @@ XMLConfigParser::~XMLConfigParser()
//***************************************************************************** //*****************************************************************************
bool XMLConfigParser::Load_Config() bool XMLConfigParser::Load_Config()
{ {
const std::string FILE_NAME = "/home/mistlab/catkin_ws/src/xbee_ros_node/Resources/XBee_Config.xml"; const std::string FILE_NAME = "/home/vivek/catkin_ws/src/xbee_ros_node/Resources/XBee_Config.xml";
if (Check_Config_File_Exists(FILE_NAME)) if (Check_Config_File_Exists(FILE_NAME))
{ {