mirror of
https://gitlab.com/etherlab.org/ethercat.git
synced 2026-08-18 00:57:23 +08:00
enable ip command in tool only if EC_EOE defined
This commit is contained in:
+4
-6
@@ -49,7 +49,6 @@ ethercat_SOURCES = \
|
||||
CommandFoeRead.cpp \
|
||||
CommandFoeWrite.cpp \
|
||||
CommandGraph.cpp \
|
||||
CommandIp.cpp \
|
||||
CommandMaster.cpp \
|
||||
CommandPdos.cpp \
|
||||
CommandRegRead.cpp \
|
||||
@@ -75,9 +74,9 @@ ethercat_SOURCES = \
|
||||
sii_crc.cpp
|
||||
|
||||
if ENABLE_EOE
|
||||
ethercat_SOURCES += CommandEoe.cpp
|
||||
ethercat_SOURCES += CommandEoe.cpp CommandIp.cpp
|
||||
else
|
||||
EXTRA_DIST += CommandEoe.cpp
|
||||
EXTRA_DIST += CommandEoe.cpp CommandIp.cpp
|
||||
endif
|
||||
|
||||
noinst_HEADERS = \
|
||||
@@ -93,7 +92,6 @@ noinst_HEADERS = \
|
||||
CommandFoeRead.h \
|
||||
CommandFoeWrite.h \
|
||||
CommandGraph.h \
|
||||
CommandIp.h \
|
||||
CommandMaster.h \
|
||||
CommandPdos.h \
|
||||
CommandRegRead.h \
|
||||
@@ -118,9 +116,9 @@ noinst_HEADERS = \
|
||||
sii_crc.h
|
||||
|
||||
if ENABLE_EOE
|
||||
noinst_HEADERS += CommandEoe.h
|
||||
noinst_HEADERS += CommandEoe.h CommandIp.h
|
||||
else
|
||||
EXTRA_DIST += CommandEoe.h
|
||||
EXTRA_DIST += CommandEoe.h CommandIp.h
|
||||
endif
|
||||
|
||||
REV = `if test -s $(top_srcdir)/revision; then \
|
||||
|
||||
@@ -609,6 +609,7 @@ void MasterDevice::writeSoe(ec_ioctl_slave_soe_write_t *data)
|
||||
|
||||
/****************************************************************************/
|
||||
|
||||
#ifdef EC_EOE
|
||||
void MasterDevice::setIpParam(ec_ioctl_slave_eoe_ip_t *data)
|
||||
{
|
||||
if (ioctl(fd, EC_IOCTL_SLAVE_EOE_IP_PARAM, data) < 0) {
|
||||
@@ -621,5 +622,6 @@ void MasterDevice::setIpParam(ec_ioctl_slave_eoe_ip_t *data)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
@@ -94,6 +94,7 @@ class MasterDeviceSoeException:
|
||||
|
||||
/****************************************************************************/
|
||||
|
||||
#ifdef EC_EOE
|
||||
class MasterDeviceEoeException:
|
||||
public MasterDeviceException
|
||||
{
|
||||
@@ -108,6 +109,7 @@ class MasterDeviceEoeException:
|
||||
MasterDeviceException("EoE set IP parameter failed."),
|
||||
result(result) {};
|
||||
};
|
||||
#endif
|
||||
|
||||
/****************************************************************************/
|
||||
|
||||
|
||||
+5
-1
@@ -49,7 +49,9 @@ using namespace std;
|
||||
#include "CommandFoeRead.h"
|
||||
#include "CommandFoeWrite.h"
|
||||
#include "CommandGraph.h"
|
||||
#include "CommandIp.h"
|
||||
#ifdef EC_EOE
|
||||
# include "CommandIp.h"
|
||||
#endif
|
||||
#include "CommandMaster.h"
|
||||
#include "CommandPdos.h"
|
||||
#include "CommandRegRead.h"
|
||||
@@ -291,7 +293,9 @@ int main(int argc, char **argv)
|
||||
commandList.push_back(new CommandFoeRead());
|
||||
commandList.push_back(new CommandFoeWrite());
|
||||
commandList.push_back(new CommandGraph());
|
||||
#ifdef EC_EOE
|
||||
commandList.push_back(new CommandIp());
|
||||
#endif
|
||||
commandList.push_back(new CommandMaster());
|
||||
commandList.push_back(new CommandPdos());
|
||||
commandList.push_back(new CommandRegRead());
|
||||
|
||||
Reference in New Issue
Block a user