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
2125d72d
Commit
2125d72d
authored
17 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Updated docs.
parent
2281c47c
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
NEWS
+2
-0
2 additions, 0 deletions
NEWS
TODO
+1
-0
1 addition, 0 deletions
TODO
include/ecrt.h
+22
-11
22 additions, 11 deletions
include/ecrt.h
with
25 additions
and
11 deletions
NEWS
+
2
−
0
View file @
2125d72d
...
...
@@ -44,6 +44,8 @@ Changes in version 1.4.0:
- Removed ecrt_domain_register_pdo_range(), because it's functionality can
be reached by specifying an explicit Pdo mapping and registering those
Pdo entries.
- Added an Sdo access interface, working with Sdo requests. These can be
scheduled for reading and writing during realtime operation.
* Pdo configuration is now supported.
* Current Pdo mapping/configuration is now read via CoE during bus scan, using
direct Sdo access, independent of the dictionary.
...
...
This diff is collapsed.
Click to expand it.
TODO
+
1
−
0
View file @
2125d72d
...
...
@@ -8,6 +8,7 @@ $Id$
Version 1.4.0:
* Slave config allow flag and completion object.
* Mailbox handler
* READMEs for examples.
* Remove get_cycles() calls and references to cpu_khz to increase
...
...
This diff is collapsed.
Click to expand it.
include/ecrt.h
+
22
−
11
View file @
2125d72d
...
...
@@ -33,9 +33,9 @@
/** \file
*
* EtherCAT Real
-T
ime Interface.
* EtherCAT Real
t
ime Interface.
*
* \defgroup RealtimeInterface EtherCAT Real
-T
ime Interface
* \defgroup RealtimeInterface EtherCAT Real
t
ime Interface
*
* EtherCAT interface for realtime modules. This interface is designed for
* realtime modules that want to use EtherCAT. There are functions to request
...
...
@@ -81,6 +81,8 @@
* - Removed ecrt_domain_register_pdo_range(), because it's functionality can
* be reached by specifying an explicit Pdo mapping and registering those
* Pdo entries.
* - Added an Sdo access interface, working with Sdo requests. These can be
* scheduled for reading and writing during realtime operation.
*
* @{
*/
...
...
@@ -102,19 +104,19 @@
* Global definitions
*****************************************************************************/
/** EtherCAT real
-
time interface major version number.
/** EtherCAT realtime interface major version number.
*/
#define ECRT_VER_MAJOR 1
/** EtherCAT real
-
time interface minor version number.
/** EtherCAT realtime interface minor version number.
*/
#define ECRT_VER_MINOR 4
/** EtherCAT real
-
time interface version word generator.
/** EtherCAT realtime interface version word generator.
*/
#define ECRT_VERSION(a, b) (((a) << 8) + (b))
/** EtherCAT real
-
time interface version word.
/** EtherCAT realtime interface version word.
*/
#define ECRT_VERSION_MAGIC ECRT_VERSION(ECRT_VER_MAJOR, ECRT_VER_MINOR)
...
...
@@ -635,6 +637,8 @@ void ecrt_domain_state(
*
* If the request cannot be processed in the specified time, if will be marked
* as failed.
*
* \todo The timeout functionality is not yet implemented.
*/
void
ecrt_sdo_request_timeout
(
ec_sdo_request_t
*
req
,
/**< Sdo request. */
...
...
@@ -643,8 +647,9 @@ void ecrt_sdo_request_timeout(
/** Access to the Sdo request's data.
*
* \attention The return value is invalid during a read operation, because the
* internal Sdo data memory could be re-allocated.
* \attention The return value can be invalid during a read operation, because
* the internal Sdo data memory could be re-allocated if the read Sdo data do
* not fit inside.
*
* \return Pointer to the internal Sdo data memory.
*/
...
...
@@ -661,16 +666,22 @@ ec_sdo_request_state_t ecrt_sdo_request_state(
);
/** Schedule an Sdo write operation.
*
* \attention This method may not be called while ecrt_sdo_request_state()
* returns EC_SDO_REQUEST_BUSY.
*/
void
ecrt_sdo_request_write
(
ec_sdo_request_t
*
req
/**< Sdo request. */
);
/** Schedule an Sdo read operation
.
/** Schedule an Sdo read operation.
*
* \attention After calling this function, the return value of
* ecrt_sdo_request_data() will be invalid while ecrt_sdo_request_state()
* \attention This method may not be called while ecrt_sdo_request_state()
* returns EC_SDO_REQUEST_BUSY.
*
* \attention After calling this function, the return value of
* ecrt_sdo_request_data() must be considered as invalid while
* ecrt_sdo_request_state() returns EC_SDO_REQUEST_BUSY.
*/
void
ecrt_sdo_request_read
(
ec_sdo_request_t
*
req
/**< Sdo 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