Skip to content

Commit cc059db

Browse files
committed
Merge branch 'master' of https://github.com/ros-drivers/advanced_navigation_driver into ros-conventions
Conflicts: src/an_driver.cpp
2 parents f05316f + 772dbf6 commit cc059db

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Advanced Navigation ROS Driver Notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To use this example code, your Advanced Navigation device should be already conf
5353
3. In the Terminal window type: "dmesg | grep tty [enter]" to confirm the name of the com port (should be something like "ttyUSB0").
5454
4. Type: "roscore[enter]" to start ROS Master.
5555
5. Open a new Terminal window and type: "source ~/ros/devel/setup.bash[enter]".
56-
6. Using the name of your specific com port, type: "rosrun advanced_navigation_driver advanced_navigation_driver /dev/ttyUSB0 115200[enter]".
56+
6. If your com port is named "ttyUSB0" and your baud rate is set to 115200 bps, type: "rosrun advanced_navigation_driver advanced_navigation_driver [enter]". If your com port or baud rate are different then type: "rosrun advanced_navigation_driver advanced_navigation_driver /dev/your_com_port_name your_baud_rate [enter]".
5757
7. Open a new Terminal window and type: "rosnode list[enter]" to list the available nodes. You should see these listed:
5858
/an_device_node
5959
/rosout

src/an_driver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,4 @@ int main(int argc, char *argv[]) {
334334
}
335335

336336
}
337+

src/rs232/rs232.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ int OpenComport(char *comport, int baudrate)
101101
break;
102102
}
103103

104-
// Cport = open(comport, O_RDWR | O_NOCTTY | O_NDELAY);
105-
Cport = open(comport, O_RDWR | O_NOCTTY);
104+
Cport = open(comport, O_RDWR | O_NOCTTY | O_NDELAY);
106105
if(Cport==-1)
107106
{
108107
perror("unable to open comport ");
@@ -123,8 +122,7 @@ int OpenComport(char *comport, int baudrate)
123122
new_port_settings.c_oflag = 0;
124123
new_port_settings.c_lflag = 0;
125124
new_port_settings.c_cc[VMIN] = 0; /* block untill n bytes are received */
126-
// new_port_settings.c_cc[VTIME] = 0; /* block untill a timer expires (n * 100 mSec.) */
127-
new_port_settings.c_cc[VTIME] = 1; /* block untill a timer expires (n * 100 mSec.) */
125+
new_port_settings.c_cc[VTIME] = 0; /* block untill a timer expires (n * 100 mSec.) */
128126
error = tcsetattr(Cport, TCSANOW, &new_port_settings);
129127
if(error==-1)
130128
{

0 commit comments

Comments
 (0)