# HG changeset patch # User Florian Pose # Date 1462350595 -7200 # Node ID 0c56c67072a626e2ac8ffa5d016b279ad6bea5e2 # Parent b7ac213beac5e3bd6e491b2ebcd7ad69b02676e0 Included "ethercat ip" command in documentation. diff -r b7ac213beac5 -r 0c56c67072a6 documentation/Makefile --- a/documentation/Makefile Tue May 03 15:14:42 2016 +0200 +++ b/documentation/Makefile Wed May 04 10:29:55 2016 +0200 @@ -22,6 +22,7 @@ foe_read \ foe_write \ graph \ + ip \ master \ pdos \ reg_read \ diff -r b7ac213beac5 -r 0c56c67072a6 documentation/ethercat_doc.tex --- a/documentation/ethercat_doc.tex Tue May 03 15:14:42 2016 +0200 +++ b/documentation/ethercat_doc.tex Wed May 04 10:29:55 2016 +0200 @@ -2191,12 +2191,6 @@ poses the new problem of concurrent access to the master. The locking mechanisms needed for this are introduced in \autoref{sec:concurr}. -\paragraph{Automatic Configuration} - -By default, slaves are left in PREOP state, if no configuration is applied. If -an EoE interface link is set to ``up'', the requested slave's -application-layer state is automatically set to OP. - %------------------------------------------------------------------------------ \section{CANopen over EtherCAT (CoE)} @@ -2445,6 +2439,12 @@ %------------------------------------------------------------------------------ +\subsection{Setting Ethernet-over-EtherCAT IP Parameters} + +\lstinputlisting[basicstyle=\ttfamily\footnotesize]{external/ethercat_ip} + +%------------------------------------------------------------------------------ + \subsection{Master and Ethernet Devices} \lstinputlisting[basicstyle=\ttfamily\footnotesize]{external/ethercat_master}