Skip to content

Commit 5540389

Browse files
committed
Revert "made requested changes for pull request"
reverting to get rid of unnecessary files from java_src This reverts commit 00beed2.
1 parent 0d707f1 commit 5540389

File tree

81 files changed

+16
-6194
lines changed

Some content is hidden

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

81 files changed

+16
-6194
lines changed

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

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

1514
class GPS_Broadcaster
1615
{
1716
public:
1817
GPS_Broadcaster();
1918
static const std::string NODE_NAME;
20-
19+
2120
int read_gps_message();
2221
robobuggy::GPS* parse_tokens(std::string tokens[]);
2322
void initialize_hardware();
@@ -27,7 +26,7 @@ class GPS_Broadcaster
2726

2827
ros::Publisher gps_pub;
2928
robobuggy::GPS gps_message;
30-
serial::Serial gps_serial;
29+
3130
std::string serial_port;
3231
int serial_baud;
3332
std::string gps_serial_buffer;

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

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

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

48
const std::string GPS_Broadcaster::NODE_NAME = "Transistor_GPS_Broadcaster";
59
GPS_Broadcaster::GPS_Broadcaster()
@@ -20,8 +24,14 @@ GPS_Broadcaster::GPS_Broadcaster()
2024

2125
}
2226

23-
void GPS_Broadcaster::initialize_hardware()
27+
int GPS_Broadcaster::read_gps_message()
2428
{
29+
30+
//parse ONE NMEA string
31+
32+
//set up serial port
33+
serial::Serial gps_serial;
34+
2535
try
2636
{
2737
gps_serial.setPort(serial_port);
@@ -34,7 +44,7 @@ void GPS_Broadcaster::initialize_hardware()
3444
{
3545
ROS_ERROR_STREAM("Unable to open port");
3646
ROS_ERROR_STREAM(serial_port);
37-
exit(1);
47+
return -1;
3848
}
3949

4050
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

real_time/surface_src/java_src/Alice/.project

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

real_time/surface_src/java_src/Alice/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 13 deletions
This file was deleted.
-272 KB
Binary file not shown.

0 commit comments

Comments
 (0)