Skip to content

Commit 5b2bb10

Browse files
danhennagedanhennage
committed
moved msgs to am-msgs
1 parent e00775a commit 5b2bb10

6 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎include/am_utils/am_onlinestatistics.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class OnlineStatistics {
1717
void addData( double val );
1818
void setSize( size_t N );
1919
void insertion_sort(std::vector<double>& ary);
20-
void setDelayStats( am_utils::DelayStats &msg );
20+
void setDelayStats( brain_box_msgs::DelayStats &msg );
2121
inline double getMean() const {return mean_;}
2222
inline double getVariance() const {return var_;}
2323
inline double getMin() const {return ary_.front();}

‎include/am_utils/am_statistics.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Statistics
2727

2828
void setVector(geometry_msgs::Vector3Stamped& vec);
2929
void setVector(geometry_msgs::Vector3Stamped& vec, ros::Time t);
30-
void setLatency(am_utils::Latency& latency);
30+
void setLatency(brain_box_msgs::Latency& latency);
3131

3232
void addData(double data_point);
3333

‎include/am_utils/latency_wrapper.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414

1515
#include <ros/ros.h>
1616

17-
#include <am_utils/Latency.h>
18-
#include <am_utils/LatencyHeader.h>
19-
#include <am_utils/Latency_Image.h>
20-
#include <am_utils/Latency_PointCloud.h>
21-
#include <am_utils/Latency_LaserScan.h>
22-
#include <am_utils/Latency_PointCloud2.h>
23-
#include <am_utils/Latency_PoseStamped.h>
24-
#include <am_utils/Latency_PoseWithCovarianceStamped.h>
25-
#include <am_utils/Latency_TwistStamped.h>
26-
#include <am_utils/Latency_TwistWithCovarianceStamped.h>
27-
#include <am_utils/Latency_Odometry.h>
17+
#include <brain_box_msgs/Latency.h>
18+
#include <brain_box_msgs/LatencyHeader.h>
19+
#include <brain_box_msgs/Latency_Image.h>
20+
#include <brain_box_msgs/Latency_PointCloud.h>
21+
#include <brain_box_msgs/Latency_LaserScan.h>
22+
#include <brain_box_msgs/Latency_PointCloud2.h>
23+
#include <brain_box_msgs/Latency_PoseStamped.h>
24+
#include <brain_box_msgs/Latency_PoseWithCovarianceStamped.h>
25+
#include <brain_box_msgs/Latency_TwistStamped.h>
26+
#include <brain_box_msgs/Latency_TwistWithCovarianceStamped.h>
27+
#include <brain_box_msgs/Latency_Odometry.h>
2828

2929
#include <am_utils/am_statistics.h>
3030

@@ -66,47 +66,47 @@ class LatencyWrapper
6666
// ===== PoseStamped
6767
void subscribe(std::string topic, PoseStamped_Func callback);
6868
PoseStamped_Func pose_stamped_cb_ {NULL};
69-
void poseStamped_CB(const am_utils::Latency_PoseStamped::ConstPtr& msg);
69+
void poseStamped_CB(const brain_box_msgs::Latency_PoseStamped::ConstPtr& msg);
7070

7171
// ===== PoseWithCovarianceStamped
7272
void subscribe(std::string topic, PoseWithCovarianceStamped_Func callback);
7373
PoseWithCovarianceStamped_Func pose_with_covariance_stamped_cb_ {NULL};
74-
void poseWithCovarianceStamped_CB(const am_utils::Latency_PoseWithCovarianceStamped::ConstPtr& msg);
74+
void poseWithCovarianceStamped_CB(const brain_box_msgs::Latency_PoseWithCovarianceStamped::ConstPtr& msg);
7575

7676
// ===== TwistStamped
7777
void subscribe(std::string topic, TwistStamped_Func callback);
7878
TwistStamped_Func twist_stamped_cb_ {NULL};
79-
void twistStamped_CB(const am_utils::Latency_TwistStamped::ConstPtr& msg);
79+
void twistStamped_CB(const brain_box_msgs::Latency_TwistStamped::ConstPtr& msg);
8080

8181
// ===== TwistWithCovarianceStamped
8282
void subscribe(std::string topic, TwistWithCovarianceStamped_Func callback);
8383
TwistWithCovarianceStamped_Func twist_with_covariance_stamped_cb_ {NULL};
84-
void twistWithCovarianceStamped_CB(const am_utils::Latency_TwistWithCovarianceStamped::ConstPtr& msg);
84+
void twistWithCovarianceStamped_CB(const brain_box_msgs::Latency_TwistWithCovarianceStamped::ConstPtr& msg);
8585

8686
// ===== Odometry
8787
void subscribe(std::string topic, Odometry_Func callback);
8888
Odometry_Func odometry_cb_ {NULL};
89-
void odometry_CB(const am_utils::Latency_Odometry::ConstPtr& msg);
89+
void odometry_CB(const brain_box_msgs::Latency_Odometry::ConstPtr& msg);
9090

9191
// ===== Image
9292
void subscribe(std::string topic, Image_Func callback);
9393
Image_Func image_cb_ {NULL};
94-
void image_CB(const am_utils::Latency_Image::ConstPtr& msg);
94+
void image_CB(const brain_box_msgs::Latency_Image::ConstPtr& msg);
9595

9696
// ===== LaserScan
9797
void subscribe(std::string topic, LaserScan_Func callback);
9898
LaserScan_Func laser_scan_cb_ {NULL};
99-
void laserScan_CB(const am_utils::Latency_LaserScan::ConstPtr& msg);
99+
void laserScan_CB(const brain_box_msgs::Latency_LaserScan::ConstPtr& msg);
100100

101101
// ===== PointCloud
102102
void subscribe(std::string topic, PointCloud_Func callback);
103103
PointCloud_Func point_cloud_cb_ {NULL};
104-
void pointCloud_CB(const am_utils::Latency_PointCloud::ConstPtr& msg);
104+
void pointCloud_CB(const brain_box_msgs::Latency_PointCloud::ConstPtr& msg);
105105

106106
// ===== PointCloud2
107107
void subscribe(std::string topic, PointCloud2_Func callback);
108108
PointCloud2_Func point_cloud2_cb_ {NULL};
109-
void pointCloud2_CB(const am_utils::Latency_PointCloud2::ConstPtr& msg);
109+
void pointCloud2_CB(const brain_box_msgs::Latency_PointCloud2::ConstPtr& msg);
110110

111111

112112
// General templates
@@ -154,7 +154,7 @@ class LatencyWrapper
154154
void printStats(std::string prefix);
155155
void printCurrentStats(std::string prefix);
156156

157-
am_utils::LatencyHeader& getHeader() {
157+
brain_box_msgs::LatencyHeader& getHeader() {
158158
return header_;
159159
}
160160

@@ -171,7 +171,7 @@ class LatencyWrapper
171171
last_message_stamp_init_ = true;
172172
}
173173

174-
void copyStats(const am_utils::LatencyHeader& header, const ros::Time& stamp);
174+
void copyStats(const brain_box_msgs::LatencyHeader& header, const ros::Time& stamp);
175175

176176
private:
177177
unsigned char node_id_;
@@ -191,14 +191,14 @@ class LatencyWrapper
191191
double max_epoch_time_ {1.0};
192192

193193
// This stores the most recently received set of stats and is updated each time a new message is received.
194-
am_utils::LatencyHeader header_;
194+
brain_box_msgs::LatencyHeader header_;
195195
ros::Time last_msg_stamp_;
196196
bool last_message_stamp_init_ {false};
197197
void getLastMessageStamp(ros::Time& t) {
198198
t = last_message_stamp_init_ ? last_msg_stamp_ : ros::Time::now();
199199
}
200200

201-
void updateRecvStats(const am_utils::LatencyHeader& header, const ros::Time& stamp);
201+
void updateRecvStats(const brain_box_msgs::LatencyHeader& header, const ros::Time& stamp);
202202
void updateSendStats(const ros::Time& stamp);
203203
void updateStats(am::Statistics& stats, ros::Time& last_epoch_stamp, const ros::Time& stamp);
204204

‎src/am_onlinestatistics.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <math.h> /* pow */
55
#include <vector>
66
#include <list>
7-
#include "am_utils/am_onlinestatistics.h"
7+
#include <am_utils/am_onlinestatistics.h>
88

99
namespace am {
1010

@@ -64,7 +64,7 @@ void OnlineStatistics::setSize( size_t N )
6464
ary_.clear();
6565
}
6666

67-
void OnlineStatistics::setDelayStats( am_utils::DelayStats &msg )
67+
void OnlineStatistics::setDelayStats( brain_box_msgs::DelayStats &msg )
6868
{
6969
msg.count = cb_.size();
7070
msg.mean_delay = getMean();

‎src/am_statistics.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ std::ostream& Statistics::operator <<(std::ostream& os) {
6060
return os;
6161
}
6262

63-
void Statistics::setLatency(am_utils::Latency& latency) {
63+
void Statistics::setLatency(brain_box_msgs::Latency& latency) {
6464
latency.cur_delay = current;
6565
latency.avg_delay = average;
6666
latency.max_delay = maximum;

‎src/latency_wrapper.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ LatencyWrapper::~LatencyWrapper() {
1818
// TODO Auto-generated destructor stub
1919
}
2020

21-
void LatencyWrapper::copyStats(const am_utils::LatencyHeader& header,
21+
void LatencyWrapper::copyStats(const brain_box_msgs::LatencyHeader& header,
2222
const ros::Time& stamp) {
2323
// first copy string of existing stats
2424
header_ = header;
2525
// send_stats_updated_ = false;
2626
setLastMessageStamp(stamp);
2727
}
2828

29-
void LatencyWrapper::updateRecvStats(const am_utils::LatencyHeader& header,
29+
void LatencyWrapper::updateRecvStats(const brain_box_msgs::LatencyHeader& header,
3030
const ros::Time& stamp) {
3131
// first copy string of existing stats
3232
header_ = header;
@@ -37,7 +37,7 @@ void LatencyWrapper::updateRecvStats(const am_utils::LatencyHeader& header,
3737
updateStats(receive_stats_, last_recv_epoch_, stamp);
3838

3939
// Add them to the received header
40-
am_utils::Latency lt;
40+
brain_box_msgs::Latency lt;
4141
receive_stats_.setLatency(lt);
4242
lt.send = false;
4343
lt.node_id = node_id_;
@@ -47,7 +47,7 @@ void LatencyWrapper::updateRecvStats(const am_utils::LatencyHeader& header,
4747
void LatencyWrapper::printStats(std::string prefix) {
4848
printf("%s\n", prefix.c_str());
4949
int i = 0;
50-
for (std::vector<am_utils::Latency>::iterator it = header_.latency.begin();
50+
for (std::vector<brain_box_msgs::Latency>::iterator it = header_.latency.begin();
5151
it != header_.latency.end(); it++)
5252
{
5353
printf(" %d: node_id[%u] send[%s] current[%0.4f] min[%0.4f] max[%0.4f] avg[%0.4f]\n", i++,
@@ -96,7 +96,7 @@ void LatencyWrapper::updateSendStats(const ros::Time& stamp) {
9696
else
9797
{
9898
// Add a new one to the header_
99-
am_utils::Latency lt;
99+
brain_box_msgs::Latency lt;
100100
send_stats_.setLatency(lt);
101101
lt.send = true;
102102
lt.node_id = node_id_;
@@ -110,11 +110,11 @@ void LatencyWrapper::subscribe(std::string topic, PoseStamped_Func callback) {
110110
sub_topic_ = topic + "_latency";
111111
ROS_INFO("LATENCY: SUBSCRIBING TO topic[%s]", sub_topic_.c_str());
112112
pose_stamped_cb_ = callback;
113-
sub_ = nh_->subscribe<am_utils::Latency_PoseStamped>(
113+
sub_ = nh_->subscribe<brain_box_msgs::Latency_PoseStamped>(
114114
sub_topic_, 10, &LatencyWrapper::poseStamped_CB, this);
115115
}
116116
void LatencyWrapper::poseStamped_CB(
117-
const am_utils::Latency_PoseStamped::ConstPtr& msg) {
117+
const brain_box_msgs::Latency_PoseStamped::ConstPtr& msg) {
118118
// update the stats
119119
updateRecvStats(msg->header, msg->msg.header.stamp);
120120

@@ -127,11 +127,11 @@ void LatencyWrapper::subscribe(std::string topic, PoseWithCovarianceStamped_Func
127127
sub_topic_ = topic + "_latency";
128128
// ROS_INFO("LATENCY: SUBSCRIBING TO topic[%s]", sub_topic_.c_str());
129129
pose_with_covariance_stamped_cb_ = callback;
130-
sub_ = nh_->subscribe<am_utils::Latency_PoseWithCovarianceStamped>(
130+
sub_ = nh_->subscribe<brain_box_msgs::Latency_PoseWithCovarianceStamped>(
131131
sub_topic_, 10, &LatencyWrapper::poseWithCovarianceStamped_CB, this);
132132
}
133133
void LatencyWrapper::poseWithCovarianceStamped_CB(
134-
const am_utils::Latency_PoseWithCovarianceStamped::ConstPtr& msg) {
134+
const brain_box_msgs::Latency_PoseWithCovarianceStamped::ConstPtr& msg) {
135135
// update the stats
136136
updateRecvStats(msg->header, msg->msg.header.stamp);
137137

@@ -143,11 +143,11 @@ void LatencyWrapper::poseWithCovarianceStamped_CB(
143143
void LatencyWrapper::subscribe(std::string topic, TwistStamped_Func callback) {
144144
sub_topic_ = topic + "_latency";
145145
twist_stamped_cb_ = callback;
146-
sub_ = nh_->subscribe<am_utils::Latency_TwistStamped>(
146+
sub_ = nh_->subscribe<brain_box_msgs::Latency_TwistStamped>(
147147
sub_topic_, 10, &LatencyWrapper::twistStamped_CB, this);
148148
}
149149
void LatencyWrapper::twistStamped_CB(
150-
const am_utils::Latency_TwistStamped::ConstPtr& msg) {
150+
const brain_box_msgs::Latency_TwistStamped::ConstPtr& msg) {
151151
// update the stats
152152
updateRecvStats(msg->header, msg->msg.header.stamp);
153153

@@ -159,11 +159,11 @@ void LatencyWrapper::twistStamped_CB(
159159
void LatencyWrapper::subscribe(std::string topic, TwistWithCovarianceStamped_Func callback) {
160160
sub_topic_ = topic + "_latency";
161161
twist_with_covariance_stamped_cb_ = callback;
162-
sub_ = nh_->subscribe<am_utils::Latency_TwistWithCovarianceStamped>(
162+
sub_ = nh_->subscribe<brain_box_msgs::Latency_TwistWithCovarianceStamped>(
163163
sub_topic_, 10, &LatencyWrapper::twistWithCovarianceStamped_CB, this);
164164
}
165165
void LatencyWrapper::twistWithCovarianceStamped_CB(
166-
const am_utils::Latency_TwistWithCovarianceStamped::ConstPtr& msg) {
166+
const brain_box_msgs::Latency_TwistWithCovarianceStamped::ConstPtr& msg) {
167167
// update the stats
168168
updateRecvStats(msg->header, msg->msg.header.stamp);
169169

@@ -175,11 +175,11 @@ void LatencyWrapper::twistWithCovarianceStamped_CB(
175175
void LatencyWrapper::subscribe(std::string topic, Odometry_Func callback) {
176176
sub_topic_ = topic + "_latency";
177177
odometry_cb_ = callback;
178-
sub_ = nh_->subscribe<am_utils::Latency_Odometry>(
178+
sub_ = nh_->subscribe<brain_box_msgs::Latency_Odometry>(
179179
sub_topic_, 10, &LatencyWrapper::odometry_CB, this);
180180
}
181181
void LatencyWrapper::odometry_CB(
182-
const am_utils::Latency_Odometry::ConstPtr& msg) {
182+
const brain_box_msgs::Latency_Odometry::ConstPtr& msg) {
183183
// update the stats
184184
updateRecvStats(msg->header, msg->msg.header.stamp);
185185

@@ -191,11 +191,11 @@ void LatencyWrapper::odometry_CB(
191191
void LatencyWrapper::subscribe(std::string topic, Image_Func callback) {
192192
sub_topic_ = topic + "_latency";
193193
image_cb_ = callback;
194-
sub_ = nh_->subscribe<am_utils::Latency_Image>(
194+
sub_ = nh_->subscribe<brain_box_msgs::Latency_Image>(
195195
sub_topic_, 10, &LatencyWrapper::image_CB, this);
196196
}
197197
void LatencyWrapper::image_CB(
198-
const am_utils::Latency_Image::ConstPtr& msg) {
198+
const brain_box_msgs::Latency_Image::ConstPtr& msg) {
199199
// update the stats
200200
updateRecvStats(msg->header, msg->msg.header.stamp);
201201

@@ -207,11 +207,11 @@ void LatencyWrapper::image_CB(
207207
void LatencyWrapper::subscribe(std::string topic, LaserScan_Func callback) {
208208
sub_topic_ = topic + "_latency";
209209
laser_scan_cb_ = callback;
210-
sub_ = nh_->subscribe<am_utils::Latency_LaserScan>(
210+
sub_ = nh_->subscribe<brain_box_msgs::Latency_LaserScan>(
211211
sub_topic_, 10, &LatencyWrapper::laserScan_CB, this);
212212
}
213213
void LatencyWrapper::laserScan_CB(
214-
const am_utils::Latency_LaserScan::ConstPtr& msg) {
214+
const brain_box_msgs::Latency_LaserScan::ConstPtr& msg) {
215215
// update the stats
216216
updateRecvStats(msg->header, msg->msg.header.stamp);
217217

@@ -223,11 +223,11 @@ void LatencyWrapper::laserScan_CB(
223223
void LatencyWrapper::subscribe(std::string topic, PointCloud_Func callback) {
224224
sub_topic_ = topic + "_latency";
225225
point_cloud_cb_ = callback;
226-
sub_ = nh_->subscribe<am_utils::Latency_PointCloud>(
226+
sub_ = nh_->subscribe<brain_box_msgs::Latency_PointCloud>(
227227
sub_topic_, 10, &LatencyWrapper::pointCloud_CB, this);
228228
}
229229
void LatencyWrapper::pointCloud_CB(
230-
const am_utils::Latency_PointCloud::ConstPtr& msg) {
230+
const brain_box_msgs::Latency_PointCloud::ConstPtr& msg) {
231231
// update the stats
232232
updateRecvStats(msg->header, msg->msg.header.stamp);
233233

@@ -239,11 +239,11 @@ void LatencyWrapper::pointCloud_CB(
239239
void LatencyWrapper::subscribe(std::string topic, PointCloud2_Func callback) {
240240
sub_topic_ = topic + "_latency";
241241
point_cloud2_cb_ = callback;
242-
sub_ = nh_->subscribe<am_utils::Latency_PointCloud2>(
242+
sub_ = nh_->subscribe<brain_box_msgs::Latency_PointCloud2>(
243243
sub_topic_, 10, &LatencyWrapper::pointCloud2_CB, this);
244244
}
245245
void LatencyWrapper::pointCloud2_CB(
246-
const am_utils::Latency_PointCloud2::ConstPtr& msg) {
246+
const brain_box_msgs::Latency_PointCloud2::ConstPtr& msg) {
247247
// update the stats
248248
updateRecvStats(msg->header, msg->msg.header.stamp);
249249

0 commit comments

Comments
 (0)