Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dynamixel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
drivers
dynamixel
Commits
e024ac80
Commit
e024ac80
authored
6 years ago
by
Sergi Hernandez
Browse files
Options
Downloads
Patches
Plain Diff
Changed the name of the bus info structures for the FTDI and serial interfaces.
Changed the HEADER definition of the serial interface.
parent
1041e71d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/dynamixel_slave_serial.cpp
+0
-1
0 additions, 1 deletion
src/dynamixel_slave_serial.cpp
src/dynamixelserver_ftdi.h
+2
-2
2 additions, 2 deletions
src/dynamixelserver_ftdi.h
src/dynamixelserver_serial.h
+4
-4
4 additions, 4 deletions
src/dynamixelserver_serial.h
with
6 additions
and
7 deletions
src/dynamixel_slave_serial.cpp
+
0
−
1
View file @
e024ac80
...
...
@@ -22,7 +22,6 @@ CDynamixelSlaveSerial::CDynamixelSlaveSerial(const std::string& cont_id,const st
serial_config
.
stop_bits
=
1
;
this
->
comm_dev
->
config
(
&
serial_config
);
this
->
bus_info
.
baud_rate
=
921600
;
((
CRS232
*
)
this
->
comm_dev
)
->
clear_control_signal
(
rs232_dtr
);
this
->
start
();
}
...
...
This diff is collapsed.
Click to expand it.
src/dynamixelserver_ftdi.h
+
2
−
2
View file @
e024ac80
...
...
@@ -14,7 +14,7 @@ typedef struct
int
baud_rate
;
int
bus_id
;
std
::
string
serial
;
}
TBus_info
;
}
TBus_info
_ftdi
;
/**
* \brief
...
...
@@ -32,7 +32,7 @@ class CDynamixelServerFTDI : public CDynamixelServer
* \brief
*
*/
TBus_info
bus_info
;
TBus_info
_ftdi
bus_info
;
protected:
/**
* \brief
...
...
This diff is collapsed.
Click to expand it.
src/dynamixelserver_serial.h
+
4
−
4
View file @
e024ac80
#ifndef _DYNAMIXEL_SERVER_
FTDI
_H
#define _DYNAMIXEL_SERVER_
FTDI
_H
#ifndef _DYNAMIXEL_SERVER_
SERIAL
_H
#define _DYNAMIXEL_SERVER_
SERIAL
_H
#include
"dynamixelserver.h"
...
...
@@ -13,7 +13,7 @@ typedef struct
{
int
baud_rate
;
std
::
string
device
;
}
TBus_info
;
}
TBus_info
_serial
;
/**
* \brief
...
...
@@ -31,7 +31,7 @@ class CDynamixelServerSerial : public CDynamixelServer
* \brief
*
*/
TBus_info
bus_info
;
TBus_info
_serial
bus_info
;
protected:
/**
* \brief
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment