zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul

sbg
Lorenz Meier 11 years ago
parent
8e7722f894 edffb2eede
commit
1089c9516a
6 changed files with 4 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      NuttX
  2. 2
      nuttx-configs/aerocore/nsh/defconfig
  3. 2
      nuttx-configs/px4fmu-v1/nsh/defconfig
  4. 2
      nuttx-configs/px4fmu-v2/nsh/defconfig
  5. 1
      nuttx-configs/px4io-v1/nsh/defconfig
  6. 1
      nuttx-configs/px4io-v2/nsh/defconfig

2
NuttX

@ -1 +1 @@
Subproject commit 088146b90eee5b614ea6386a64dae343a49a5172 Subproject commit 41fffa0df192e4a26d2325c7ac5d9b5d7ba0211c

2
nuttx-configs/aerocore/nsh/defconfig
Unescape View File

@ -314,7 +314,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
# CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_IRQPRIO is not set
# CONFIG_CUSTOM_STACK is not set # CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set # CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y

2
nuttx-configs/px4fmu-v1/nsh/defconfig
Unescape View File

@ -309,7 +309,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
# CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_IRQPRIO is not set
# CONFIG_CUSTOM_STACK is not set # CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set # CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y

2
nuttx-configs/px4fmu-v2/nsh/defconfig
Unescape View File

@ -350,7 +350,7 @@ CONFIG_SDIO_PRI=128
# CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_IRQPRIO is not set
# CONFIG_CUSTOM_STACK is not set # CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set # CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y

1
nuttx-configs/px4io-v1/nsh/defconfig
Unescape View File

@ -83,7 +83,6 @@ CONFIG_ARCH_BOARD="px4io-v1"
CONFIG_BOARD_LOOPSPERMSEC=2000 CONFIG_BOARD_LOOPSPERMSEC=2000
CONFIG_DRAM_SIZE=0x00002000 CONFIG_DRAM_SIZE=0x00002000
CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_INTERRUPTSTACK=n
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_BOOTLOADER=n CONFIG_ARCH_BOOTLOADER=n

1
nuttx-configs/px4io-v2/nsh/defconfig
Unescape View File

@ -79,7 +79,6 @@ CONFIG_ARCH_BOARD_PX4IO_V2=y
CONFIG_BOARD_LOOPSPERMSEC=2000 CONFIG_BOARD_LOOPSPERMSEC=2000
CONFIG_DRAM_SIZE=0x00002000 CONFIG_DRAM_SIZE=0x00002000
CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_INTERRUPTSTACK=n
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_BOOTLOADER=n CONFIG_ARCH_BOOTLOADER=n

Write Preview
Loading…
Cancel
Save