aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4fmu-v2
diff options
context:
space:
mode:
authorDavid Sidrane <david_s5@nscdg.com>2015-01-07 09:35:41 -1000
committerDavid Sidrane <david_s5@nscdg.com>2015-01-07 09:35:41 -1000
commit6c841f3191ce7096209626bdef57ca660c262e4c (patch)
tree69254abec933fee56971e48c6673afa6c3be0855 /nuttx-configs/px4fmu-v2
parent6a2c0e83d51d98e9484e25bd7ecf24fd451bcf9e (diff)
downloadpx4-firmware-6c841f3191ce7096209626bdef57ca660c262e4c.tar.gz
px4-firmware-6c841f3191ce7096209626bdef57ca660c262e4c.tar.bz2
px4-firmware-6c841f3191ce7096209626bdef57ca660c262e4c.zip
Added Probes
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
-rw-r--r--nuttx-configs/px4fmu-v2/Kconfig18
-rwxr-xr-xnuttx-configs/px4fmu-v2/include/board.h27
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig11
3 files changed, 51 insertions, 5 deletions
diff --git a/nuttx-configs/px4fmu-v2/Kconfig b/nuttx-configs/px4fmu-v2/Kconfig
index ae2bf3130..44013bd73 100644
--- a/nuttx-configs/px4fmu-v2/Kconfig
+++ b/nuttx-configs/px4fmu-v2/Kconfig
@@ -2,3 +2,21 @@
# For a description of the syntax of this configuration file,
# see misc/tools/kconfig-language.txt.
#
+
+if ARCH_BOARD_PX4FMU_V2
+
+config BOARD_HAS_PROBES
+ bool "Board provides GPIO or other Hardware for signaling to timing analyze."
+ default y
+ ---help---
+ This board provides GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers.
+
+config BOARD_USE_PROBES
+ bool "Enable the use the board provided GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers"
+ default n
+ depends on BOARD_HAS_PROBES
+
+ ---help---
+ Select to use GPIO FMU-CH1-6 to provide timing signals from selected drivers.
+
+endif
diff --git a/nuttx-configs/px4fmu-v2/include/board.h b/nuttx-configs/px4fmu-v2/include/board.h
index 679e4b6c0..3c8671f53 100755
--- a/nuttx-configs/px4fmu-v2/include/board.h
+++ b/nuttx-configs/px4fmu-v2/include/board.h
@@ -287,6 +287,33 @@
#define LED_ASSERTION 1
#define LED_PANIC 1
+/* Board provides GPIO or other Hardware for signaling to timing analyzer */
+
+#if defined(CONFIG_BOARD_USE_PROBES)
+# define PROBE_N(n) (1<<((n)-1))
+# define PROBE_1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN14)
+# define PROBE_2 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN13)
+# define PROBE_3 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN11)
+# define PROBE_4 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN9)
+# define PROBE_5 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTD|GPIO_PIN13)
+# define PROBE_6 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTD|GPIO_PIN14)
+
+# define PROBE_INIT(mask) \
+ do { \
+ if ((mask)& PROBE_N(1)) { stm32_configgpio(PROBE_1); } \
+ if ((mask)& PROBE_N(2)) { stm32_configgpio(PROBE_2); } \
+ if ((mask)& PROBE_N(3)) { stm32_configgpio(PROBE_3); } \
+ if ((mask)& PROBE_N(4)) { stm32_configgpio(PROBE_4); } \
+ if ((mask)& PROBE_N(5)) { stm32_configgpio(PROBE_5); } \
+ if ((mask)& PROBE_N(6)) { stm32_configgpio(PROBE_6); } \
+ } while(0)
+
+# define PROBE(n,s) do {stm32_gpiowrite(PROBE_##n,(s));}while(0)
+# define PROBE_MARK(n) PROBE(n,false);PROBE(n,true)
+#endif
+
+
+
/************************************************************************************
* Public Data
************************************************************************************/
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index 0b2b7b018..7a5f98410 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -389,6 +389,9 @@ CONFIG_STM32_I2CTIMEOTICKS=10
#
# SDIO Configuration
#
+# CONFIG_RTC_LSECLOCK is not set
+# CONFIG_RTC_LSICLOCK is not set
+CONFIG_RTC_HSECLOCK=y
#
# USB FS Host Configuration
@@ -477,6 +480,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
#
# Board-Specific Options
#
+CONFIG_BOARD_HAS_PROBES=y
#
# RTOS Features
@@ -490,9 +494,6 @@ CONFIG_USEC_PER_TICK=1000
# CONFIG_SYSTEM_TIME64 is not set
# CONFIG_CLOCK_MONOTONIC is not set
# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=1970
-CONFIG_START_MONTH=1
-CONFIG_START_DAY=1
CONFIG_MAX_WDOGPARMS=2
CONFIG_PREALLOC_WDOGS=50
CONFIG_WDOG_INTRESERVE=4
@@ -618,7 +619,7 @@ CONFIG_SPI_EXCHANGE=y
# CONFIG_I2S is not set
CONFIG_RTC=y
CONFIG_RTC_DATETIME=y
-CONFIG_RTC_HSECLOCK=y
+# CONFIG_RTC_ALARM is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
# CONFIG_TIMER is not set
@@ -638,6 +639,7 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_ARCH_HAVE_SDIO=y
CONFIG_MMCSD_SDIO=y
CONFIG_SDIO_PREFLIGHT=y
+# CONFIG_SDIO_PROBES is not set
# CONFIG_SDIO_MUXBUS is not set
# CONFIG_SDIO_BLOCKSETUP is not set
CONFIG_MTD=y
@@ -810,7 +812,6 @@ CONFIG_UART8_PARITY=0
CONFIG_UART8_2STOP=0
# CONFIG_UART8_IFLOWCONTROL is not set
# CONFIG_UART8_OFLOWCONTROL is not set
-CONFIG_SERIAL_OFLOWCONTROL=y
CONFIG_USBDEV=y
#