From 049592873d6ee0d33a1b3d793fc3d8c464b98ce4 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 12:56:56 +0200 Subject: [PATCH 1/2] 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 a32fa5fc3a513c03778155bd28d2cc6d82e330c0 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Apr 2022 13:26:09 +0200 Subject: [PATCH 2/2] Build documentation. --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7161048..fc046dda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +stages: + - build + - documentation + image: registry.gitlab.com/etherlab.org/build-container-factory/leap-15.2:linux-syms @@ -10,5 +14,22 @@ build: - make -j8 all modules - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck +documentation: + stage: documentation + + artifacts: + untracked: true + expire_in: 1 week + + script: + - ./bootstrap + - ./configure --disable-kernel --disable-userlib + - make -j8 all + - cd documentation + - mkdir external + - make + - make index + - make + include: - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'