sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples: Fit INPUT related configs to new naming template

Browse Source
This commit is contained in:
Gustavo Henrique Nihei 2021-04-08 06:50:31 -03:00 committed by Alan Carvalho de Assis
parent e6df9f55f1
commit 62e0c2451b
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ajoystick/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_AJOYSTICK
tristate "Analog joystick example"
default n
depends on AJOYSTICK
depends on INPUT_AJOYSTICK
---help---
Enable the analog joystick example

2
examples/buttons/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_BUTTONS
tristate "Buttons driver example"
default n
depends on BUTTONS
depends on INPUT_BUTTONS
---help---
Enable the Buttons drivers example

27
examples/buttons/buttons_main.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* examples/buttons/buttons_main.c
* apps/examples/buttons/buttons_main.c
*
* Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -55,20 +55,20 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef CONFIG_BUTTONS
# error "CONFIG_BUTTONS is not defined in the configuration"
#ifndef CONFIG_INPUT_BUTTONS
# error "CONFIG_INPUT_BUTTONS is not defined in the configuration"
#endif
#ifndef CONFIG_BUTTONS_NPOLLWAITERS
# define CONFIG_BUTTONS_NPOLLWAITERS 2
#ifndef CONFIG_INPUT_BUTTONS_NPOLLWAITERS
# define CONFIG_INPUT_BUTTONS_NPOLLWAITERS 2
#endif
#ifndef CONFIG_EXAMPLES_BUTTONS_SIGNO
# define CONFIG_EXAMPLES_BUTTONS_SIGNO 13
#endif
#ifndef CONFIG_BUTTONS_POLL_DELAY
# define CONFIG_BUTTONS_POLL_DELAY 1000
#ifndef CONFIG_INPUT_BUTTONS_POLL_DELAY
# define CONFIG_INPUT_BUTTONS_POLL_DELAY 1000
#endif
#ifndef CONFIG_EXAMPLES_BUTTONS_NAME0
@ -158,7 +158,7 @@ static bool g_button_daemon_started;
static int button_daemon(int argc, char *argv[])
{
#ifdef CONFIG_EXAMPLES_BUTTONS_POLL
struct pollfd fds[CONFIG_BUTTONS_NPOLLWAITERS];
struct pollfd fds[CONFIG_INPUT_BUTTONS_NPOLLWAITERS];
#endif
#ifdef CONFIG_EXAMPLES_BUTTONS_SIGNAL
@ -271,7 +271,8 @@ static int button_daemon(int argc, char *argv[])
#ifdef CONFIG_EXAMPLES_BUTTONS_POLL
/* Prepare the File Descriptor for poll */
memset(fds, 0, sizeof(struct pollfd)*CONFIG_BUTTONS_NPOLLWAITERS);
memset(fds, 0,
sizeof(struct pollfd)*CONFIG_INPUT_BUTTONS_NPOLLWAITERS);
fds[0].fd = fd;
fds[0].events = POLLIN;
@ -279,8 +280,8 @@ static int button_daemon(int argc, char *argv[])
timeout = false;
pollin = false;
ret = poll(fds, CONFIG_BUTTONS_NPOLLWAITERS,
CONFIG_BUTTONS_POLL_DELAY);
ret = poll(fds, CONFIG_INPUT_BUTTONS_NPOLLWAITERS,
CONFIG_INPUT_BUTTONS_POLL_DELAY);
printf("\nbutton_daemon: poll returned: %d\n", ret);
if (ret < 0)
@ -293,7 +294,7 @@ static int button_daemon(int argc, char *argv[])
printf("button_daemon: Timeout\n");
timeout = true;
}
else if (ret > CONFIG_BUTTONS_NPOLLWAITERS)
else if (ret > CONFIG_INPUT_BUTTONS_NPOLLWAITERS)
{
printf("button_daemon: ERROR poll reported: %d\n", errno);
}
@ -304,7 +305,7 @@ static int button_daemon(int argc, char *argv[])
/* In any event, read until the pipe is empty */
for (i = 0; i < CONFIG_BUTTONS_NPOLLWAITERS; i++)
for (i = 0; i < CONFIG_INPUT_BUTTONS_NPOLLWAITERS; i++)
{
do
{

2
examples/djoystick/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_DJOYSTICK
tristate "Discrete joystick example"
default n
depends on DJOYSTICK
depends on INPUT_DJOYSTICK
---help---
Enable the discrete joystick example

4
examples/touchscreen/tc_main.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* examples/touchscreen/tc_main.c
* apps/examples/touchscreen/tc_main.c
*
* Copyright (C) 2011, 2014-2025 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -172,7 +172,7 @@ int main(int argc, FAR char *argv[])
printf(" buttons : %02x\n", sample.buttons);
printf(" x : %d\n", sample.x);
printf(" y : %d\n", sample.y);
#ifdef CONFIG_MOUSE_WHEEL
#ifdef CONFIG_INPUT_MOUSE_WHEEL
printf(" wheel : %d\n", sample.wheel);
#endif
}

2
graphics/pdcurs34/nuttx/Kconfig
View File

@ -168,7 +168,7 @@ config PDCURSES_DJOYSTICK
bool "Discrete Joystick"
default n
select PDCURSES_HAVE_INPUT
depends on DJOYSTICK
depends on INPUT_DJOYSTICK
config PDCURSES_DJOYDEV
string "Discrete Joystick Device"