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
1dd563f1
Commit
1dd563f1
authored
17 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Fixed access to data pointers in Pdo config and Pdo mapping FSM's.
parent
eab47ebc
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/fsm_pdo_config.c
+3
-3
3 additions, 3 deletions
master/fsm_pdo_config.c
master/fsm_pdo_mapping.c
+3
-3
3 additions, 3 deletions
master/fsm_pdo_mapping.c
with
6 additions
and
6 deletions
master/fsm_pdo_config.c
+
3
−
3
View file @
1dd563f1
...
...
@@ -211,7 +211,7 @@ void ec_fsm_pdo_config_next_pdo(
}
// set mapped Pdo count to zero
EC_WRITE_U8
(
&
fsm
->
request
.
data
,
0
);
EC_WRITE_U8
(
fsm
->
request
.
data
,
0
);
fsm
->
request
.
data_size
=
1
;
ec_sdo_request_address
(
&
fsm
->
request
,
fsm
->
pdo
->
index
,
0
);
ecrt_sdo_request_write
(
&
fsm
->
request
);
...
...
@@ -251,7 +251,7 @@ void ec_fsm_pdo_config_add_entry(
value
=
fsm
->
entry
->
index
<<
16
|
fsm
->
entry
->
subindex
<<
8
|
fsm
->
entry
->
bit_length
;
EC_WRITE_U32
(
&
fsm
->
request
.
data
,
value
);
EC_WRITE_U32
(
fsm
->
request
.
data
,
value
);
fsm
->
request
.
data_size
=
4
;
ec_sdo_request_address
(
&
fsm
->
request
,
fsm
->
pdo
->
index
,
fsm
->
entry_count
);
ecrt_sdo_request_write
(
&
fsm
->
request
);
...
...
@@ -317,7 +317,7 @@ void ec_fsm_pdo_config_state_add_entry(
// find next entry
if
(
!
(
fsm
->
entry
=
ec_fsm_pdo_config_next_entry
(
fsm
,
&
fsm
->
entry
->
list
)))
{
// No more entries to add. Write entry count.
EC_WRITE_U8
(
&
fsm
->
request
.
data
,
fsm
->
entry_count
);
EC_WRITE_U8
(
fsm
->
request
.
data
,
fsm
->
entry_count
);
fsm
->
request
.
data_size
=
1
;
ec_sdo_request_address
(
&
fsm
->
request
,
fsm
->
pdo
->
index
,
0
);
ecrt_sdo_request_write
(
&
fsm
->
request
);
...
...
This diff is collapsed.
Click to expand it.
master/fsm_pdo_mapping.c
+
3
−
3
View file @
1dd563f1
...
...
@@ -202,7 +202,7 @@ void ec_fsm_pdo_mapping_next_dir(
}
// set mapped Pdo count to zero
EC_WRITE_U8
(
&
fsm
->
request
.
data
,
0
);
// zero Pdos mapped
EC_WRITE_U8
(
fsm
->
request
.
data
,
0
);
// zero Pdos mapped
fsm
->
request
.
data_size
=
1
;
ec_sdo_request_address
(
&
fsm
->
request
,
0x1C10
+
fsm
->
sync
->
index
,
0
);
ecrt_sdo_request_write
(
&
fsm
->
request
);
...
...
@@ -244,7 +244,7 @@ void ec_fsm_pdo_mapping_add_pdo(
ec_fsm_pdo_mapping_t
*
fsm
/**< mapping state machine */
)
{
EC_WRITE_U16
(
&
fsm
->
request
.
data
,
fsm
->
pdo
->
index
);
EC_WRITE_U16
(
fsm
->
request
.
data
,
fsm
->
pdo
->
index
);
fsm
->
request
.
data_size
=
2
;
ec_sdo_request_address
(
&
fsm
->
request
,
0x1C10
+
fsm
->
sync
->
index
,
fsm
->
pdo_count
);
...
...
@@ -311,7 +311,7 @@ void ec_fsm_pdo_mapping_state_add_pdo(
// find next Pdo
if
(
!
(
fsm
->
pdo
=
ec_fsm_pdo_mapping_next_pdo
(
fsm
,
&
fsm
->
pdo
->
list
)))
{
// no more Pdos to map. write Pdo count
EC_WRITE_U8
(
&
fsm
->
request
.
data
,
fsm
->
pdo_count
);
EC_WRITE_U8
(
fsm
->
request
.
data
,
fsm
->
pdo_count
);
fsm
->
request
.
data_size
=
1
;
ec_sdo_request_address
(
&
fsm
->
request
,
0x1C10
+
fsm
->
sync
->
index
,
0
);
ecrt_sdo_request_write
(
&
fsm
->
request
);
...
...
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