diff options
-rw-r--r-- | nuttx/Documentation/NuttXCommercial.html | 149 | ||||
-rw-r--r-- | nuttx/Documentation/NuttXDocumentation.html | 2 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/README.txt | 9 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/ftpc/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/nettest/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/nsh/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/nx/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/ostest/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig | 28 | ||||
-rw-r--r-- | nuttx/configs/olimex-lpc1766stk/src/up_buttons.c | 8 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/thttpd/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/usbserial/defconfig | 28 | ||||
-rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig | 28 |
14 files changed, 370 insertions, 78 deletions
diff --git a/nuttx/Documentation/NuttXCommercial.html b/nuttx/Documentation/NuttXCommercial.html index e35a48e38..92ac4190d 100644 --- a/nuttx/Documentation/NuttXCommercial.html +++ b/nuttx/Documentation/NuttXCommercial.html @@ -1,74 +1,75 @@ -<html>
-<head>
- <title>NuttX Links</title>
-</head>
-<body background="backgd.gif">
-<table width="100%>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <a href="NuttXLinks.html">
- <img height="20" width="20" src="favicon.ico">
- </a>
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Project Links</b></i></font>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <a href="NuttXDocumentation.html">
- <img height="20" width="20" src="favicon.ico">
- </a>
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Documentation</b></i></font>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <a href="NuttXRelated.html">
- <img height="20" width="20" src="favicon.ico">
- </a>
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Related Projects</b></i></font>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <img height="20" width="20" src="favicon.ico">
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Commercial Sites</b></i></font>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <li><a href="http://www.nx-engineering.com" target="main">NX-Engineering</a></li>
- <li><a href="http://www.raztek-inc.com" target="main">Raztek Solutions</a></li>
- <li><a href="http://www.2g-eng.com" target="top">2G Engineering</a></li>
- <li><a href="http://isotel.eu/Home/" target="top">ISOTEL Research</a></li>
- <li><a href="http://www.dspworks.in/" target="top">DSPWorks</a></li>
- </tr>
- <tr>
- <td colspan="2" align="center" valign="top">
- <a href="http://download.famouswhy.com/nuttx/" target="_blank">
- <img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0">
- </a>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center" valign="top">
- <a href="http://www.fiberdownload.com/Download/26542/NuttX" target="_blank">
- <img src="editor_pick_2.png" alt="NuttX" style="border:0">
- <img src="award2_151_50.png" alt="NuttX" style="border:0">
- </a>
- </td>
- </tr>
-</table>
-</body>
-</html>
+<html> +<head> + <title>NuttX Links</title> +</head> +<body background="backgd.gif"> +<table width="100%> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <a href="NuttXLinks.html"> + <img height="20" width="20" src="favicon.ico"> + </a> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Project Links</b></i></font> + </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <a href="NuttXDocumentation.html"> + <img height="20" width="20" src="favicon.ico"> + </a> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Documentation</b></i></font> + </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <a href="NuttXRelated.html"> + <img height="20" width="20" src="favicon.ico"> + </a> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Related Projects</b></i></font> + </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <img height="20" width="20" src="favicon.ico"> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Commercial Sites</b></i></font> + </td> + </tr> + <tr> + <td> </td> + <td> + <li><a href="http://www.nx-engineering.com" target="main">NX-Engineering</a></li> + <li><a href="http://www.raztek-inc.com" target="main">Raztek Solutions</a></li> + <li><a href="http://www.2g-eng.com" target="top">2G Engineering</a></li> + <li><a href="http://isotel.eu/Home/" target="top">ISOTEL Research</a></li> + <li><a href="http://www.dspworks.in/" target="top">DSPWorks</a></li> + <li><a href="http://www.nx-engineering.com/products.html" target="top">NXWidgets</a></li> + </tr> + <tr> + <td colspan="2" align="center" valign="top"> + <a href="http://download.famouswhy.com/nuttx/" target="_blank"> + <img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0"> + </a> + </td> + </tr> + <tr> + <td colspan="2" align="center" valign="top"> + <a href="http://www.fiberdownload.com/Download/26542/NuttX" target="_blank"> + <img src="editor_pick_2.png" alt="NuttX" style="border:0"> + <img src="award2_151_50.png" alt="NuttX" style="border:0"> + </a> + </td> + </tr> +</table> +</body> +</html> diff --git a/nuttx/Documentation/NuttXDocumentation.html b/nuttx/Documentation/NuttXDocumentation.html index 0363db955..07f39607f 100644 --- a/nuttx/Documentation/NuttXDocumentation.html +++ b/nuttx/Documentation/NuttXDocumentation.html @@ -28,7 +28,7 @@ <tr> <td> </td> <td> - <li><a href="NuttxGettingStarted.html" target="main">Getting Started</a></li> + <li><a href="NuttXGettingStarted.html" target="main">Getting Started</a></li> <li><a href="NuttxUserGuide.html" target="main">User Guide</a></li> <li><a href="NuttxPortingGuide.html" target="main">Porting Guide</a></li> <li><a href="NuttShell.html" target="main">NuttShell (NSH)</a></li> diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt index 69e77c671..36c2e2387 100755 --- a/nuttx/configs/olimex-lpc1766stk/README.txt +++ b/nuttx/configs/olimex-lpc1766stk/README.txt @@ -537,11 +537,18 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator arm-elf-gdb (gdb) target remote localhost:3333 - And you can load the NuttX ELF file: + NOTE: The name of your GDB program may differ. For example, with the + CodeSourcery toolchain, the ARM GDB would be called arm-none-eabi-gdb. + + After starting GDB, you can load the NuttX ELF file: (gdb) symbol-file nuttx (gdb) load nuttx + Loading the symbol-file is only useful if you have built NuttX to + inclulde debug symbols (by setting CONFIG_DEBUG_SYMBOLS=y in the + .config file). + OpenOCD will support several special 'monitor' commands. These GDB commands will send comments to the OpenOCD monitor. Here are a couple that you will need to use: diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig index 5d01d7e86..ce92fb24b 100755 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -877,6 +883,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig index 36746d15e..bdccfa411 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -770,6 +776,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index 8f2f02937..89d1ad54a 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -723,6 +729,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index ba1e2133e..0b058f5b9 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -788,6 +794,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_BUILTIN_APPS - Support external registered, diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 309bf31ac..1bfe7e076 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -879,6 +885,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index 4f6fc29f0..ba3934100 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -715,6 +721,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig index 55aca7aec..b51be7d2c 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -830,6 +836,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c b/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c index 611ff5640..a6b73b284 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_buttons.c @@ -40,10 +40,14 @@ #include <nuttx/config.h> #include <stdint.h> +#include <stdbool.h> +#include <nuttx/arch.h> #include <nuttx/irq.h> #include <arch/board/board.h> + +#include "lpc17_internal.h" #include "lpc1766stk_internal.h" #ifdef CONFIG_ARCH_BUTTONS @@ -189,8 +193,8 @@ xcpt_t up_irqbutton(int id, xcpt_t irqhandler) { /* Return the current button handler and set the new interrupt handler */ - oldhandler = g_buttonisr[id]; - g_buttonisr = irqhandler; + oldhandler = g_buttonisr[id]; + g_buttonisr[id] = irqhandler; /* Disable interrupts until we are done */ diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index 61e66a817..82ed2f806 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -822,6 +828,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig index cb55b85a3..f7b23816f 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -715,6 +721,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig index 975bddc8a..e3f2c0d71 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig @@ -134,6 +134,12 @@ CONFIG_LPC17_DAC=n CONFIG_LPC17_GPDMA=n # +# LPC17xx Button interrupt support +# +CONFIG_GPIO_IRQ=n +CONFIG_ARCH_IRQBUTTONS=n + +# # LPC17xx specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the @@ -715,6 +721,28 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # +# Settings for examples/buttons +# +# CONFIG_EXAMPLE_BUTTONS_MIN and CONFIG_EXAMPLE_BUTTONS_MAX +# Lowest and highest button number (0-7) +# CONFIG_EXAMPLE_IRQBUTTONS_MIN and CONFIG_EXAMPLE_IRQBUTTONS_MAX +# Lowest and highest interrupting button number (-7) +# CONFIG_EXAMPLE_BUTTONS_NAMEn - Name for button n +# +CONFIG_EXAMPLE_BUTTONS_MIN=0 +CONFIG_EXAMPLE_BUTTONS_MAX=7 +CONFIG_EXAMPLE_IRQBUTTONS_MIN=0 +CONFIG_EXAMPLE_IRQBUTTONS_MAX=7 +CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1" +CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2" +CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP" +CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER" +CONFIG_EXAMPLE_BUTTONS_NAME4="UP" +CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN" +CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT" +CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT" + +# # Settings for apps/nshlib # # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer |