Skip to content
Snippets Groups Projects
Commit f51b1d8e authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Merge branch 'master' of gitlab.control.lth.se:anders_blomdell/extctrl2014

parents 1228f407 41335ed7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
mc/Makefile
+ 1
− 2
View file @ f51b1d8e
...@@ -16,7 +16,6 @@ GLOBALIZE=netFuncs \ ...@@ -16,7 +16,6 @@ GLOBALIZE=netFuncs \
hpnet_traffic_activated \ hpnet_traffic_activated \
hpnetObjects hpnetObjects
EXTRA_CFLAGS_hijacknet_lth_net=-I/opt/robot/include
EXTRA_CFLAGS_fei82557End=-Wno-error -Wno-all -Wno-endif-labels EXTRA_CFLAGS_fei82557End=-Wno-error -Wno-all -Wno-endif-labels
EXTRA_CFLAGS_extctrl2014_lc=-I/usr/include/labcomm \ EXTRA_CFLAGS_extctrl2014_lc=-I/usr/include/labcomm \
-DLABCOMM_COMPAT="<labcomm_compat.h>" -DLABCOMM_COMPAT="<labcomm_compat.h>"
...@@ -29,7 +28,7 @@ ROBOTWARE=$(shell [ -n "$(ROBOT)" ] && \ ...@@ -29,7 +28,7 @@ ROBOTWARE=$(shell [ -n "$(ROBOT)" ] && \
../tools/abb_extctrl_setup.py --robot "$(ROBOT)" --robotware) ../tools/abb_extctrl_setup.py --robot "$(ROBOT)" --robotware)
DESTDIR=$(USER) DESTDIR=$(USER)
VPATH = /opt/robot ../common VPATH = ../common
.PRECIOUS: %.c %.h .PRECIOUS: %.c %.h
......
mc/hijacknet_lth_net.mc.c
+ 0
− 1
View file @ f51b1d8e
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <string.h> #include <string.h>
#include <fppLib.h> #include <fppLib.h>
#include <hijacknet.h> #include <hijacknet.h>
#include <lth/lth_net/lth_net.h>
#define LTH_NET_ID (('L' << 8) + ('N')) #define LTH_NET_ID (('L' << 8) + ('N'))
#define ETHERNET_INTERFACE_COUNT 10 #define ETHERNET_INTERFACE_COUNT 10
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment