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
65a12a2b
Commit
65a12a2b
authored
19 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
EL31XX-Typ korrigiert.
parent
184e5b60
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
master/domain.c
+6
-6
6 additions, 6 deletions
master/domain.c
master/types.c
+2
-2
2 additions, 2 deletions
master/types.c
with
8 additions
and
8 deletions
master/domain.c
+
6
−
6
View file @
65a12a2b
...
...
@@ -205,7 +205,7 @@ ec_slave_t *EtherCAT_rt_register_slave_field(
ec_master_t
*
master
;
const
ec_sync_t
*
sync
;
const
ec_field_t
*
field
;
unsigned
int
field_idx
,
found
,
i
,
j
;
unsigned
int
field_idx
,
i
,
j
;
uint32_t
field_offset
;
if
(
!
field_count
)
{
...
...
@@ -234,8 +234,7 @@ ec_slave_t *EtherCAT_rt_register_slave_field(
}
field_idx
=
0
;
found
=
0
;
for
(
i
=
0
;
type
->
sync_managers
[
i
]
&&
!
found
;
i
++
)
{
for
(
i
=
0
;
type
->
sync_managers
[
i
];
i
++
)
{
sync
=
type
->
sync_managers
[
i
];
field_offset
=
0
;
for
(
j
=
0
;
sync
->
fields
[
j
];
j
++
)
{
...
...
@@ -252,9 +251,10 @@ ec_slave_t *EtherCAT_rt_register_slave_field(
}
}
printk
(
KERN_ERR
"EtherCAT: Slave %i (
\"
%s %s
\"
) has less than %i fields of"
" type %i, starting at %i!
\n
"
,
slave
->
ring_position
,
vendor_name
,
product_name
,
field_count
,
field_type
,
field_index
);
printk
(
KERN_ERR
"EtherCAT: Slave %i (
\"
%s %s
\"
) has less than %i field(s)"
" of type %i, starting at %i (only %i)!
\n
"
,
slave
->
ring_position
,
vendor_name
,
product_name
,
field_count
,
field_type
,
field_index
,
field_idx
);
return
NULL
;
}
...
...
This diff is collapsed.
Click to expand it.
master/types.c
+
2
−
2
View file @
65a12a2b
...
...
@@ -88,12 +88,12 @@ const ec_sync_t el31X2_sm3 = {
const
ec_slave_type_t
Beckhoff_EL3102
=
{
"Beckhoff"
,
"EL3102"
,
"2x Analog Input diff."
,
{
&
mailbox_sm0
,
&
mailbox_sm1
,
&
el31X2_sm2
,
&
el31X2_sm
2
,
NULL
}
{
&
mailbox_sm0
,
&
mailbox_sm1
,
&
el31X2_sm2
,
&
el31X2_sm
3
,
NULL
}
};
const
ec_slave_type_t
Beckhoff_EL3162
=
{
"Beckhoff"
,
"EL3102"
,
"2x Analog Input"
,
{
&
mailbox_sm0
,
&
mailbox_sm1
,
&
el31X2_sm2
,
&
el31X2_sm
2
,
NULL
}
{
&
mailbox_sm0
,
&
mailbox_sm1
,
&
el31X2_sm2
,
&
el31X2_sm
3
,
NULL
}
};
/*****************************************************************************/
...
...
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