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
2aea597d
Commit
2aea597d
authored
16 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Renamed subindices to max_subindex.
parent
f8517902
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
master/fsm_coe.c
+2
-2
2 additions, 2 deletions
master/fsm_coe.c
master/sdo.c
+2
-2
2 additions, 2 deletions
master/sdo.c
master/sdo.h
+8
-8
8 additions, 8 deletions
master/sdo.h
with
12 additions
and
12 deletions
master/fsm_coe.c
+
2
−
2
View file @
2aea597d
...
@@ -689,7 +689,7 @@ void ec_fsm_coe_dict_desc_response(ec_fsm_coe_t *fsm
...
@@ -689,7 +689,7 @@ void ec_fsm_coe_dict_desc_response(ec_fsm_coe_t *fsm
return
;
return
;
}
}
sdo
->
subind
ices
=
EC_READ_U8
(
data
+
10
);
sdo
->
max_
subind
ex
=
EC_READ_U8
(
data
+
10
);
sdo
->
object_code
=
EC_READ_U8
(
data
+
11
);
sdo
->
object_code
=
EC_READ_U8
(
data
+
11
);
name_size
=
rec_size
-
12
;
name_size
=
rec_size
-
12
;
...
@@ -938,7 +938,7 @@ void ec_fsm_coe_dict_entry_response(ec_fsm_coe_t *fsm
...
@@ -938,7 +938,7 @@ void ec_fsm_coe_dict_entry_response(ec_fsm_coe_t *fsm
list_add_tail
(
&
entry
->
list
,
&
sdo
->
entries
);
list_add_tail
(
&
entry
->
list
,
&
sdo
->
entries
);
if
(
fsm
->
subindex
<
sdo
->
subind
ices
)
{
if
(
fsm
->
subindex
<
sdo
->
max_
subind
ex
)
{
fsm
->
subindex
++
;
fsm
->
subindex
++
;
if
(
!
(
data
=
ec_slave_mbox_prepare_send
(
slave
,
datagram
,
0x03
,
10
)))
{
if
(
!
(
data
=
ec_slave_mbox_prepare_send
(
slave
,
datagram
,
0x03
,
10
)))
{
...
...
This diff is collapsed.
Click to expand it.
master/sdo.c
+
2
−
2
View file @
2aea597d
...
@@ -89,7 +89,7 @@ int ec_sdo_init(
...
@@ -89,7 +89,7 @@ int ec_sdo_init(
sdo
->
index
=
index
;
sdo
->
index
=
index
;
sdo
->
object_code
=
0x00
;
sdo
->
object_code
=
0x00
;
sdo
->
name
=
NULL
;
sdo
->
name
=
NULL
;
sdo
->
subind
ices
=
0
;
sdo
->
max_
subind
ex
=
0
;
INIT_LIST_HEAD
(
&
sdo
->
entries
);
INIT_LIST_HEAD
(
&
sdo
->
entries
);
// Init kobject and add it to the hierarchy
// Init kobject and add it to the hierarchy
...
@@ -189,7 +189,7 @@ ssize_t ec_sdo_info(
...
@@ -189,7 +189,7 @@ ssize_t ec_sdo_info(
off
+=
sprintf
(
buffer
+
off
,
"Index: 0x%04X
\n
"
,
sdo
->
index
);
off
+=
sprintf
(
buffer
+
off
,
"Index: 0x%04X
\n
"
,
sdo
->
index
);
off
+=
sprintf
(
buffer
+
off
,
"Name: %s
\n
"
,
sdo
->
name
?
sdo
->
name
:
""
);
off
+=
sprintf
(
buffer
+
off
,
"Name: %s
\n
"
,
sdo
->
name
?
sdo
->
name
:
""
);
off
+=
sprintf
(
buffer
+
off
,
"
S
ubind
ices
: %
i
\n
"
,
sdo
->
subind
ices
);
off
+=
sprintf
(
buffer
+
off
,
"
Max s
ubind
ex
: %
u
\n
"
,
sdo
->
max_
subind
ex
);
return
off
;
return
off
;
}
}
...
...
This diff is collapsed.
Click to expand it.
master/sdo.h
+
8
−
8
View file @
2aea597d
...
@@ -52,14 +52,14 @@
...
@@ -52,14 +52,14 @@
/** CANopen Sdo.
/** CANopen Sdo.
*/
*/
struct
ec_sdo
{
struct
ec_sdo
{
struct
kobject
kobj
;
/**< kobject */
struct
kobject
kobj
;
/**< kobject
.
*/
struct
list_head
list
;
/**<
l
ist item */
struct
list_head
list
;
/**<
L
ist item
.
*/
ec_slave_t
*
slave
;
/**<
p
arent slave */
ec_slave_t
*
slave
;
/**<
P
arent slave
.
*/
uint16_t
index
;
/**< Sdo index */
uint16_t
index
;
/**< Sdo index
.
*/
uint8_t
object_code
;
/**<
o
bject code */
uint8_t
object_code
;
/**<
O
bject code
.
*/
char
*
name
;
/**< Sdo name */
char
*
name
;
/**< Sdo name
.
*/
uint8_t
subind
ices
;
/**< subind
ices
*/
uint8_t
max_
subind
ex
;
/**<
Maximum
subind
ex.
*/
struct
list_head
entries
;
/**<
entry list
*/
struct
list_head
entries
;
/**<
List of entries.
*/
};
};
/*****************************************************************************/
/*****************************************************************************/
...
...
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