Merge branch 'master' of github.com:bitcraze/crazyflie-firmware

bitcraze · Feb 11, 2016 · 71d6ea9 · 71d6ea9
2 parents e482cd8 + da8c450
commit 71d6ea9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -137,7 +137,7 @@ PROJ_OBJ_CF1 += imu_cf1.o pm_f103.o nrf24link.o ow_none.o uart.o
 PROJ_OBJ_CF2 += imu_cf2.o pm_f405.o syslink.o radiolink.o ow_syslink.o proximity.o
 
 # libdw
-PROJ_OBJ_CF2 += libdw.o
+PROJ_OBJ_CF2 += libdw1000.o libdw1000Spi.o
 
 # Modules
 PROJ_OBJ += system.o comm.o console.o pid.o crtpservice.o param.o mem.o

diff --git a/vendor/libdw1000 b/vendor/libdw1000
+2 −2		Makefile
+5 −118		inc/libdw1000.h
+47 −0		inc/libdw1000Spi.h
+128 −0		inc/libdw1000Types.h
+3 −131		src/libdw1000.c
+83 −0		src/libdw1000Spi.c
+345 −0		test/TestLibdw1000.c
+3 −1		test/TestLibdw1000Static.c
+211 −0		test/TestSpiUtils.c
+19 −0		test/dwTestOps.h
+4 −2		tools/test/gcc.yml