Commit Graph

198 Commits

Author SHA1 Message Date
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
Mikael Heden b4d02aa2b5 Add link to CLA 2015-11-23 17:42:20 +01:00
Mikael Heden 64d122c416 Merge pull request #15 from alberth/add_docs
Add docs, remove trailing whitespace
2015-11-18 10:48:15 +01:00
Albert Hofkamp 5239968d0d Remove trailing whitespace. 2015-11-04 13:02:33 +01:00
Albert Hofkamp 0b677f832b Add documentation for the ec_* functions. 2015-11-04 12:54:22 +01:00
Mikael Heden 6501580d9e Merge pull request #14 from jassarsson/fix_propagate_foe_error_notfound
ecx_FOEwrite: Propagate foe error not found
2015-10-26 11:46:21 +01:00
Mikael Heden d900f423ad Merge pull request #13 from jassarsson/fix_incorrect_wkc_when_no_frames_received
ecx_receive_processdata_group: return EC_NOFRAME when no frames are received
2015-10-26 11:45:45 +01:00
Jimmy Assarsson 4b7263eb08 ecx_FOEwrite: Propagate foe error not found 2015-10-15 13:18:30 +02:00
Jimmy Assarsson eab964ca82 ecx_receive_processdata_group: return EC_NOFRAME when no frames are received 2015-10-15 10:23:11 +02:00
Mikael Heden 34670ceb90 Merge pull request #8 from mheden/master
Fix README documentation
2015-09-28 14:09:05 +02:00
Mikael Heden bed5047a2f Fix README documentation 2015-09-28 14:06:18 +02:00
Mikael Heden 903b521746 Merge pull request #7 from mheden/master
Cmake build system + minor test application cleanup
2015-09-28 13:55:58 +02:00
Mikael Heden d6dd3411d7 Minor cleanup in the test applications 2015-07-09 17:58:54 +02:00
Mikael Heden 77da52b89d Change to cmake build system 2015-07-09 17:57:59 +02:00
Mikael Heden 57c648ab7c Fix version number in doxygen 2015-03-24 18:19:27 +01:00
nakarlsson c9bbb90ed1 fixed linux warnings, removed unused/unsed and set variales. Moved fshort-wchar to machine .mk files 2015-03-17 22:21:20 +01:00
nakarlsson 6afd2f50cc SOEM 1.31 RC 2015-03-11 21:45:16 +01:00
nakarlsson f1404964e8 Added osal_task creation via task spwan, added fec driver for Freescale MAC FEC/ENET
Added osal_task creation via task spwan,
Added fec driver for Freescale MAC FEC/ENET
2015-03-08 17:27:00 +01:00
Mikael Heden 498ea631b9 Merge pull request #1 from mheden/master
Added SOEM 1.3 (hg: a02cedcbdca5)
2014-11-25 16:17:39 +01:00
Mikael Heden 7472dae1a2 Added SOEM 1.3 (hg: a02cedcbdca5) 2014-11-25 16:10:29 +01:00
rtl-johanna d2541d95e7 Update README.md 2014-10-08 12:52:46 +02:00
rtl-johanna 578fce4fa7 Initial commit 2014-09-16 09:06:00 +02:00