Merge remote-tracking branch 'upstream/master'

- Mikrokopter BLCTRL seems to be updated
 - HMC5883L calibration problem has been corrected.
    (This is because of RAM mis allocation?)
    See https://groups.google.com/forum/?fromgroups#!topic/px4users/yTYJiDBBKfo
 - Fixed wing control updated
    https://groups.google.com/forum/?fromgroups#!topic/px4users/s7owpvZN8UI
 - GPIO module has been removed.
 - STM32 DRV updated
This commit is contained in:
Hyon Lim (Retina)
2013-05-28 11:09:58 +10:00
9 changed files with 635 additions and 263 deletions
+1
View File
@@ -56,6 +56,7 @@ MODULES += systemcmds/tests
MODULES += modules/commander
MODULES += modules/mavlink
MODULES += modules/mavlink_onboard
MODULES += modules/gpio_led
#
# Estimation modules (EKF / other filters)
+4 -3
View File
@@ -219,7 +219,7 @@ endef
define PRELINK
@$(ECHO) "PRELINK: $1"
@$(MKDIR) -p $(dir $1)
$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
$(Q) $(LD) -Ur -Map $1.map -o $1 $2 && $(OBJCOPY) --localize-hidden $1
endef
# Update the archive $1 with the files in $2
@@ -235,7 +235,7 @@ endef
define LINK
@$(ECHO) "LINK: $1"
@$(MKDIR) -p $(dir $1)
$(Q) $(LD) $(LDFLAGS) -o $1 --start-group $2 $(LIBS) $(EXTRA_LIBS) $(LIBGCC) --end-group
$(Q) $(LD) $(LDFLAGS) -Map $1.map -o $1 --start-group $2 $(LIBS) $(EXTRA_LIBS) $(LIBGCC) --end-group
endef
# Convert $1 from a linked object to a raw binary in $2
@@ -280,6 +280,7 @@ define BIN_TO_OBJ
$(Q) $(OBJCOPY) $2 \
--redefine-sym $(call BIN_SYM_PREFIX,$1)_start=$3 \
--redefine-sym $(call BIN_SYM_PREFIX,$1)_size=$3_len \
--strip-symbol $(call BIN_SYM_PREFIX,$1)_end
--strip-symbol $(call BIN_SYM_PREFIX,$1)_end \
--rename-section .data=.rodata
$(Q) $(REMOVE) $2.c $2.c.o
endef