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
f6f80a77
Commit
f6f80a77
authored
18 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Re-added slave.configured flag as slave.self_configured.
parent
fb429b62
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
master/fsm.c
+13
-4
13 additions, 4 deletions
master/fsm.c
master/slave.c
+1
-0
1 addition, 0 deletions
master/slave.c
master/slave.h
+1
-0
1 addition, 0 deletions
master/slave.h
with
15 additions
and
4 deletions
master/fsm.c
+
13
−
4
View file @
f6f80a77
...
@@ -325,13 +325,20 @@ void ec_fsm_master_action_process_states(ec_fsm_t *fsm
...
@@ -325,13 +325,20 @@ void ec_fsm_master_action_process_states(ec_fsm_t *fsm
if
(
slave
->
error_flag
if
(
slave
->
error_flag
||
!
slave
->
online
||
!
slave
->
online
||
slave
->
requested_state
==
EC_SLAVE_STATE_UNKNOWN
||
slave
->
requested_state
==
EC_SLAVE_STATE_UNKNOWN
||
slave
->
current_state
==
slave
->
requested_state
)
continue
;
||
(
slave
->
current_state
==
slave
->
requested_state
&&
slave
->
self_configured
))
continue
;
if
(
master
->
debug_level
)
{
if
(
master
->
debug_level
)
{
ec_state_string
(
slave
->
current_state
,
old_state
);
ec_state_string
(
slave
->
current_state
,
old_state
);
ec_state_string
(
slave
->
requested_state
,
new_state
);
if
(
slave
->
current_state
!=
slave
->
requested_state
)
{
EC_DBG
(
"Changing state of slave %i (%s -> %s).
\n
"
,
ec_state_string
(
slave
->
requested_state
,
new_state
);
slave
->
ring_position
,
old_state
,
new_state
);
EC_DBG
(
"Changing state of slave %i (%s -> %s).
\n
"
,
slave
->
ring_position
,
old_state
,
new_state
);
}
else
if
(
!
slave
->
self_configured
)
{
EC_DBG
(
"Reconfiguring slave %i (%s).
\n
"
,
slave
->
ring_position
,
old_state
);
}
}
}
fsm
->
master_state
=
ec_fsm_master_configure_slave
;
fsm
->
master_state
=
ec_fsm_master_configure_slave
;
...
@@ -1308,6 +1315,8 @@ void ec_fsm_slaveconf_state_init(ec_fsm_t *fsm /**< finite state machine */)
...
@@ -1308,6 +1315,8 @@ void ec_fsm_slaveconf_state_init(ec_fsm_t *fsm /**< finite state machine */)
return
;
return
;
}
}
slave
->
self_configured
=
1
;
if
(
master
->
debug_level
)
{
if
(
master
->
debug_level
)
{
EC_DBG
(
"Slave %i is now in INIT.
\n
"
,
slave
->
ring_position
);
EC_DBG
(
"Slave %i is now in INIT.
\n
"
,
slave
->
ring_position
);
}
}
...
...
This diff is collapsed.
Click to expand it.
master/slave.c
+
1
−
0
View file @
f6f80a77
...
@@ -112,6 +112,7 @@ int ec_slave_init(ec_slave_t *slave, /**< EtherCAT slave */
...
@@ -112,6 +112,7 @@ int ec_slave_init(ec_slave_t *slave, /**< EtherCAT slave */
slave
->
requested_state
=
EC_SLAVE_STATE_UNKNOWN
;
slave
->
requested_state
=
EC_SLAVE_STATE_UNKNOWN
;
slave
->
current_state
=
EC_SLAVE_STATE_UNKNOWN
;
slave
->
current_state
=
EC_SLAVE_STATE_UNKNOWN
;
slave
->
self_configured
=
0
;
slave
->
error_flag
=
0
;
slave
->
error_flag
=
0
;
slave
->
online
=
1
;
slave
->
online
=
1
;
slave
->
fmmu_count
=
0
;
slave
->
fmmu_count
=
0
;
...
...
This diff is collapsed.
Click to expand it.
master/slave.h
+
1
−
0
View file @
f6f80a77
...
@@ -197,6 +197,7 @@ struct ec_slave
...
@@ -197,6 +197,7 @@ struct ec_slave
ec_slave_state_t
requested_state
;
/**< requested slave state */
ec_slave_state_t
requested_state
;
/**< requested slave state */
ec_slave_state_t
current_state
;
/**< current slave state */
ec_slave_state_t
current_state
;
/**< current slave state */
unsigned
int
self_configured
;
/**< slave was configured by this master */
unsigned
int
error_flag
;
/**< stop processing after an error */
unsigned
int
error_flag
;
/**< stop processing after an error */
unsigned
int
online
;
/**< non-zero, if the slave responds. */
unsigned
int
online
;
/**< non-zero, if the slave responds. */
...
...
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