Project

General

Profile

Revision 71d57001

ID71d57001d2c8cea226dcb1504d579f8b337b83eb
Parent aa5e4ddc
Child 0b6591e2, 9b3564f3

Added by Thomas Mullins about 12 years ago

Added WirelessSender class to libscout

WirelessSender will hold some metadata like packet destination, pan, and
channel, and will publish a WirelessPacket (also, added
messsages/WirelessPacket.msg) to /wireless/send
So far, lacks proper documentation and static functions similarly named
to previous wireless library.

View differences:

scout/libscout/CMakeLists.txt
29 29
#rosbuild_add_executable(example examples/example.cpp)
30 30
#target_link_libraries(example ${PROJECT_NAME})
31 31

  
32
rosbuild_add_executable(libscout src/Behavior.cpp src/behaviors/draw_cw_circle.cpp src/behaviors/draw_ccw_circle.cpp src/BehaviorList.cpp src/BehaviorProcess.cpp src/MotorControl.cpp src/SonarControl.cpp src/HeadlightControl.cpp src/ButtonControl.cpp src/CliffsensorControl.cpp)
32
rosbuild_add_executable(libscout src/Behavior.cpp src/behaviors/draw_cw_circle.cpp src/behaviors/draw_ccw_circle.cpp src/BehaviorList.cpp src/BehaviorProcess.cpp src/MotorControl.cpp src/SonarControl.cpp src/HeadlightControl.cpp src/ButtonControl.cpp src/CliffsensorControl.cpp src/WirelessSender.cpp)
33 33
rosbuild_add_executable(test_encoders src/test_encoders.cpp)
scout/libscout/manifest.xml
9 9
  <review status="unreviewed" notes=""/>
10 10
  <url>http://ros.org/wiki/libscout</url>
11 11
  <depend package="std_msgs"/>
12
  <depend package="messages"/>
12 13
  <depend package="roscpp"/>
13 14
  <depend package="motors"/>
14 15
  <depend package="encoders"/>
scout/libscout/src/WirelessSender.cpp
1
/**
2
 * Copyright (c) 2012 Colony Project
3
 * 
4
 * Permission is hereby granted, free of charge, to any person
5
 * obtaining a copy of this software and associated documentation
6
 * files (the "Software"), to deal in the Software without
7
 * restriction, including without limitation the rights to use,
8
 * copy, modify, merge, publish, distribute, sublicense, and/or sell
9
 * copies of the Software, and to permit persons to whom the
10
 * Software is furnished to do so, subject to the following
11
 * conditions:
12
 * 
13
 * The above copyright notice and this permission notice shall be
14
 * included in all copies or substantial portions of the Software.
15
 * 
16
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
18
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
20
 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21
 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23
 * OTHER DEALINGS IN THE SOFTWARE.
24
 */
25

  
26

  
27
/**
28
 * @file WirelessSender.cpp
29
 * @brief Contains wireless declarations and functions
30
 * 
31
 * Contains functions and definitions for the use of
32
 * XBee wireless
33
 *
34
 * @author Colony Project, CMU Robotics Club
35
 * @author Tom Mullins
36
 **/
37

  
38
#include "WirelessSender.h"
39

  
40
using namespace std;
41
using namespace ::messages;
42

  
43
WirelessSender::WirelessSender(uint16_t type, uint16_t dest, uint16_t pan,
44
    uint16_t channel)
45
{
46
    packet.type = type;
47
    packet.dest = dest;
48
    packet.pan = pan;
49
    packet.channel = channel;
50
    pub = nh.advertise< ::messages::WirelessPacket>("/wireless/send",
51
        QUEUE_SIZE);
52
}
53

  
54
void WirelessSender::setType(uint16_t type)
55
{
56
    packet.type = type;
57
}
58
void WirelessSender::setDest(uint16_t dest)
59
{
60
    packet.dest = dest;
61
}
62
void WirelessSender::setPan(uint16_t pan)
63
{
64
    packet.pan = pan;
65
}
66
void WirelessSender::setChannel(uint16_t channel)
67
{
68
    packet.channel = channel;
69
}
70

  
71
void WirelessSender::send(uint8_t data[], int length)
72
{
73
    packet.data.clear();
74
    for (int i = 0; i < length; i++)
75
    {
76
        packet.data.push_back(data[i]);
77
    }
78
    publish();
79
}
80

  
81
void WirelessSender::send(vector<uint8_t>& data)
82
{
83
    packet.data = data;
84
    publish();
85
}
86

  
87
void WirelessSender::publish()
88
{
89
    pub.publish(packet);
90
}
scout/libscout/src/WirelessSender.h
1
/**
2
 * Copyright (c) 2012 Colony Project
3
 * 
4
 * Permission is hereby granted, free of charge, to any person
5
 * obtaining a copy of this software and associated documentation
6
 * files (the "Software"), to deal in the Software without
7
 * restriction, including without limitation the rights to use,
8
 * copy, modify, merge, publish, distribute, sublicense, and/or sell
9
 * copies of the Software, and to permit persons to whom the
10
 * Software is furnished to do so, subject to the following
11
 * conditions:
12
 * 
13
 * The above copyright notice and this permission notice shall be
14
 * included in all copies or substantial portions of the Software.
15
 * 
16
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
18
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
20
 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21
 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23
 * OTHER DEALINGS IN THE SOFTWARE.
24
 */
25

  
26

  
27
/**
28
 * @file WirelessSender.h
29
 * @brief Contains wireless declarations and functions
30
 * 
31
 * Contains functions and definitions for the use of
32
 * XBee wireless
33
 *
34
 * @author Colony Project, CMU Robotics Club
35
 * @author Tom Mullins
36
 **/
37

  
38
#ifndef _WIRELESS_SENDER_H_
39
#define _WIRELESS_SENDER_H_
40

  
41
#include <vector>
42
#include <ros/ros.h>
43
#include "messages/WirelessPacket.h"
44
#include "constants.h"
45

  
46
class WirelessSender
47
{
48
    public:
49
        WirelessSender(uint16_t type = 0,
50
                uint16_t dest = messages::WirelessPacket::DEST_BROADCAST,
51
                uint16_t pan = messages::WirelessPacket::PAN_DEFAULT,
52
                uint16_t channel = messages::WirelessPacket::CHANNEL_DEFAULT);
53
        
54
        void setType(uint16_t type);
55
        void setDest(uint16_t dest);
56
        void setPan(uint16_t pan);
57
        void setChannel(uint16_t channel);
58
        
59
        void send(uint8_t data[], int length);
60
        void send(std::vector<uint8_t>& data);
61
        
62
    private:
63
        ros::NodeHandle nh;
64
        ros::Publisher pub;
65
        messages::WirelessPacket packet;
66
        
67
        void publish();
68
};
69

  
70
#endif
scout/messages/CMakeLists.txt
17 17
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
18 18

  
19 19
#uncomment if you have defined messages
20
#rosbuild_genmsg()
20
rosbuild_genmsg()
21 21
#uncomment if you have defined services
22 22
rosbuild_gensrv()
23 23

  
scout/messages/msg/WirelessPacket.msg
1
uint16 type 
2
uint16 channel
3
uint16 pan
4
uint16 dest
5

  
6
uint8[] data
7

  
8
uint16 CHANNEL_DEFAULT = 0
9
uint16 PAN_DEFAULT = 65535
10
uint16 DEST_BROADCAST = 65535

Also available in: Unified diff