Commit Graph

71 Commits

Author SHA1 Message Date
HolgerNie cf76625f4c Update nicdrv.c (#87)
For the new network cards we need also to set mBlkPktHdr.len.
2017-03-14 14:47:13 +01:00
nakarlsson 712fac0eb9 Merge pull request #77 from alberth/improve_tutorial_and_documentation
Improve tutorial and documentation
2017-02-14 20:53:16 +01:00
Albert Hofkamp 6c37e949e0 Improve tutorial and documentation 2017-02-09 12:19:58 +01:00
Mikael Heden cfd5adfdcd Merge pull request #70 from nakarlsson/master
Add vxworks port
2017-01-11 16:52:19 +01:00
nakarlsson addb1204b4 vxworks
Add VxWorks reference driver, interrupt driven Mux driver.
2017-01-10 11:55:23 +01:00
nakarlsson ea931518a1 Merge pull request #66 from Apollo3zehn/fix_fatal_sync_error
fix issue #60 (slave fails going to OP: fatal sync error)
2016-12-21 11:15:07 +01:00
Apollo3zehn d7a3b608b3 - reset activation register in ecx_set_slaves_to_default 2016-12-19 12:05:55 +01:00
nakarlsson 1b0635ca28 Merge pull request #63 from MagnaboscoL/master
minor improvement  ecx_readstate()
2016-10-29 10:03:09 +02:00
MagnaboscoL c97e92e4ec revert ecx_statecheck() to original 2016-10-25 20:25:10 +02:00
MagnaboscoAndrea 298397bcc3 improve both ecx_statecheck and ecx_readstate
- in ecx_statecheck only one iteration is done through the slave list if needed
- in ecx_readstate only one datagram is used if possible
2016-10-23 13:18:34 +02:00
Luca 3be652a0e0 Bug fix 2016-10-20 15:21:29 +02:00
Luca 47d2845861 tabs removes 2016-10-18 18:00:31 +02:00
Luca 74b76da668 fixed for pr 2016-10-18 17:54:58 +02:00
Luca 28927aab87 minor_improvement/ ecx_statecheck() improved
ecx_statecheck() when called with the first argument set to 0 automatically updates the state of all the slaves in the slavelist structure when possible,
2016-10-18 00:35:54 +02:00
nakarlsson 03601959b6 Make PDO CA access thread safe (#51) 2016-08-18 17:28:02 +02:00
ArthurKetels 43e4493346 Merge pull request #39 from Cloud-Automation/master
Fixed grouping problem.
Intermediate solution
2016-05-26 09:02:21 +02:00
stefan.poeter@cloud-automation.de 9cc335ef33 Refactored stack reset to ecx_clearindex. 2016-05-25 09:27:47 +02:00
stefan.poeter@cloud-automation.de e4d625bf5a Fixed grouping problem. 2016-05-23 11:50:19 +02:00
ArthurKetels 4bb4b59067 Merge pull request #38 from OpenEtherCATsociety/rxbufstat
Rxbufstat
2016-05-18 17:05:45 +02:00
nakarlsson 8a8ec824a3 Removed TAB 2016-05-14 15:17:33 +02:00
nakarlsson 4dd1401698 Add condition that frame must med _TX to be marked as RCVD 2016-05-14 15:16:45 +02:00
ArthurKetels eee55962f2 Merge pull request #34 from AversanJeff/master
Minor D.C. cleanup
2016-04-19 10:36:59 +02:00
Jeffrey Gorchynski 44b7340c2c Minor D.C. cleanup
- When enabling or disabling D.C., SOEM internal ec_slavet attributes
will be updated to reflect the new settings
- Changed CyclShift parameter to a signed integer to conform with the
rest of code
- Corrected some spelling mistakes
2016-03-29 12:03:38 -04:00
Mikael Heden aaab1b38b1 Merge pull request #31 from hefloryd/master
Documentation fixes
2016-02-17 14:40:56 +01:00
Hans-Erik Floryd 07f4cd108d Merge pull request #25 from mheden/master
Minor fixes
2016-02-17 14:28:59 +01:00
Mikael Heden ec1cc7a4ed Fix possible SM overwrite 2016-02-17 11:01:46 +01:00
Mikael Heden 918a6bad97 DC: change to EtherCAT epoch 2016-02-17 10:54:50 +01:00
Mikael Heden 82edc9a033 Fix type mismatches 2016-02-17 10:54:49 +01:00
Mikael Heden 59e2164410 Fix return value of ecx_writestate 2016-02-17 10:54:48 +01:00
Mikael Heden d5fa11630d Lowest state should not contain error flag 2016-02-17 10:54:48 +01:00
Mikael Heden eac0acd809 Fix potential bug when the number of slaves is too large 2016-02-17 10:54:47 +01:00
Hans-Erik Floryd e5784fe66e delete derived resources 2016-02-16 14:16:00 +01:00
Hans-Erik Floryd 58e939575b update doxygen build instructions
refer to README.md
2016-02-16 14:14:59 +01:00
Hans-Erik Floryd 725ddea4cd fix file encodings 2016-02-16 14:01:08 +01:00
Hans-Erik Floryd bec50c277a add extern "C" to all header files 2016-02-16 13:35:19 +01:00
Hans-Erik Floryd 185a0ce5ae add .gitignore 2016-02-16 13:14:48 +01:00
strongly-typed 7cf93a6efb Typos.
allways -> always
recieved -> received
resend -> resent
stuct -> struct
etries -> entries
broaddcast -> broadcast
timouts -> timeouts
optimalisation -> optimisation
mulitple -> multiple
2016-02-16 12:47:07 +01:00
strongly-typed 755e700a2f Use ECT_MBXPROT_COE instead of magic number 0x04. 2016-02-16 12:46:31 +01:00
Hans-Erik Floryd 1729299b3a Merge pull request #30 from AversanJeff/master
fixing ec_ALstatuscodelist enumeration
2016-02-16 09:30:20 +01:00
AversanJeff 8e8f5997d9 fixing ec_ALstatuscodelist enumeration
Fixing 'DC invalid syncX cycle time' enumerations, and adding missing
'MBX_AOE' enumeration to ec_ALstatuscodelist[].
2016-02-15 15:46:14 -05:00
Hans-Erik Floryd 9b5385bb5e Merge pull request #24 from ShabbyX/master
Improve life w.r.t `#include`
2016-02-10 17:07:13 +01:00
Shahbaz Youssefi 469dd9623a Be able to take string literal as ifname
`ifname` as the argument of `ec_init` and related functions is not
changed, and therefore can be safely retyped to `const char *`.  This
allows using string literals. For example:

    ec_init(argc > 1 ? argv[1] : "eth0");

Signed-off-by: Shahbaz Youssefi <syoussefi@kinova.ca>
2015-12-21 10:56:49 -05:00
Shahbaz Youssefi 593a81a177 Build simple_test, but don't install
Signed-off-by: Shahbaz Youssefi <syoussefi@kinova.ca>
2015-12-18 13:15:24 -05:00
Shahbaz Youssefi 529ffbe0cd Add a single header for all ethercat headers
This way, applications don't need to know the details of every header
file that exists in the API. With a simple:

    #include <ethercat.h>

they would get everything.  This is specially important because the
order of including the header files is important!

Signed-off-by: Shahbaz Youssefi <syoussefi@kinova.ca>
2015-12-18 09:56:33 -05:00
Shahbaz Youssefi 5c2955139e Include relative to file
This allows the header files to be installed, say in /usr/include/soem
and then included with:

    #include <soem/ethercattype.h>

without having to add -I/usr/include/soem.

Signed-off-by: Shahbaz Youssefi <syoussefi@kinova.ca>
2015-12-18 09:38:09 -05:00
Hans-Erik Floryd 1654afc75f Merge pull request #19 from ShabbyX/master
Correct usage of ll in %d and %x
2015-12-17 17:53:17 +01:00
Hans-Erik Floryd b82ce4dfca Merge pull request #23 from ShabbyX/build-fixes
Allow proper installation on host system
2015-12-17 17:27:08 +01:00
Shahbaz Youssefi e7a7ef39da Allow proper installation on host system
This commit allows sane installation of SOEM on the host system, while
minimally affecting the current usage of cross-compilation.

The changes are:

- CMAKE_INSTALL_PREFIX is not overriden when installing on host,
- header files are installed in include/soem/ when installing on host,
- libsoem.a is installed in lib/ instead of bin/,
- simple_test is not installed on host.

Usage is:

    cmake -DHOST_INSTALL=1 .

Closes #21
Closes #22

Signed-off-by: Shahbaz Youssefi <syoussefi@kinova.ca>
2015-12-17 10:57:23 -05:00
Shahbaz Yousefi d54054f38e Correct usage printf with 64 bit numbers
Signed-off-by: Shahbaz Youssefi <shabbyx@gmail.com>
2015-12-10 11:38:23 -05:00
Mikael Heden a7358b19d7 Merge pull request #18 from mheden/master
Add link to CLA
2015-11-23 17:43:42 +01:00