Commit Graph

2406 Commits

Author SHA1 Message Date
Bjarne von Horn 7e4aba9a6d build user example with cmake and test it 2022-02-22 23:28:42 +01:00
Bjarne von Horn 9d484de82a Fix cmake config module 2022-01-01 23:41:23 +01:00
Florian Pose d599f79832 Merge branch 'fix_aarch64_build' into 'stable-1.5'
Fix DMA detection macro

See merge request etherlab.org/ethercat!43
2021-12-13 09:55:04 +00:00
Bjarne von Horn 2c9286de9b Fix DMA detection macro
Some arm64 builds have CONFIG_PCI, but free_dma() and request_dma()
symbols depend on CONFIG_GENERIC_ISA_DMA
2021-12-06 23:36:35 +01:00
Florian Pose 4dda8f4ae9 Merge branch 'stable-1.5' into 'stable-1.5'
publish doxygen with Gitlab pages

See merge request etherlab.org/ethercat!42
2021-11-30 09:46:41 +00:00
Bjarne von Horn 06e7b48aba publish doxygen with Gitlab pages 2021-11-29 22:29:41 +01:00
Florian Pose 4cdf467935 Merge branch 'feature/addCpuBindAsModuleParameter' into 'stable-1.5'
master: added 'run_on_cpu' module parameter to bind kthreads to a cpu

See merge request etherlab.org/ethercat!35
2021-10-28 15:58:24 +00:00
Matthias Schoepfer e6d842cc8f master: added 'run_on_cpu' module parameter to bind kthreads to a cpu
When you use isolcpus to isolate a cpu for the realtime task, as well
as assiging all relevant interrupts to this cpu, it makes sense to
also bind the EtherCAT-OP / EtherCAT-IDLE task to this cpu to reduce
the cache misses and avoid data migration between cores. Therefore
a parameter 'run_on_cpu' is added, that takes the cpu number (same as
in isolcpus, not a smp_affinity mask). If unset, will bind to any cpu
and will be migratable.

The reason to put this into the kernel module is, that the thread is
created during runtime, i.e. when the userspace program is starting
the ethercat master. It would be rather hacky, to find the pid of the
EtherCAT-xx thread and migrate it at this point.

Signed-off-by: Matthias Schoepfer <m.schoepfer@rethinkrobotics.com>
2021-09-27 14:56:01 +02:00
Florian Pose 34dcf04d4c Merge branch 'cherry-pick-5bd40149' into 'stable-1.5'
Avoid double quotes in arithmetic expansion.

See merge request etherlab.org/ethercat!34
2021-09-02 15:16:23 +00:00
Florian Pose 4ac30c966e Avoid double quotes in arithmetic expansion.
(cherry picked from commit 5bd401490f)
2021-09-02 15:12:46 +00:00
Florian Pose 40e4b508a4 Run pipeline also in stable-1.5. 2021-09-01 09:15:59 +00:00
Florian Pose 62d098ca1c Added missing scope for ostream. 2021-09-01 11:01:21 +02:00
Florian Pose eba73fc292 Strictly using KERN_CONT for continued printk() calls to avoid newlines. 2021-09-01 11:00:49 +02:00
Florian Pose 09d1096623 Avoided warning about unreasonable use of strncpy(). 2021-08-25 12:00:01 +02:00
Florian Pose db44c5be0f Merge branch 'stable-1.5' of gitlab.com:etherlab.org/ethercat into stable-1.5 2021-08-25 09:47:40 +02:00
Florian Pose 4e11a50670 Define set_normal_priority() inside #ifdef EC_EOE. Fixes #12. 2021-08-25 09:47:26 +02:00
Florian Pose dde91be4be Merge branch 'fix-make-clean' into 'stable-1.5'
Fix make clean

See merge request etherlab.org/ethercat!29
2021-08-24 16:04:31 +00:00
Florian Pose cfec20492d Merge branch 'DasRoteSkelett/ethercat-feature/addDeviceNameToEthercatConf' into stable-1.5 2021-08-24 13:29:02 +02:00
Florian Pose b47f9249d7 Documentation for interface names. 2021-08-24 13:27:28 +02:00
Florian Pose d06444d53e Broke long lines. 2021-08-24 13:20:54 +02:00
Florian Pose 72ae0c090c Removed tabs. 2021-08-24 12:36:29 +02:00
Florian Pose a750e08884 Merge branch 'feature-flags' into 'stable-1.5'
Feature Flags / AssignToPdi

See merge request etherlab.org/ethercat!30
2021-08-24 10:15:10 +00:00
Florian Pose 9ec0eb6295 Merge remote-tracking branch 'gitlab/stable-1.5' into stable-1.5 2021-08-10 14:49:56 +02:00
Florian Pose e3d9056cbc Added export for ecrt_slave_config_reg_pdo_entry_pos(). Fixes #11. 2021-08-10 14:48:07 +02:00
Matthias Schoepfer 162e5ef9eb ethercatctl: allow to use the network device name instead of mac address
In the /etc/ethercat.conf file, the MASTERX_DEVICE string is given as a
mac address or a wildcard. When we want to deploy the (same) software (image)
to a bunch of different hardware, and these computers do have more than one
interface that matches the driver, we need a way to define the device by
network interface name. This allows to also define the network device by name
(e.g. eth0, eno1, ...)

Signed-off-by: Matthias Schoepfer <m.schoepfer@rethinkrobotics.com>
2021-07-27 10:44:26 +02:00
Florian Pose 441b7e470e First feature flag: AssignToPdi. 2021-07-23 16:16:18 +02:00
Florian Pose 443a7ad3e3 Find flag method with const char * parameter; added method to header. 2021-07-23 16:15:05 +02:00
Florian Pose a178c9e452 Added feature flags to API. 2021-07-23 15:53:11 +02:00
Florian Pose cd0d17d6a5 Also changed license of gloabl headers to LGPL.
Moved definition of EC_SDO_INJECTION_TIMEOUT to master.c.
2021-07-23 13:33:54 +02:00
Nicola Fontana 89f81d638c Fix make clean
Commit 82399a9239 assumes you can override `make clean` on the fact
that prerequisites of the same target are merged. This is true but
unfortunately defining a `clean` target prevents automake from
generating its own one, hence the default clean actions are not
performed. This can be easily seen by inspecting the generated
`Makefile`.

Solve this issue by manually chaining up the default action.
2021-07-22 17:38:38 +02:00
Florian Pose edd473c36b Corrected license text of master/ioctl.h, because it is included in the userspace library. 2021-07-22 16:38:53 +02:00
Florian Pose b68abbfb04 Merge branch 'dehardcode-paths' into 'stable-1.5'
Do not hardcode paths in scripts

See merge request etherlab.org/ethercat!28
2021-07-22 13:27:06 +00:00
Florian Pose 83468705b2 Fixed problems with shell quotes introduced in 66329e1f. 2021-07-22 15:06:17 +02:00
Nicola Fontana 4c8ffd9a57 Do not hardcode paths in scripts
Try to reuse the configured paths as much as possible. Unfortunately, to
be able to fully expand some variable (e.g. `bindir`), these files must
be expanded by make, not by configure. This adds some complexity:

https://www.gnu.org/software/automake/manual/html_node/Scripts.html
2021-07-22 14:40:03 +02:00
Florian Pose 673e50e692 Merge branch 'igb-4.19-drivers' into 'stable-1.5'
igb-4.19 kernel driver

See merge request etherlab.org/ethercat!24
2021-07-06 14:13:00 +00:00
Florian Pose 5e21dcd6e1 Added 4.19 files to Makefile. 2021-07-06 16:11:04 +02:00
Vincenzo Ferraro 260ae28310 igb-4.19 kernel driver 2021-07-06 16:11:04 +02:00
Florian Pose 1846af4995 Merge branch 'fix/runShellcheckOnScriptFolder' into 'stable-1.5'
script: run shellcheck on bash / sh scripts

See merge request etherlab.org/ethercat!26
2021-07-05 15:09:27 +00:00
Matthias Schoepfer 66329e1fe1 script: run shellcheck on bash / sh scripts
Mostly fixed omitted double quotes, some conversion of $(eval ..) to $(()).
Left the echo -n untouched, shellcheck complains about not being standard in
/bin/sh. Also, seems like some code is dublicated in ethercatctl.in and
init.d/ethercat.in.

Signed-off-by: Matthias Schoepfer <m.schoepfer@rethinkrobotics.com>
2021-07-05 14:51:16 +02:00
Vincenzo Ferraro 699217edda igb-4.19 kernel driver 2021-07-02 12:47:29 +00:00
Florian Pose cefb37944d Added some options to widen test coverage. 2021-07-01 11:43:12 +00:00
Florian Pose 66d3f3f95c Merge branch 'tty-dev' into 'stable-1.5'
Implement fix for kernel error when opening TTY device file on kernel 3.7.0 or greater

Fix for issue described in #8 

See merge request etherlab.org/ethercat!22
2021-07-01 11:34:21 +00:00
Kale Yuzik abdefcedf2 Implement fix for kernel error when opening TTY device file on kernel 3.7.0 or greater
Error message: "tty_init_dev: ttyEC driver does not set tty->port. This would crash the kernel. Fix the driver!"
2021-06-30 08:48:54 -06:00
Florian Pose f87df53bb7 Merge branch 'fix-make-distclean' into 'stable-1.5'
Revive 'make distcheck'

See merge request etherlab.org/ethercat!20
2021-06-22 14:43:07 +00:00
Nicola Fontana 82399a9239 Revive 'make distcheck' 2021-06-22 14:43:07 +00:00
Florian Pose a9bdd8e41a Merge branch 'ci_container' into 'stable-1.5'
switch to prebuilt container

See merge request etherlab.org/ethercat!21
2021-06-18 16:14:47 +00:00
Bjarne von Horn 341e5d8a38 switch to prebuilt container 2021-06-18 16:00:29 +02:00
Florian Pose 1fa5565aa0 Ignore cmake output. 2021-06-09 13:56:01 +02:00
Florian Pose 491bc99f95 Merge branch 'add_cmake_helper' into 'stable-1.5'
Add cmake config module

See merge request etherlab.org/ethercat!19
2021-06-09 11:49:01 +00:00
Bjarne von Horn a0ba01ae74 Add cmake config module 2021-06-09 11:49:01 +00:00