[ground_segment] Added NatNet to ivy service

This commit is contained in:
Freek van Tienen
2014-03-10 03:56:34 +01:00
parent 90412e24df
commit baa1fcfd12
4 changed files with 742 additions and 6 deletions
+1
View File
@@ -147,6 +147,7 @@
# /sw/ground_segment/misc
/sw/ground_segment/misc/davis2ivy
/sw/ground_segment/misc/kestrel2ivy
/sw/ground_segment/misc/natnet2ivy
# /sw/airborne/arch/lpc21/test/bootloader
+6 -4
View File
@@ -41,11 +41,11 @@
<program name="Settings (Python)" command="sw/ground_segment/python/settings_app/settingsapp.py"/>
<program name="GPSd position display" command ="sw/ground_segment/tmtc/gpsd2ivy"/>
<program name="GPSd position display" command="sw/ground_segment/tmtc/gpsd2ivy"/>
<program name="Log Plotter" command ="sw/logalizer/plot"/>
<program name="Log Plotter" command="sw/logalizer/plot"/>
<program name="Real-time Plotter" command ="sw/logalizer/plotter"/>
<program name="Real-time Plotter" command="sw/logalizer/plotter"/>
<program name="Log File Player" command="sw/logalizer/play">
<arg flag="-b" variable="ivy_bus"/>
@@ -78,7 +78,9 @@
<program name="Attitude Visualizer" command="sw/tools/attitude_viz.py"/>
<program name="App Server" command="sw/ground_segment/tmtc/app_server"/>
</section>
<program name="NatNet" command="sw/ground_segment/misc/natnet2ivy"/>
</section>
+9 -2
View File
@@ -25,6 +25,7 @@ Q=@
CC = gcc
PAPARAZZI_SRC=../../..
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
@@ -34,11 +35,14 @@ else
LIBRARYS = -s
endif
# Optitrack specific librarys and includes
NATNET_LIBRARYS = $(shell pkg-config glib-2.0 --libs) -lglibivy -lm
INCLUDES += $(shell pkg-config glib-2.0 --cflags) -I$(PAPARAZZI_SRC)/sw/airborne/ -I$(PAPARAZZI_SRC)/sw/include/
all: davis2ivy kestrel2ivy
all: davis2ivy kestrel2ivy natnet2ivy
clean:
$(Q)rm -f *.o davis2ivy kestrel2ivy
$(Q)rm -f *.o davis2ivy kestrel2ivy natnet2ivy
davis2ivy: davis2ivy.o
$(Q)$(CC) -o davis2ivy davis2ivy.o $(LIBRARYS) -livy
@@ -46,6 +50,9 @@ davis2ivy: davis2ivy.o
kestrel2ivy: kestrel2ivy.o
$(Q)$(CC) -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
natnet2ivy: natnet2ivy.o $(PAPARAZZI_SRC)/sw/airborne/math/pprz_geodetic_double.o $(PAPARAZZI_SRC)/sw/airborne/fms/fms_network.o
$(Q)$(CC) -o natnet2ivy natnet2ivy.o pprz_geodetic_double.o fms_network.o $(LIBRARYS) $(NATNET_LIBRARYS) -livy
%.o : %.c
$(Q)$(CC) -c -O2 -Wall $(INCLUDES) $<
File diff suppressed because it is too large Load Diff