Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-08-17 08:41:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,051 Commits 12 Branches 15 Tags
stable-1.6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Pose 556023e460 Merge branch 'unload-ec-bhf-1.6' into 'stable-1.6' 
[Backport] Unload ec_bhf before loadin ccat

See merge request etherlab.org/ethercat!214
 2026-08-13 15:10:37 +02:00
Florian Pose 4c9839099b Always check for conflict markers. 2026-08-13 15:02:50 +02:00
Florian Pose a06018deb3 Unload ec_bhf before loading CCAT. 2026-08-13 15:02:30 +02:00
Florian Pose 2ee893796d Merge branch 'fix-formatted-read-into-char-buf-1.6' into 'stable-1.6' 
Backport from 1.7: Use str.read() to read into char *.

See merge request etherlab.org/ethercat!211
 2026-08-11 16:04:53 +02:00
Florian Pose 827129d707 Fixed cpplint warnings. 2026-08-11 15:55:24 +02:00
Florian Pose ae2cf49ede Backport from 1.7: Use str.read() to read into char *. 2026-08-11 15:37:03 +02:00
Florian Pose 36894a1281 Merge branch 'stable-1.6' into 'stable-1.6' 
Adapt to kernel 5.6+ time API changes

See merge request etherlab.org/ethercat!209
 2026-08-11 12:12:46 +02:00
Florian Pose abf37f7b94 cpplint changes. 2026-08-11 12:04:36 +02:00
Florian Pose cabf57a627 Loosened CPPlint rules. 2026-08-11 11:55:33 +02:00
Florian Pose 2f7f884f1c Merge branch 'protect-datagram-fields' into 'stable-1.6' 
Re-ordering protection for datagram fields

See merge request etherlab.org/ethercat!203
 2026-07-16 14:07:09 +02:00
Florian Pose e31d897563 Merge branch '226-issue-splitting-domain-into-several-datagrams' into 'stable-1.6' 
Prevent creating too large datagrams

See merge request etherlab.org/ethercat!205
 2026-07-16 14:03:21 +02:00
Florian Pose eeec8a4f81 More general approach: Check for maximum datagram size in pre-alloc. 2026-07-16 13:52:53 +02:00
Florian Pose 2faafd771c Complain if a single FMMU config would exceed the maximum datagram size. 2026-07-15 16:19:29 +02:00
Florian Pose 46a2118ad9 Fixed typo in comment. 2026-07-15 16:05:36 +02:00
Florian Pose 80570b2d98 Merge branch 'run-precommit' into 'stable-1.6' 
Run pre-commit checks also in CI

See merge request etherlab.org/ethercat!201
 2026-07-15 15:52:28 +02:00
Florian Pose 4151f507ff Fixed line breaks. 2026-07-15 15:04:48 +02:00
Florian Pose fff9c1efb7 Merge branch 'stable-1.6' into run-precommit 2026-07-15 14:58:15 +02:00
Florian Pose c569080e2f NEWS entry. 2026-07-15 14:04:46 +02:00
Florian Pose 754d0e548a Improved smp_store positions. 2026-07-15 13:45:50 +02:00
Florian Pose b4217e93b0 Moved SMP macros to smp.h 2026-07-15 13:41:25 +02:00
Florian Pose ef425519db Moved definition of smp macros to globals. 2026-07-15 12:54:34 +02:00
Florian Pose 4397873738 General re-odering barrier for datagrams. 2026-07-15 12:46:26 +02:00
Florian Pose 81c95a7800 Merge branch 'stable-1.6' into protect-datagram-fields 2026-07-15 10:50:08 +02:00
Florian Pose 18876aa2bc Merge branch 'cpplint' into 'stable-1.6' 
Added cpplint checks in pre-commit hooks

See merge request etherlab.org/ethercat!202
 2026-07-15 10:48:52 +02:00
Florian Pose 12e2d700bb Only check on changed or added files at merge requests. 2026-07-15 10:47:57 +02:00
Florian Pose 55cb7bc246 Accepted some cpplint suggestions. 2026-07-15 10:42:14 +02:00
Florian Pose b3cd2c2e5a Documented the existence of the pre-commit configuration. 2026-07-15 10:39:08 +02:00
Florian Pose 687872df99 Added pre-commit hook with cpplint. 2026-07-15 10:31:32 +02:00
Florian Pose 3102ba20c1 Merge branch 'stable-1.6' into protect-datagram-fields 2026-07-15 09:55:03 +02:00
Florian Pose 74e1d2623c Fixed typo 2026-07-14 19:13:43 +02:00
Florian Pose 97b070b435 Fixed typo. 2026-07-14 19:07:06 +02:00
Florian Pose 60164f0ada Fixed 1.5 link. 2026-07-14 19:05:48 +02:00
Florian Pose 44eb2e6f18 Line breaks. 2026-07-14 19:03:26 +02:00
Florian Pose 83e1e479e4 Improved quote. 2026-07-14 18:57:31 +02:00
Florian Pose a27db36a33 Followed markdownlint guidelines and fixed broken links. 2026-07-14 18:54:39 +02:00
Florian Pose 361ac90ae2 Run pre-commit checks also in CI. 2026-07-14 18:04:53 +02:00
Florian Pose c4b4ac405f Merge commit 'c55771032b363c7c6f05591a9ba1da671cc8a69a' into HEAD 2026-07-14 17:55:29 +02:00
Florian Pose 44b6448592 Adjusted NEWS.md file acc. to markdownlint. 2026-07-14 17:54:47 +02:00
Florian Pose 77bcf82b86 Added pre-commit config with some basic checks. 2026-07-14 17:50:10 +02:00
Florian Pose c55771032b Cleaned-up NEWS.md file. 2026-07-14 17:31:10 +02:00
Florian Pose 34ccbcb1f5 Version bump to 1.6.10. 2026-07-14 17:18:48 +02:00
Florian Pose a6b03ffeaa Merge branch 'security-fixes' into 'stable-1.6' 
Security fixes

See merge request etherlab.org/ethercat!200
 2026-07-14 17:07:29 +02:00
Florian Pose 9c50b8a25d Test for re-ordering problem during synchrony check. 2026-07-14 11:36:19 +02:00
Florian Pose e257b4af52 Check for malicious EoE frame details. 2026-07-13 15:01:12 +02:00
Florian Pose 1c91a721ca Fixed re-allocation of SoE request buffer. 2026-07-13 13:56:31 +02:00
Florian Pose 7251b6c7be Fixed typos. 2026-07-13 13:44:22 +02:00
Florian Pose f4a1204be2 Improved error message 2026-07-13 13:41:53 +02:00
Florian Pose 5b16117c1f Protect rec_size calculation in FoE. 2026-07-13 13:32:53 +02:00
Florian Pose 6e60da92cd Merge branch 'add-macb-rp1-driver' into 'stable-1.6' 
Added macb (Cadence GEM / RP1) driver for kernel 6.18.

See merge request etherlab.org/ethercat!199
 2026-07-07 10:42:03 +02:00
Florian Pose beb2bf07df Merge branch 'igc_6.8' into 'stable-1.6' 
igb and igc for kernel 6.8

See merge request etherlab.org/ethercat!193
 2026-06-16 11:57:09 +02:00
Florian Pose d857b19a17 Merge branch 'stable-1.6' into igc_6.8 2026-05-22 14:12:01 +02:00
Florian Pose 46cc20e669 Merge branch 'r8169_6.1x' into 'stable-1.6' 
[r8169] Do not write invalid MAC onto NIC on removal

See merge request etherlab.org/ethercat!195
 2026-05-22 11:48:36 +02:00
Florian Pose 6544aa9ec6 Merge branch 'igb-6.8' into 'stable-1.6' 
Added igb driver for kernel 6.8

See merge request etherlab.org/ethercat!194
 2026-05-22 11:09:29 +02:00
Florian Pose f9f855d514 Added igb driver for kernel 6.8. 2026-05-07 10:52:46 +02:00
Florian Pose b709e58147 Version bump to 1.6.9 2026-03-26 17:47:12 +01:00
Florian Pose 15883228f9 Merge branch 'fix-suse-16' into 'stable-1.6' 
Driver fixes for openSUSE Leap 16.0

See merge request etherlab.org/ethercat!192
 2026-03-26 17:45:44 +01:00
Florian Pose 9c63faf50d Fixed igb for SUSE kernel 6.12 2026-03-26 17:38:46 +01:00
Florian Pose bf706b737d Fixed genet for SUSE 16.0. 2026-03-26 17:26:45 +01:00
Florian Pose cf19168844 Cherry-picked MR 188 (injection-semaphore) from 1.7. 2026-03-26 16:41:43 +01:00
Florian Pose 98563a2f0d Merge branch 'no-config-necessary' into 'stable-1.6' 
Do not require .config to exist in kernel sources

Closes #198

See merge request etherlab.org/ethercat!186
 2026-03-24 17:13:53 +01:00
Florian Pose db526666f3 At least check for Makefile. 2026-03-24 17:07:12 +01:00
Florian Pose 1e61b8400c Minor: Improved comments in DC user example. 2026-03-24 17:05:00 +01:00
Florian Pose 6869c2bab8 Merge branch 'stable-1.6-kernel615' into 'stable-1.6' 
tty: Implemented new timer interface since kernel 6.15.

See merge request etherlab.org/ethercat!187
 2026-03-16 14:47:06 +01:00
Florian Pose 7a7d7f051b Merge branch 'calc-dc-after-attach' into 'stable-1.6' 
Attach slaves before calculating DCs

Closes #212

See merge request etherlab.org/ethercat!185
 2026-03-13 15:17:53 +01:00
Florian Pose 607d0fd1af Merge branch 'discard-eoe' into 'stable-1.6' 
Discard EoE traffic if EoE is disabled

See merge request etherlab.org/ethercat!184
 2026-03-13 15:16:29 +01:00
Florian Pose 212cb59d58 Do not require .config to exist in kernel sources. 2026-03-12 12:01:21 +01:00
Florian Pose c76b02ae2e Attach slaves before calculating DCs. 2026-03-12 11:36:37 +01:00
Florian Pose c8c23aa448 Discard EoE traffic in CoE statemachine, if EoE is disabled. 2026-03-10 09:24:13 +01:00
Florian Pose 4e5b661674 Merge branch 'fix-6.19' into 'stable-1.6' 
Linux 6.19.0 support

Closes #200

See merge request etherlab.org/ethercat!183
 2026-03-09 15:02:17 +01:00
Florian Pose 3ccae1d47d Updated NEWS.md 2026-03-03 08:56:21 +01:00
Florian Pose bde53bc4f3 Use /sbin/ip as default 2026-03-03 08:52:53 +01:00
Florian Pose f16c0ff3c3 Merge branch 'custom-paths' into 'stable-1.6' 
Allow to customize kmod path and ip command

Closes #206

See merge request etherlab.org/ethercat!182
 2026-03-03 08:51:06 +01:00
Florian Pose 2543cc55bd Version 1.6.8: Fixed FAKE_EC_HOMEDIR usage. 2025-10-06 17:15:04 +02:00
Florian PoseandGitLab 6acfd09764 Merge branch 'patch-1' into 'stable-1.6' 
Set direction in syncManager when configuring it.

See merge request etherlab.org/ethercat!179
 2025-09-09 11:08:42 +02:00
Florian Pose c1e6b50d12 Merge branch 'news-markdown' into 'stable-1.6' 
Converted NEWS to NEWS.md

See merge request etherlab.org/ethercat!178
 2025-07-31 13:20:35 +02:00
Florian Pose c324df4348 Version bump to 1.6.7. 2025-07-31 13:13:59 +02:00
Florian Pose 554e39573a Some backtick escapes. 2025-07-31 13:10:23 +02:00
Florian Pose d34e600a21 Re-formatted in markdown. 2025-07-31 13:05:00 +02:00
Florian Pose 516499a4a7 Converted NEWS to NEWS.md 2025-07-31 13:03:28 +02:00
Florian Pose 6489901521 Merge branch '187-fake_lib-ecrt_master_deactivate-is-missing-for-testing-purposes' into 'stable-1.6' 
Resolve "fake_lib: ecrt_master_deactivate() is missing for testing purposes"

Closes #187

See merge request etherlab.org/ethercat!177
 2025-07-28 15:16:55 +02:00
Florian Pose 49e82079dc Clang-formatted fake library. 2025-07-24 11:49:14 +02:00
Florian Pose 04c4db80c3 Completed API methods in fake library. 2025-07-24 11:25:44 +02:00
Florian Pose b82a66735c Merge branch 'fix_igb_6.4' into 'stable-1.6' 
Fix igb for opensuse 15.6 (kernel 6.4)

See merge request etherlab.org/ethercat!176
 2025-07-01 11:33:08 +02:00
Florian Pose 11b5061628 Bumped version to 1.6.6. 2025-06-30 16:04:34 +02:00
Florian Pose 101aa52032 Merge branch '179-add-missing-functions-to-fake-library' into 'stable-1.6' 
Add missing functions to fake library

Closes #179

See merge request etherlab.org/ethercat!175
 2025-06-30 16:02:05 +02:00
Florian Pose f9b9f7c2cc Add missing functions to fake library 2025-06-30 16:02:05 +02:00
Florian Pose 0561fa0bd9 Merge branch '8139too-6.4-6.12' into 'stable-1.6' 
Add 8139too, e100, e1000 and r8169 for kernels 6.4 and 6.12

Closes #160

See merge request etherlab.org/ethercat!172
 2025-06-30 13:53:17 +02:00
Florian Pose 5dd3b544bb Avoided some more netif_ calls. 2025-06-30 13:46:26 +02:00
Florian Pose a3fbd3df3a Avoided some netif calls. 2025-06-30 13:17:15 +02:00
Florian Pose b9d5cf13d0 Avoid netif_wake_queue(). 2025-06-27 11:58:37 +02:00
Florian Pose 59654fc8a5 Merge branch 'contributing' into 'stable-1.6' 
Add a contributing guide

Closes #181

See merge request etherlab.org/ethercat!174
 2025-06-27 10:55:57 +02:00
Florian Pose 9a39273505 Add a contributing guide 2025-06-27 10:55:57 +02:00
Florian Pose 529242d752 Merge branch '175-tool-use-sint-32-notation-in-matlab-output-driver' into 'stable-1.6' 
Use sint(32) notation in matlab output driver

Closes #175

See merge request etherlab.org/ethercat!173
 2025-06-27 10:22:50 +02:00
Florian Pose 3e9cc87717 Using uint(x) as datatype in EtherLab Pdos output. 2025-06-27 10:16:04 +02:00
Florian Pose 1be2bb6f27 Do not stop queue. 2025-06-26 17:17:34 +02:00
Florian Pose d7e5fb09fc Fixed r8169. 2025-06-26 17:09:42 +02:00
Florian Pose 39ee16381d Avoid napi_consume_skb. 2025-06-26 16:28:43 +02:00
Florian Pose 12df7a1f4a Initialize watchdog jiffies in e100. 2025-06-26 16:08:36 +02:00
Florian Pose bf1e45d934 Fixed checking output. 2025-06-26 14:59:28 +02:00
Florian Pose 7fd10f3a31 Include r8169_leds if existing. 2025-06-26 14:57:52 +02:00