bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15-ethercat-165-arithmetic-expression-expecting-primary-0-1' into 'master' 

Resolve "ethercat: 165: arithmetic expression: expecting primary: " "0" + 1""

Closes #15

See merge request etherlab.org/ethercat!33
This commit is contained in:
Florian Pose 2021-09-02 15:11:36 +00:00
parent efa5c32d0f 5bd401490f
commit 65285fe74c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/ethercatctl.in
View File

@ -99,7 +99,7 @@ start)
parse_mac_address "${BACKUP}"
BACKUPS=${BACKUPS}${MAC}
MASTER_INDEX=$(( "${MASTER_INDEX}" + 1))
MASTER_INDEX=$((${MASTER_INDEX} + 1))
done
# load master module
@ -186,12 +186,12 @@ status)
while true; do
DEVICE=$(eval echo "\${MASTER${MASTER_COUNT}_DEVICE}")
if [ -z "${DEVICE}" ]; then break; fi
MASTER_COUNT=$(( "${MASTER_COUNT}" + 1))
MASTER_COUNT=$((${MASTER_COUNT} + 1))
done
RESULT=0
for i in $(seq 0 "$(( "${MASTER_COUNT}" - 1))"); do
for i in $(seq 0 "$((${MASTER_COUNT} - 1))"); do
echo -n "Master${i} "
# Check if the master is in idle or operation phase

8
script/init.d/ethercat.in
View File

@ -6,7 +6,7 @@
#
# $Id$
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
# Copyright (C) 2006-2021 Florian Pose, Ingenieurgemeinschaft IgH
#
# This file is part of the IgH EtherCAT Master.
#
@ -162,7 +162,7 @@ start)
parse_mac_address "${BACKUP}"
BACKUPS=${BACKUPS}${MAC}
MASTER_INDEX=$(( "${MASTER_INDEX}" + 1))
MASTER_INDEX=$((${MASTER_INDEX} + 1))
done
# load master module
@ -238,12 +238,12 @@ status)
while true; do
DEVICE=$(eval echo "\${MASTER${MASTER_COUNT}_DEVICE}")
if [ -z "${DEVICE}" ]; then break; fi
MASTER_COUNT=$(( "${MASTER_COUNT}" + 1))
MASTER_COUNT=$((${MASTER_COUNT} + 1))
done
RESULT=0
for i in $(seq 0 "$(( "${MASTER_COUNT}" - 1))"); do
for i in $(seq 0 "$((${MASTER_COUNT} - 1))"); do
echo -n "Master${i} "
# Check if the master is in idle or operation phase