summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nuttx/Documentation/NuttXCommercial.html149
-rw-r--r--nuttx/Documentation/NuttXDocumentation.html2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/README.txt9
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ftpc/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/hidkbd/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nettest/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nsh/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nx/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ostest/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig28
-rw-r--r--nuttx/configs/olimex-lpc1766stk/src/up_buttons.c8
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/thttpd/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbserial/defconfig28
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbstorage/defconfig28
14 files changed, 370 insertions, 78 deletions
diff --git a/nuttx/Documentation/NuttXCommercial.html b/nuttx/Documentation/NuttXCommercial.html
index e35a48e382..92ac4190de 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">&nbsp</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>&nbsp</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">&nbsp</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>&nbsp</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 0363db9552..07f39607f9 100644
--- a/nuttx/Documentation/NuttXDocumentation.html
+++ b/nuttx/Documentation/NuttXDocumentation.html
@@ -28,7 +28,7 @@
<tr>
<td>&nbsp</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 69e77c6718..36c2e2387a 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 5d01d7e86d..ce92fb24b3 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 36746d15eb..bdccfa4114 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 8f2f02937d..89d1ad54a7 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 ba1e2133ed..0b058f5b99 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 309bf31acb..1bfe7e0769 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 4f6fc29f08..ba39341000 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 55aca7aec7..b51be7d2c8 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 611ff56401..a6b73b2844 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 61e66a8179..82ed2f8066 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 cb55b85a32..f7b23816fb 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 975bddc8aa..e3f2c0d718 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 12:41:20 +0000