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

Merge remote-tracking branch 'origin/devel-1.6' into 84-api-call-for-eoe-set-ip-command

This commit is contained in:
Florian Pose 2024-05-14 16:30:29 +02:00
parent 5908be27b4 26b22db16d
commit 4a1ac80fda
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tool/CommandFoeRead.cpp
View File

@ -1,6 +1,6 @@
/*****************************************************************************
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
* Copyright (C) 2006-2024 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
*
@ -81,7 +81,7 @@ void CommandFoeRead::execute(const StringVector &args)
}
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::Read);
m.open(MasterDevice::ReadWrite);
slaves = selectedSlaves(m);
if (slaves.size() != 1) {

4
tool/CommandGraph.cpp
View File

@ -1,6 +1,6 @@
/*****************************************************************************
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
* Copyright (C) 2006-2024 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
*
@ -126,7 +126,7 @@ void CommandGraph::execute(const StringVector &args)
}
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::Read);
m.open(MasterDevice::ReadWrite);
m.getMaster(&master);
for (unsigned int i = 0; i < master.slave_count; i++) {

4
tool/CommandRegRead.cpp
View File

@ -1,6 +1,6 @@
/*****************************************************************************
*
* Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
* Copyright (C) 2006-2024 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
*
@ -134,7 +134,7 @@ void CommandRegRead::execute(const StringVector &args)
}
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::Read);
m.open(MasterDevice::ReadWrite);
slaves = selectedSlaves(m);
if (slaves.size() != 1) {

4
tool/CommandSoeRead.cpp
View File

@ -1,6 +1,6 @@
/*****************************************************************************
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
* Copyright (C) 2006-2024 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
*
@ -118,7 +118,7 @@ void CommandSoeRead::execute(const StringVector &args)
}
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::Read);
m.open(MasterDevice::ReadWrite);
slaves = selectedSlaves(m);
if (slaves.size() != 1) {
throwSingleSlaveRequired(slaves.size());