Merge branch 'cherry-pick-45f2d1a9' into 'stable-1.6'
Merge branch 'Fix-19' Closes #19 See merge request etherlab.org/ethercat!142
This commit is contained in:
commit
4a757cedc2
|
|
@ -28,7 +28,6 @@ EXTRA_DIST =
|
||||||
bin_PROGRAMS = ethercat
|
bin_PROGRAMS = ethercat
|
||||||
|
|
||||||
ethercat_SOURCES = \
|
ethercat_SOURCES = \
|
||||||
../master/soe_errors.c \
|
|
||||||
Command.cpp \
|
Command.cpp \
|
||||||
CommandAlias.cpp \
|
CommandAlias.cpp \
|
||||||
CommandCrc.cpp \
|
CommandCrc.cpp \
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,7 @@
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
#include "SoeCommand.h"
|
#include "SoeCommand.h"
|
||||||
|
#include "../master/soe_errors.c"
|
||||||
extern const ec_code_msg_t soe_error_codes[];
|
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue