From f4b7a074e14df54ee0fdd1f5062ec4fc1cb2416a Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 12:56:56 +0200 Subject: [PATCH 1/3] 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 f8652cbb..e810e11d 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -13,6 +13,7 @@ LATEX_OPTIONS := -file-line-error-style COMMANDS := \ alias \ config \ + crc \ cstruct \ data \ debug \ @@ -27,6 +28,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 10fa3661..6e03a25b 100644 --- a/documentation/ethercat_doc.tex +++ b/documentation/ethercat_doc.tex @@ -2432,6 +2432,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} @@ -2529,6 +2536,13 @@ interface, not the one of the EtherCAT interface.}, %------------------------------------------------------------------------------ +\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 6d4d5726ca75fe2545b4977226b6975fb55bd6b0 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 13:26:09 +0200 Subject: [PATCH 2/3] Build documentation. --- .gitlab-ci.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e6e29ad..caf7cb75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,51 @@ build: - make -j8 all modules - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck +test cmake: + stage: test + + script: + - ./bootstrap + - ./configure --prefix=/tmp/ethercat_test_dir --disable-kernel + - make -j8 install + - cd examples/user + - mkdir build && cd build + - cmake -DCMAKE_PREFIX_PATH=/tmp/ethercat_test_dir -DCMAKE_BUILD_TYPE=Release .. + - make + - ldd userexample + +pages: + stage: deploy + rules: + - if: $CI_COMMIT_BRANCH == "stable-1.5" + script: + - ./bootstrap + - ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --disable-8139too --enable-tty --with-devices=2 --enable-ccat + - doxygen + - mkdir public + - echo "/ethercat /ethercat/v1 301" > public/_redirects + - mv doxygen-output/html/ public/v1/ + 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 ef1814a7be8f8e239a11a5c1a042c99ae9d43b1d Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 12:20:45 +0000 Subject: [PATCH 3/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index caf7cb75..8e6e29ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,51 +10,6 @@ build: - make -j8 all modules - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck -test cmake: - stage: test - - script: - - ./bootstrap - - ./configure --prefix=/tmp/ethercat_test_dir --disable-kernel - - make -j8 install - - cd examples/user - - mkdir build && cd build - - cmake -DCMAKE_PREFIX_PATH=/tmp/ethercat_test_dir -DCMAKE_BUILD_TYPE=Release .. - - make - - ldd userexample - -pages: - stage: deploy - rules: - - if: $CI_COMMIT_BRANCH == "stable-1.5" - script: - - ./bootstrap - - ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --disable-8139too --enable-tty --with-devices=2 --enable-ccat - - doxygen - - mkdir public - - echo "/ethercat /ethercat/v1 301" > public/_redirects - - mv doxygen-output/html/ public/v1/ - 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: