aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig47
-rw-r--r--src/drivers/boards/px4fmuv2/module.mk2
-rw-r--r--src/drivers/boards/px4fmuv2/px4fmu2_led.c2
-rw-r--r--src/drivers/led/led.cpp4
4 files changed, 39 insertions, 16 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index 839d476da..70500e4b0 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -242,6 +242,9 @@ CONFIG_STM32_ADC=y
CONFIG_STM32_SPI=y
CONFIG_STM32_I2C=y
+CONFIG_ARCH_HAVE_LEDS=y
+# CONFIG_ARCH_LEDS is not set
+
#
# Alternate Pin Mapping
#
@@ -274,9 +277,9 @@ CONFIG_USART1_RXDMA=y
# CONFIG_USART2_RS485 is not set
CONFIG_USART2_RXDMA=y
# CONFIG_USART3_RS485 is not set
-CONFIG_USART3_RXDMA=y
+# CONFIG_USART3_RXDMA is not set
# CONFIG_UART4_RS485 is not set
-CONFIG_UART4_RXDMA=y
+# CONFIG_UART4_RXDMA is not set
# CONFIG_UART5_RXDMA is not set
# CONFIG_USART6_RS485 is not set
# CONFIG_USART6_RXDMA is not set
@@ -284,6 +287,26 @@ CONFIG_UART4_RXDMA=y
CONFIG_USART8_RXDMA=y
CONFIG_STM32_USART_SINGLEWIRE=y
+
+# Previous:
+## CONFIG_USART1_RS485 is not set
+#CONFIG_USART1_RXDMA=y
+## CONFIG_USART2_RS485 is not set
+#CONFIG_USART2_RXDMA=y
+## CONFIG_USART3_RS485 is not set
+#CONFIG_USART3_RXDMA=y
+## CONFIG_UART4_RS485 is not set
+#CONFIG_UART4_RXDMA=y
+## CONFIG_UART5_RXDMA is not set
+## CONFIG_USART6_RS485 is not set
+## CONFIG_USART6_RXDMA is not set
+## CONFIG_USART7_RXDMA is not set
+#CONFIG_USART8_RXDMA=y
+#CONFIG_STM32_USART_SINGLEWIRE=y
+
+
+
+
#
# SPI Configuration
#
@@ -525,8 +548,8 @@ CONFIG_NO_SERIAL_CONSOLE=y
#
# USART1 Configuration
#
-CONFIG_USART1_RXBUFSIZE=16
-CONFIG_USART1_TXBUFSIZE=16
+CONFIG_USART1_RXBUFSIZE=512
+CONFIG_USART1_TXBUFSIZE=512
CONFIG_USART1_BAUD=115200
CONFIG_USART1_BITS=8
CONFIG_USART1_PARITY=0
@@ -551,7 +574,7 @@ CONFIG_USART2_OFLOWCONTROL=y
#
CONFIG_USART3_RXBUFSIZE=512
CONFIG_USART3_TXBUFSIZE=512
-CONFIG_USART3_BAUD=115200
+CONFIG_USART3_BAUD=57600
CONFIG_USART3_BITS=8
CONFIG_USART3_PARITY=0
CONFIG_USART3_2STOP=0
@@ -573,9 +596,9 @@ CONFIG_UART4_2STOP=0
#
# USART6 Configuration
#
-CONFIG_USART6_RXBUFSIZE=16
-CONFIG_USART6_TXBUFSIZE=16
-CONFIG_USART6_BAUD=115200
+CONFIG_USART6_RXBUFSIZE=256
+CONFIG_USART6_TXBUFSIZE=256
+CONFIG_USART6_BAUD=57600
CONFIG_USART6_BITS=8
CONFIG_USART6_PARITY=0
CONFIG_USART6_2STOP=0
@@ -585,8 +608,8 @@ CONFIG_USART6_2STOP=0
#
# UART7 Configuration
#
-CONFIG_UART7_RXBUFSIZE=128
-CONFIG_UART7_TXBUFSIZE=128
+CONFIG_UART7_RXBUFSIZE=256
+CONFIG_UART7_TXBUFSIZE=256
CONFIG_UART7_BAUD=57600
CONFIG_UART7_BITS=8
CONFIG_UART7_PARITY=0
@@ -597,8 +620,8 @@ CONFIG_UART7_2STOP=0
#
# UART8 Configuration
#
-CONFIG_UART8_RXBUFSIZE=128
-CONFIG_UART8_TXBUFSIZE=128
+CONFIG_UART8_RXBUFSIZE=256
+CONFIG_UART8_TXBUFSIZE=256
CONFIG_UART8_BAUD=57600
CONFIG_UART8_BITS=8
CONFIG_UART8_PARITY=0
diff --git a/src/drivers/boards/px4fmuv2/module.mk b/src/drivers/boards/px4fmuv2/module.mk
index b405165e1..99d37eeca 100644
--- a/src/drivers/boards/px4fmuv2/module.mk
+++ b/src/drivers/boards/px4fmuv2/module.mk
@@ -3,7 +3,7 @@
#
SRCS = px4fmu_can.c \
- px4fmu_init.c \
+ px4fmu2_init.c \
px4fmu_pwm_servo.c \
px4fmu_spi.c \
px4fmu_usb.c \
diff --git a/src/drivers/boards/px4fmuv2/px4fmu2_led.c b/src/drivers/boards/px4fmuv2/px4fmu2_led.c
index bbf29521b..85177df56 100644
--- a/src/drivers/boards/px4fmuv2/px4fmu2_led.c
+++ b/src/drivers/boards/px4fmuv2/px4fmu2_led.c
@@ -1,6 +1,6 @@
/****************************************************************************
*
- * Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ * Copyright (c) 2013 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/drivers/led/led.cpp b/src/drivers/led/led.cpp
index 04b565358..27e43b245 100644
--- a/src/drivers/led/led.cpp
+++ b/src/drivers/led/led.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
*
- * Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ * Copyright (c) 2013 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -110,7 +110,7 @@ LED *gLED;
}
void
-drv_led_start()
+drv_led_start(void)
{
if (gLED == nullptr) {
gLED = new LED;