Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated NuttX submodule with memcpy fix, disabled run time stack checkin... #1729

Merged
merged 1 commit into from
Jan 29, 2015
Merged

Updated NuttX submodule with memcpy fix, disabled run time stack checkin... #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuttX
Open in desktop
Submodule NuttX updated from e4c914 to e1e56f
10 changes: 5 additions & 5 deletions makefiles/config_px4fmu-v2_default.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ MODULES += drivers/hil
# MODULES += drivers/hott/hott_sensors
# MODULES += drivers/blinkm
MODULES += drivers/airspeed
# MODULES += drivers/ets_airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed
# MODULES += drivers/frsky_telemetry
MODULES += drivers/frsky_telemetry
MODULES += modules/sensors
# MODULES += drivers/mkblctrl
MODULES += drivers/mkblctrl
MODULES += drivers/px4flow

#
Expand Down Expand Up @@ -70,7 +70,7 @@ MODULES += modules/commander
MODULES += modules/navigator
MODULES += modules/mavlink
MODULES += modules/gpio_led
# MODULES += modules/uavcan
MODULES += modules/uavcan
MODULES += modules/land_detector

#
Expand Down Expand Up @@ -120,7 +120,7 @@ MODULES += lib/launchdetection
#
# OBC challenge
#
# MODULES += modules/bottle_drop
MODULES += modules/bottle_drop

#
# Demo apps
Expand Down
2 changes: 1 addition & 1 deletion nuttx-configs/px4fmu-v1/nsh/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ CONFIG_ARCH_HAVE_MPU=y
#
# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y
CONFIG_ARMV7M_STACKCHECK=y
CONFIG_ARMV7M_STACKCHECK=n
CONFIG_SERIAL_TERMIOS=y

#
Expand Down
2 changes: 1 addition & 1 deletion nuttx-configs/px4fmu-v2/nsh/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ CONFIG_ARCH_HAVE_MPU=y
#
# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y
CONFIG_ARMV7M_STACKCHECK=y
CONFIG_ARMV7M_STACKCHECK=n
CONFIG_SERIAL_TERMIOS=y
CONFIG_SDIO_DMA=y
CONFIG_SDIO_DMAPRIO=0x00010000
Expand Down
2 changes: 1 addition & 1 deletion nuttx-configs/px4io-v1/nsh/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ CONFIG_ARCH_DMA=y
CONFIG_ARCH_MATH_H=y

CONFIG_ARMV7M_CMNVECTOR=y
# CONFIG_ARMV7M_STACKCHECK is not set
CONFIG_ARMV7M_STACKCHECK=n

#
# JTAG Enable settings (by default JTAG-DP and SW-DP are disabled):
Expand Down
2 changes: 1 addition & 1 deletion nuttx-configs/px4io-v2/nsh/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ CONFIG_ARCH_DMA=y
CONFIG_ARCH_MATH_H=y

CONFIG_ARMV7M_CMNVECTOR=y

CONFIG_ARMV7M_STACKCHECK=n
#
# JTAG Enable settings (by default JTAG-DP and SW-DP are disabled):
#
Expand Down