Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
etherlabmaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
ICS Control System Infrastructure
etherlabmaster
Commits
3d9502bc
Commit
3d9502bc
authored
16 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Renamed sdo_download command to download. Same with upload.
parent
a7f22408
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
tool/Makefile.am
+2
-2
2 additions, 2 deletions
tool/Makefile.am
tool/cmd_download.cpp
+2
-2
2 additions, 2 deletions
tool/cmd_download.cpp
tool/cmd_upload.cpp
+2
-2
2 additions, 2 deletions
tool/cmd_upload.cpp
tool/main.cpp
+5
-7
5 additions, 7 deletions
tool/main.cpp
with
11 additions
and
13 deletions
tool/Makefile.am
+
2
−
2
View file @
3d9502bc
...
@@ -45,8 +45,8 @@ ethercat_SOURCES = \
...
@@ -45,8 +45,8 @@ ethercat_SOURCES = \
cmd_master.cpp
\
cmd_master.cpp
\
cmd_pdos.cpp
\
cmd_pdos.cpp
\
cmd_sdos.cpp
\
cmd_sdos.cpp
\
cmd_
sdo_
download.cpp
\
cmd_download.cpp
\
cmd_
sdo_
upload.cpp
\
cmd_upload.cpp
\
cmd_slaves.cpp
\
cmd_slaves.cpp
\
cmd_sii_read.cpp
\
cmd_sii_read.cpp
\
cmd_sii_write.cpp
\
cmd_sii_write.cpp
\
...
...
This diff is collapsed.
Click to expand it.
tool/cmd_
sdo_
download.cpp
→
tool/cmd_download.cpp
+
2
−
2
View file @
3d9502bc
...
@@ -14,7 +14,7 @@ using namespace std;
...
@@ -14,7 +14,7 @@ using namespace std;
/****************************************************************************/
/****************************************************************************/
// FIXME
// FIXME
const
char
*
help_
sdo_
download
=
const
char
*
help_download
=
"[OPTIONS]
\n
"
"[OPTIONS]
\n
"
"
\n
"
"
\n
"
"
\n
"
"
\n
"
...
@@ -22,7 +22,7 @@ const char *help_sdo_download =
...
@@ -22,7 +22,7 @@ const char *help_sdo_download =
/****************************************************************************/
/****************************************************************************/
void
command_
sdo_
download
(
void
)
void
command_download
(
void
)
{
{
stringstream
strIndex
,
strSubIndex
,
strValue
,
err
;
stringstream
strIndex
,
strSubIndex
,
strValue
,
err
;
ec_ioctl_slave_sdo_download_t
data
;
ec_ioctl_slave_sdo_download_t
data
;
...
...
This diff is collapsed.
Click to expand it.
tool/cmd_
sdo_
upload.cpp
→
tool/cmd_upload.cpp
+
2
−
2
View file @
3d9502bc
...
@@ -14,7 +14,7 @@ using namespace std;
...
@@ -14,7 +14,7 @@ using namespace std;
/****************************************************************************/
/****************************************************************************/
// FIXME
// FIXME
const
char
*
help_
sdo_
upload
=
const
char
*
help_upload
=
"[OPTIONS]
\n
"
"[OPTIONS]
\n
"
"
\n
"
"
\n
"
"
\n
"
"
\n
"
...
@@ -22,7 +22,7 @@ const char *help_sdo_upload =
...
@@ -22,7 +22,7 @@ const char *help_sdo_upload =
/****************************************************************************/
/****************************************************************************/
void
command_
sdo_
upload
(
void
)
void
command_upload
(
void
)
{
{
stringstream
strIndex
,
strSubIndex
;
stringstream
strIndex
,
strSubIndex
;
int
sval
;
int
sval
;
...
...
This diff is collapsed.
Click to expand it.
tool/main.cpp
+
5
−
7
View file @
3d9502bc
...
@@ -61,8 +61,8 @@ DEFINE_EXTERN_COMMAND(domains);
...
@@ -61,8 +61,8 @@ DEFINE_EXTERN_COMMAND(domains);
DEFINE_EXTERN_COMMAND
(
master
);
DEFINE_EXTERN_COMMAND
(
master
);
DEFINE_EXTERN_COMMAND
(
pdos
);
DEFINE_EXTERN_COMMAND
(
pdos
);
DEFINE_EXTERN_COMMAND
(
sdos
);
DEFINE_EXTERN_COMMAND
(
sdos
);
DEFINE_EXTERN_COMMAND
(
sdo_
download
);
DEFINE_EXTERN_COMMAND
(
download
);
DEFINE_EXTERN_COMMAND
(
sdo_
upload
);
DEFINE_EXTERN_COMMAND
(
upload
);
DEFINE_EXTERN_COMMAND
(
slaves
);
DEFINE_EXTERN_COMMAND
(
slaves
);
DEFINE_EXTERN_COMMAND
(
sii_read
);
DEFINE_EXTERN_COMMAND
(
sii_read
);
DEFINE_EXTERN_COMMAND
(
sii_write
);
DEFINE_EXTERN_COMMAND
(
sii_write
);
...
@@ -78,8 +78,8 @@ static const Command commands[] = {
...
@@ -78,8 +78,8 @@ static const Command commands[] = {
INIT_COMMAND
(
master
,
"Show master information."
),
INIT_COMMAND
(
master
,
"Show master information."
),
INIT_COMMAND
(
pdos
,
"List Pdo assignment/mapping."
),
INIT_COMMAND
(
pdos
,
"List Pdo assignment/mapping."
),
INIT_COMMAND
(
sdos
,
"List Sdo dictionaries."
),
INIT_COMMAND
(
sdos
,
"List Sdo dictionaries."
),
INIT_COMMAND
(
sdo_
download
,
"Write an Sdo entry."
),
INIT_COMMAND
(
download
,
"Write an Sdo entry."
),
INIT_COMMAND
(
sdo_
upload
,
"Read an Sdo entry."
),
INIT_COMMAND
(
upload
,
"Read an Sdo entry."
),
INIT_COMMAND
(
slaves
,
"Show slaves."
),
INIT_COMMAND
(
slaves
,
"Show slaves."
),
INIT_COMMAND
(
sii_read
,
"Output a slave's SII contents."
),
INIT_COMMAND
(
sii_read
,
"Output a slave's SII contents."
),
INIT_COMMAND
(
sii_write
,
"Write slave's SII contents."
),
INIT_COMMAND
(
sii_write
,
"Write slave's SII contents."
),
...
@@ -113,7 +113,7 @@ void printUsage()
...
@@ -113,7 +113,7 @@ void printUsage()
}
}
cerr
cerr
<<
"Commands can be
generously
abbreviated."
<<
endl
<<
"Commands can be abbreviated."
<<
endl
<<
"Global options:"
<<
endl
<<
"Global options:"
<<
endl
<<
" --master -m <master> Index of the master to use. Default: 0"
<<
" --master -m <master> Index of the master to use. Default: 0"
<<
endl
<<
endl
...
@@ -121,8 +121,6 @@ void printUsage()
...
@@ -121,8 +121,6 @@ void printUsage()
<<
endl
<<
endl
<<
" or 'all' for all slaves (default)."
<<
" or 'all' for all slaves (default)."
<<
endl
<<
endl
<<
" or 'all' for all domains (default)."
<<
endl
<<
" --type -t <type> Forced Sdo data type."
<<
endl
<<
" --type -t <type> Forced Sdo data type."
<<
endl
<<
" --force -f Force action."
<<
endl
<<
" --force -f Force action."
<<
endl
<<
" --quiet -q Output less information."
<<
endl
<<
" --quiet -q Output less information."
<<
endl
...
...
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