From 340584e114b00541b662221f65a07efa2fc3c42c Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 12:56:56 +0200 Subject: [PATCH 01/11] Added missing commands. --- documentation/Makefile | 2 ++ documentation/ethercat_doc.tex | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/documentation/Makefile b/documentation/Makefile index 11db2538..1506caeb 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -13,6 +13,7 @@ LATEX_OPTIONS := -file-line-error-style COMMANDS := \ alias \ config \ + crc \ cstruct \ data \ debug \ @@ -26,6 +27,7 @@ COMMANDS := \ pdos \ reg_read \ reg_write \ + rescan \ sdos \ sii_read \ sii_write \ diff --git a/documentation/ethercat_doc.tex b/documentation/ethercat_doc.tex index fd71a197..a2f6f62f 100644 --- a/documentation/ethercat_doc.tex +++ b/documentation/ethercat_doc.tex @@ -2386,6 +2386,13 @@ created, if the \lstinline+udev+ Package is installed. See %------------------------------------------------------------------------------ +\subsection{Display CRC Error Counters} +\label{sec:ethercat-crc} + +\lstinputlisting[basicstyle=\ttfamily\footnotesize]{external/ethercat_crc} + +%------------------------------------------------------------------------------ + \subsection{Output PDO information in C Language} \label{sec:ethercat-cstruct} @@ -2461,6 +2468,13 @@ created, if the \lstinline+udev+ Package is installed. See %------------------------------------------------------------------------------ +\subsection{Trigger a Bus Scan} +\label{sec:rescan} + +\lstinputlisting[basicstyle=\ttfamily\footnotesize]{external/ethercat_rescan} + +%------------------------------------------------------------------------------ + \subsection{SDO Dictionary} \lstinputlisting[basicstyle=\ttfamily\footnotesize]{external/ethercat_sdos} From 508b4650692c9184d6e03504702f7ac323ebafbd Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 13:26:09 +0200 Subject: [PATCH 02/11] Build documentation. --- .gitlab-ci.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3386d4e5..caf7cb75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,24 @@ pages: artifacts: paths: - public/ - + +documentation: + stage: deploy + rules: + - if: $CI_COMMIT_BRANCH == "stable-1.5" + script: + - ./bootstrap + - ./configure --disable-kernel --disable-userlib + - make -j8 all + - cd documentation + - mkdir external + - make + - make index + - make + artifacts: + paths: + - documentation/*.pdf + # from 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml', but on all branches workflow: rules: From 86eb89464d1ff2b0ebe41227444f3b241b829fb3 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 14:10:30 +0200 Subject: [PATCH 03/11] ext target for documentation. --- documentation/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documentation/Makefile b/documentation/Makefile index 1506caeb..ff6971e2 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -53,7 +53,9 @@ $(EXT_FILES): $(ETHERCAT_CMD) @echo Creating $@... $(shell $(subst $(EXT_PREFIX),$(ETHERCAT_HELP) ,$@) > $@) -pdf: $(EXT_FILES) +ext: $(EXT_FILES) + +pdf: ext $(MAKE) -C images $(MAKE) -C graphs From b746ce65b1cba4d76162a364c6cf2dc87df0a722 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 14:18:20 +0200 Subject: [PATCH 04/11] Build commands separately. --- .gitlab-ci.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index caf7cb75..ac7e89c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ pages: paths: - public/ -documentation: +commands: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" @@ -46,8 +46,22 @@ documentation: - ./bootstrap - ./configure --disable-kernel --disable-userlib - make -j8 all + - mkdir documentation/external + - make -C documentation ext + artifacts: + paths: + - tool/ethercat + - documentation/external/ + +documentation: + stage: deploy + rules: + - if: $CI_COMMIT_BRANCH == "stable-1.5" + image: texlive/texlive + dependencies: + - commands + script: - cd documentation - - mkdir external - make - make index - make From fb937aa5f21ab3811f89d5dbe0d756bdbe5d54a4 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 14:48:23 +0200 Subject: [PATCH 05/11] Test artifacts. --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac7e89c6..efb80883 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,10 +57,11 @@ documentation: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" - image: texlive/texlive + # image: texlive/texlive dependencies: - commands script: + - find documentation - cd documentation - make - make index From 71ef9da4a19efe0049657074fe09c3d22229c5dd Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 15:06:16 +0200 Subject: [PATCH 06/11] Commands in build stage. --- .gitlab-ci.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efb80883..0db98f89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,21 @@ build: - make -j8 all modules - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck +commands: + stage: build + rules: + - if: $CI_COMMIT_BRANCH == "stable-1.5" + script: + - ./bootstrap + - ./configure --disable-kernel --disable-userlib + - make -j8 all + - mkdir documentation/external + - make -C documentation ext + artifacts: + paths: + - tool/ethercat + - documentation/external/ + test cmake: stage: test @@ -38,28 +53,11 @@ pages: paths: - public/ -commands: - stage: deploy - rules: - - if: $CI_COMMIT_BRANCH == "stable-1.5" - script: - - ./bootstrap - - ./configure --disable-kernel --disable-userlib - - make -j8 all - - mkdir documentation/external - - make -C documentation ext - artifacts: - paths: - - tool/ethercat - - documentation/external/ - documentation: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" # image: texlive/texlive - dependencies: - - commands script: - find documentation - cd documentation From a6c3005d3140d64e6f4fe3f58b8ec571590fc245 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 15:16:21 +0200 Subject: [PATCH 07/11] Use texlive image. --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0db98f89..de5a9654 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ build: - make -j8 all modules - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck +# Build ethercat tool subcommand help output for documentation commands: stage: build rules: @@ -57,7 +58,7 @@ documentation: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" - # image: texlive/texlive + image: texlive/texlive script: - find documentation - cd documentation From 2bdecddf9c69fb9bbd23f74c4dfdecd8ce494ad7 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 15:08:09 +0000 Subject: [PATCH 08/11] Using own texlive image. --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de5a9654..53cfa2cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,9 +58,8 @@ documentation: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" - image: texlive/texlive + image: registry.gitlab.com/etherlab.org/build-container-factory/leap-15.2:texlive script: - - find documentation - cd documentation - make - make index From 932577aff8396a3604692615972023f4f54de13b Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 15:14:35 +0000 Subject: [PATCH 09/11] Use 15.3 images. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53cfa2cc..fb9cd108 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ image: - registry.gitlab.com/etherlab.org/build-container-factory/leap-15.2:linux-syms + registry.gitlab.com/etherlab.org/build-container-factory/leap-15.3:linux-syms build: stage: build @@ -58,7 +58,7 @@ documentation: stage: deploy rules: - if: $CI_COMMIT_BRANCH == "stable-1.5" - image: registry.gitlab.com/etherlab.org/build-container-factory/leap-15.2:texlive + image: registry.gitlab.com/etherlab.org/build-container-factory/leap-15.3:texlive script: - cd documentation - make From 4376e42f2b8cd1e163ac8fe00f0a6645f2965941 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Sat, 2 Apr 2022 07:51:47 +0000 Subject: [PATCH 10/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb9cd108..48eaf9ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ commands: - make -C documentation ext artifacts: paths: + - script/init.d/ethercat - tool/ethercat - documentation/external/ From 15f19fbb7b084889c72421c57aad58d0083b1009 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Sat, 2 Apr 2022 07:58:51 +0000 Subject: [PATCH 11/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48eaf9ea..d03db08d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ commands: artifacts: paths: - script/init.d/ethercat + - script/ethercat.service - tool/ethercat - documentation/external/