Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-08-20 21:51:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted default branch to stable-1.5.

Browse Source
This commit is contained in:
Florian Pose
2014-11-03 15:20:05 +01:00
parent 8479fd7675
commit 99418519bd
664 changed files with 837025 additions and 12883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/ethercat.conf
+20 -5
View File
@@ -4,10 +4,12 @@
#
# $Id$
#
# vim: spelllang=en spell tw=78
#
#------------------------------------------------------------------------------
#
# Master devices.
# Main Ethernet devices.
#
# The MASTER<X>_DEVICE variable specifies the Ethernet device for a master
# with index 'X'.
@@ -25,6 +27,15 @@
MASTER0_DEVICE=""
#MASTER1_DEVICE=""
#
# Backup Ethernet devices
#
# The MASTER<X>_BACKUP variables specify the devices used for redundancy. They
# behaves nearly the same as the MASTER<X>_DEVICE variable, except that it
# does not interpret the ff:ff:ff:ff:ff:ff address.
#
#MASTER0_BACKUP=""
#
# Ethernet driver modules to use for EtherCAT operation.
#
@@ -36,11 +47,15 @@ MASTER0_DEVICE=""
# the EtherCAT-capable ones. If a certain (EtherCAT-capable) driver is not
# found, a warning will appear.
#
# Possible values: 8139too, e100, e1000, e1000e, r8169, generic. Separate
# multiple drivers with spaces.
# Possible values: 8139too, e100, e1000, e1000e, r8169, generic, ccat.
# Separate multiple drivers with spaces.
#
# Note: The e100, e1000, e1000e and r8169 drivers are not built by default.
# Enable them with the --enable-<driver> configure switches.
# Note: The e100, e1000, e1000e, r8169 and ccat drivers are not built by
# default. Enable them with the --enable-<driver> configure switches.
#
# Attention: When using the generic driver, the corresponding Ethernet device
# has to be activated (with OS methods, for example 'ip link set ethX up'),
# before the master is started, otherwise all frames will time out.
#
DEVICE_MODULES=""
script/ethercat.service.in
+15 -1
View File
@@ -1,10 +1,24 @@
#
# EtherCAT Master Kernel Modules
# EtherCAT master kernel modules
#
[Unit]
Description=EtherCAT Master Kernel Modules
#
# Uncomment this, if the generic Ethernet driver is used. It assures, that the
# network interfaces are configured, before the master starts.
#
#Requires=network.service # Stop master, if network is stopped
#After=network.service # Start master, after network is ready
#
# Uncomment this, if a native Ethernet driver is used. It assures, that the
# network interfaces are configured, after the Ethernet drivers have been
# replaced. Otherwise, the networking configuration tools could be confused.
#
#Before=network.service
[Service]
Type=oneshot
RemainAfterExit=yes
script/ethercatctl.in
+6 -5
View File
@@ -33,6 +33,7 @@
#
#------------------------------------------------------------------------------
LSMOD=/sbin/lsmod
MODPROBE=/sbin/modprobe
RMMOD=/sbin/rmmod
MODINFO=/sbin/modinfo
@@ -107,9 +108,9 @@ start)
continue # ec_* module not found
fi
if [ ${MODULE} != "generic" ]; then
if [ ${MODULE} != "generic" -a ${MODULE} != "ccat" ]; then
# try to unload standard module
if lsmod | grep "^${MODULE} " > /dev/null; then
if ${LSMOD} | grep "^${MODULE} " > /dev/null; then
if ! ${RMMOD} ${MODULE}; then
${RMMOD} ${LOADED_MODULES}
exit 1
@@ -118,7 +119,7 @@ start)
fi
if ! ${MODPROBE} ${MODPROBE_FLAGS} ${ECMODULE}; then
if [ ${MODULE} != "generic" ]; then
if [ ${MODULE} != "generic" -a ${MODULE} != "ccat" ]; then
${MODPROBE} ${MODPROBE_FLAGS} ${MODULE} # try to restore
fi
${RMMOD} ${LOADED_MODULES}
@@ -137,7 +138,7 @@ stop)
# unload EtherCAT device modules
for MODULE in ${DEVICE_MODULES} master; do
ECMODULE=ec_${MODULE}
if ! lsmod | grep -q "^${ECMODULE} "; then
if ! ${LSMOD} | grep -q "^${ECMODULE} "; then
continue # ec_* module not loaded
fi
if ! ${RMMOD} ${ECMODULE}; then
@@ -149,7 +150,7 @@ stop)
# load standard modules again
for MODULE in ${DEVICE_MODULES}; do
if [ ${MODULE} == "generic" ]; then
if [ ${MODULE} == "generic" -o ${MODULE} == "ccat" ]; then
continue
fi
${MODPROBE} ${MODPROBE_FLAGS} ${MODULE}
script/ifup-eoe.sh
+1 -1
View File
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
script/init.d/Makefile.am
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
script/init.d/ethercat.in
+7 -6
View File
@@ -24,7 +24,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
@@ -47,6 +47,7 @@
#------------------------------------------------------------------------------
LSMOD=/sbin/lsmod
MODPROBE=/sbin/modprobe
RMMOD=/sbin/rmmod
MODINFO=/sbin/modinfo
@@ -126,7 +127,7 @@ parse_mac_address() {
else
echo Invalid MAC address \"${1}\" in ${ETHERCAT_CONFIG}
exit_fail
fi
fi
}
#------------------------------------------------------------------------------
@@ -157,7 +158,7 @@ start)
parse_mac_address ${DEVICE}
DEVICES=${DEVICES}${MAC}
parse_mac_address ${BACKUP}
BACKUPS=${BACKUPS}${MAC}
@@ -177,7 +178,7 @@ start)
continue # ec_* module not found
fi
if [ ${MODULE} != "generic" ]; then
if lsmod | grep "^${MODULE} " > /dev/null; then
if ${LSMOD} | grep "^${MODULE} " > /dev/null; then
if ! ${RMMOD} ${MODULE}; then
exit_fail
fi
@@ -200,7 +201,7 @@ stop)
# unload EtherCAT device modules
for MODULE in ${DEVICE_MODULES} master; do
ECMODULE=ec_${MODULE}
if ! lsmod | grep -q "^${ECMODULE} "; then
if ! ${LSMOD} | grep -q "^${ECMODULE} "; then
continue # ec_* module not loaded
fi
if ! ${RMMOD} ${ECMODULE}; then
@@ -243,7 +244,7 @@ status)
for i in `seq 0 $(expr ${MASTER_COUNT} - 1)`; do
echo -n "Master${i} "
# Check if the master is in idle or operation phase
${ETHERCAT} master --master ${i} 2>/dev/null | \
grep -qE 'Phase:[[:space:]]*Idle|Phase:[[:space:]]*Operation'
script/sysconfig/Makefile.am
+1 -1
View File
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# ---
#
#
# The license mentioned above concerns the source code only. Using the EtherCAT
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
script/sysconfig/ethercat
+22 -7
View File
@@ -4,10 +4,12 @@
#
# $Id$
#
# vim: spelllang=en spell tw=78
#
#------------------------------------------------------------------------------
#
# Master devices.
# Main Ethernet devices.
#
# The MASTER<X>_DEVICE variable specifies the Ethernet device for a master
# with index 'X'.
@@ -25,6 +27,15 @@
MASTER0_DEVICE=""
#MASTER1_DEVICE=""
#
# Backup Ethernet devices
#
# The MASTER<X>_BACKUP variables specify the devices used for redundancy. They
# behaves nearly the same as the MASTER<X>_DEVICE variable, except that it
# does not interpret the ff:ff:ff:ff:ff:ff address.
#
#MASTER0_BACKUP=""
#
# Ethernet driver modules to use for EtherCAT operation.
#
@@ -36,12 +47,16 @@ MASTER0_DEVICE=""
# the EtherCAT-capable ones. If a certain (EtherCAT-capable) driver is not
# found, a warning will appear.
#
# Possible values: 8139too, e100, e1000, e1000e, r8169, generic. Separate
# multiple drivers with spaces.
# Possible values: 8139too, e100, e1000, e1000e, r8169, generic, ccat.
# Separate multiple drivers with spaces.
#
# Note: The e100, e1000, e1000e, r8169 and ccat drivers are not built by
# default. Enable them with the --enable-<driver> configure switches.
#
# Attention: When using the generic driver, the corresponding Ethernet device
# has to be activated (with OS methods, for example 'ip link set ethX up'),
# before the master is started, otherwise all frames will time out.
#
# Note: The e100, e1000, e1000e and r8169 drivers are not built by default.
# Enable them with the --enable-<driver> configure switches.
#
DEVICE_MODULES=""
#
@@ -49,7 +64,7 @@ DEVICE_MODULES=""
#
# This can usually be left empty. Adjust this variable, if you have problems
# with module loading.
#
#
#MODPROBE_FLAGS="-b"
#------------------------------------------------------------------------------