Issues with compiling master branch [Solved]

[3zuli]

Hi guys, I'm having some issues with building the master branch for CF2.
I'm using the virtual machine v0.6. In this VM, the default branch for crazyflie-firmware is "crazyflie2". I want to experiment with the Deck API which is located in master, so as the first step I changed my branch to master and did git pull.
Before changing to "master", the "crazyflie2" branch was able to build successfully.
Now when I try to build the project, or use the Make CLOAD target, I get the following:

Code: Select all

**** Build of configuration Build (GNU) for project crazyflie-firmware ****
make all DEBUG=0 CLOAD=1
  CLEAN_VERSION
  CC    stabilizer.o
  VTMPL version.c
Extracting version information from git
Build 10:d5eb851c07b0 (2015.08.1-10) [1;31mMODIFIED [m
  CC    version.o
make: *** No rule to make target 'modules/src/exptest.c', needed by 'exptest.o'.  Stop.

The files exptest.c and expbrd.c were originally in branch "crazyflie2", but in master they are removed. However, it's still included in the Makefile at line 152:

Code: Select all

# Decks
PROJ_OBJ_CF2 += bigquad.o
PROJ_OBJ_CF2 += exptest.o
PROJ_OBJ_CF2 += ledring12.o

When I simply try commenting out the line with exptest.o, I get even more errors:

Code: Select all

**** Build of configuration Build (GNU) for project crazyflie-firmware ****
make all DEBUG=0 CLOAD=1
  CLEAN_VERSION
  VTMPL version.c
Extracting version information from git
Build 10:d5eb851c07b0 (2015.08.1-10) [1;31mMODIFIED [m
  CC    version.o
  LD    cf2.elf
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: error: cf2.elf uses VFP register arguments, bin/filter.o does not
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: failed to merge target specific data of file bin/filter.o
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: error: cf2.elf uses VFP register arguments, bin/cpuid.o does not
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: failed to merge target specific data of file bin/cpuid.o
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: error: cf2.elf uses VFP register arguments, bin/fp16.o does not
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: failed to merge target specific data of file bin/fp16.o
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: error: cf2.elf uses VFP register arguments, bin/debug.o does not
/home/bitcraze/bin/gcc-arm-none-eabi/bin/../lib/gcc/arm-none-eabi/4.9.3/../../../../arm-none-eabi/bin/ld: failed to merge target specific data of file bin/debug.o
collect2: error: ld returned 1 exit status
tools/make/targets.mk:32: recipe for target 'cf2.elf' failed
make: *** [cf2.elf] Error 1

What should I do? I am pretty new to STM32 programming, so any help is greatly appreciated.

[3zuli]

Ok, it looks like I've solved the problem. All that was needed was a make clean and then build again.