diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-23 01:41:34 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-23 01:41:34 +0000 |
commit | 72dfc599ee8982c845eaec8b8ed9d07b0faa182c (patch) | |
tree | 0b519cef10be0e43ac84d278194ac2eb83d93440 | |
parent | 15ddbb4de95caf78650bd555f7956f172069346b (diff) | |
download | px4-firmware-72dfc599ee8982c845eaec8b8ed9d07b0faa182c.tar.gz px4-firmware-72dfc599ee8982c845eaec8b8ed9d07b0faa182c.tar.bz2 px4-firmware-72dfc599ee8982c845eaec8b8ed9d07b0faa182c.zip |
Documentation update; enabled I2C tool in stm32 nsh2 config
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4509 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r-- | nuttx/Documentation/NuttX.html | 8 | ||||
-rwxr-xr-x | nuttx/configs/stm3210e-eval/README.txt | 3 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/appconfig | 4 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/defconfig | 29 |
4 files changed, 44 insertions, 0 deletions
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 6459fb78b..3b962c399 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -2964,6 +2964,10 @@ buildroot-1.10 2011-05-06 <gnutt@nuttx.org> <ul><table> <tr> <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td> + <td><a href="NuttXGettingStarted.html">Getting Started</a></td> +</tr> +<tr> + <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td> <td><a href="NuttxUserGuide.html">User Guide</a></td> </tr> <tr> @@ -2984,6 +2988,10 @@ buildroot-1.10 2011-05-06 <gnutt@nuttx.org> </tr> <tr> <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td> + <td><a href="NxWidgets.html">NxWidgets</a></td> +</tr> +<tr> + <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td> <td><a href="NuttXDemandPaging.html">Demand Paging</a></td> </tr> <tr> diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt index de6e066a3..0cf7f5cbd 100755 --- a/nuttx/configs/stm3210e-eval/README.txt +++ b/nuttx/configs/stm3210e-eval/README.txt @@ -656,6 +656,8 @@ Where <subdir> is one of the following: Serial Debug output: USART1 Debug output: USART1 Console: NSH output: USART1 NSH output: USART1 (3) ----------- ----------------------- -------------------------------- + I2C No I2C1 + ----------- ----------------------- -------------------------------- microSD Yes Yes Support ----------- ----------------------- -------------------------------- @@ -669,6 +671,7 @@ Where <subdir> is one of the following: Built-in None apps/examples/nx Apps apps/examples/nxhello apps/examples/usbstorage (5) + apps/system/i2c =========== ======================= ================================ (1) You will probably need to modify nsh/setenv.sh or nsh2/setenv.sh diff --git a/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig index ff12c4103..ba078d58a 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/appconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/appconfig @@ -48,6 +48,10 @@ CONFIGURED_APPS += examples/nx CONFIGURED_APPS += examples/nxhello CONFIGURED_APPS += examples/usbstorage +ifeq ($(CONFIG_I2C),y) +CONFIGURED_APPS += system/i2c +endif + # Applications configured as an NX built-in commands ifeq ($(CONFIG_CAN),y) diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 9967cdbf7..5174d5101 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -288,6 +288,14 @@ CONFIG_CAN_TSEG1=12 CONFIG_CAN_TSEG2=3 # +# I2C configuration +# +CONFIG_I2C=y +CONFIG_I2C_POLLED=y +CONFIG_I2C_TRANSFER=y +CONFIG_I2C_TRACE=n + +# # General build options # # CONFIG_RRLOAD_BINARY - make the rrload binary format used with @@ -410,6 +418,7 @@ CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_GRAPHICS=n CONFIG_DEBUG_LCD=n CONFIG_DEBUG_USB=n +CONFIG_DEBUG_I2C=n CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_CAN=n CONFIG_HAVE_CXX=n @@ -1156,6 +1165,26 @@ CONFIG_NSH_MMCSDSPIPORTNO=0 CONFIG_NSH_MMCSDSLOTNO=0 CONFIG_NSH_MMCSDMINOR=0 + +# +# I2C tool settings +# +# CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command +# CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0). +# CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3) +# CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03) +# CONFIG_I2CTOOL_MAXADDR - Largest device address (default: 0x77) +# CONFIG_I2CTOOL_MAXREGADDR - Largest register address (default: 0xff) +# CONFIG_I2CTOOL_DEFFREQ - Default frequency (default: 1000000) +# +CONFIG_I2CTOOL_BUILTIN=y +CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2CTOOL_MAXBUS=2 +#CONFIG_I2CTOOL_MINADDR +#CONFIG_I2CTOOL_MAXADDR +#CONFIG_I2CTOOL_MAXREGADDR +CONFIG_I2CTOOL_DEFFREQ=100000 + # # Settings for examples/usbserial # |