Skip to content

Commit 00beed2

Browse files
committed
made requested changes for pull request
1 parent 17b45e5 commit 00beed2

File tree

83 files changed

+6201
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+6201
-486
lines changed
Binary file not shown.

Software/real_time/ROS_RoboBuggy/src/robobuggy/include/transistor/gps/GPS_Broadcaster.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
#include "ros/ros.h"
99
#include "robobuggy/GPS.h"
1010
#include "serial/serial.h"
11-
11+
#include <geographic_msgs/GeoPoint.h>
12+
#include <geodesy/utm.h>
1213
#include <sstream>
1314

1415
class GPS_Broadcaster
1516
{
1617
public:
1718
GPS_Broadcaster();
1819
static const std::string NODE_NAME;
19-
20+
2021
int read_gps_message();
2122
robobuggy::GPS* parse_tokens(std::string tokens[]);
2223

@@ -25,6 +26,7 @@ class GPS_Broadcaster
2526

2627
ros::Publisher gps_pub;
2728
robobuggy::GPS gps_message;
29+
serial::Serial gps_serial;
2830

2931
std::string serial_port;
3032
int serial_baud;

Software/real_time/ROS_RoboBuggy/src/robobuggy/scripts/Doc_Flowchart_Source/controllerSimFlowchart.graphml

Lines changed: 0 additions & 470 deletions
This file was deleted.

Software/real_time/ROS_RoboBuggy/src/robobuggy/src/transistor/gps/GPS_Broadcaster.cpp

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11

2-
3-
//include ros library
4-
#include <transistor/gps/GPS_Broadcaster.h>
5-
#include <geographic_msgs/GeoPoint.h>
6-
#include <geodesy/utm.h>
2+
#include <transistor/gps/GPS_Broadcaster.h>
73

84
const std::string GPS_Broadcaster::NODE_NAME = "Transistor_GPS_Broadcaster";
95
GPS_Broadcaster::GPS_Broadcaster()
@@ -22,14 +18,6 @@ GPS_Broadcaster::GPS_Broadcaster()
2218
serial_baud = 9600;
2319
}
2420

25-
}
26-
27-
28-
int GPS_Broadcaster::read_gps_message()
29-
{
30-
31-
//parse ONE NMEA string
32-
3321
//set up serial port
3422
serial::Serial gps_serial;
3523
try
@@ -44,9 +32,17 @@ int GPS_Broadcaster::read_gps_message()
4432
{
4533
ROS_ERROR_STREAM("Unable to open port");
4634
ROS_ERROR_STREAM(serial_port);
47-
return -1;
35+
exit(1);
4836
}
4937

38+
}
39+
40+
41+
int GPS_Broadcaster::read_gps_message()
42+
{
43+
44+
//parse ONE NMEA string
45+
5046
if (gps_serial.available())
5147
{
5248
gps_serial_buffer += gps_serial.read(gps_serial.available());
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Alice</name>
4+
<comment/>
5+
<projects/>
6+
<natures>
7+
<nature>org.eclipse.jdt.core.javanature</nature>
8+
</natures>
9+
<buildSpec>
10+
<buildCommand>
11+
<name>org.eclipse.jdt.core.javabuilder</name>
12+
<arguments/>
13+
</buildCommand>
14+
</buildSpec>
15+
<linkedResources/>
16+
</projectDescription>

0 commit comments

Comments
 (0)