This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 7bfd5e5790a7d5b7070382c82008e73add30fefc Author: Zhe Weng <weng...@xiaomi.com> AuthorDate: Wed Mar 19 10:47:19 2025 +0800 apps/system: Move input/monkey to apps/graphics/input Signed-off-by: Zhe Weng <weng...@xiaomi.com> --- graphics/input/CMakeLists.txt | 33 +++++++++++++++ graphics/input/Kconfig | 48 ++++++++++++++++++++++ graphics/input/Makefile | 26 +++++++++++- {system/input => graphics/input/generator}/input.c | 2 +- {system => graphics/input}/monkey/monkey.c | 2 +- {system => graphics/input}/monkey/monkey.h | 8 ++-- {system => graphics/input}/monkey/monkey_assert.h | 8 ++-- {system => graphics/input}/monkey/monkey_dev.c | 2 +- {system => graphics/input}/monkey/monkey_dev.h | 8 ++-- {system => graphics/input}/monkey/monkey_event.c | 2 +- {system => graphics/input}/monkey/monkey_event.h | 8 ++-- {system => graphics/input}/monkey/monkey_log.c | 2 +- {system => graphics/input}/monkey/monkey_log.h | 8 ++-- {system => graphics/input}/monkey/monkey_main.c | 4 +- {system => graphics/input}/monkey/monkey_proc.c | 2 +- .../input}/monkey/monkey_recorder.c | 2 +- .../input}/monkey/monkey_recorder.h | 8 ++-- {system => graphics/input}/monkey/monkey_type.h | 8 ++-- {system => graphics/input}/monkey/monkey_utils.c | 2 +- {system => graphics/input}/monkey/monkey_utils.h | 8 ++-- system/input/CMakeLists.txt | 35 ---------------- system/input/Kconfig | 28 ------------- system/input/Make.defs | 25 ----------- system/input/Makefile | 32 --------------- system/monkey/CMakeLists.txt | 38 ----------------- system/monkey/Kconfig | 27 ------------ system/monkey/Make.defs | 25 ----------- system/monkey/Makefile | 36 ---------------- 28 files changed, 148 insertions(+), 289 deletions(-) diff --git a/graphics/input/CMakeLists.txt b/graphics/input/CMakeLists.txt index 17d86c80c..57abc0fc6 100644 --- a/graphics/input/CMakeLists.txt +++ b/graphics/input/CMakeLists.txt @@ -23,5 +23,38 @@ if(CONFIG_GRAPHICS_INPUT_GENERATOR) nuttx_add_library(input_generator) file(GLOB CSRCS generator/*.c) + list(REMOVE_ITEM CSRCS ${CMAKE_CURRENT_SOURCE_DIR}/generator/input.c) target_sources(input_generator PRIVATE ${CSRCS}) endif() + +if(CONFIG_GRAPHICS_INPUT_MONKEY) + file(GLOB MONKEY_SRCS monkey/*.c) + list(REMOVE_ITEM MONKEY_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/monkey/monkey_main.c) + set(SRCS monkey/monkey_main.c ${MONKEY_SRCS}) + + nuttx_add_application( + NAME + monkey + PRIORITY + ${CONFIG_GRAPHICS_INPUT_MONKEY_PRIORITY} + STACKSIZE + ${CONFIG_GRAPHICS_INPUT_MONKEY_STACKSIZE} + MODULE + ${CONFIG_GRAPHICS_INPUT_MONKEY} + SRCS + ${SRCS}) +endif() + +if(CONFIG_GRAPHICS_INPUT_TOOL) + nuttx_add_application( + MODULE + ${CONFIG_GRAPHICS_INPUT_TOOL} + NAME + input + STACKSIZE + ${CONFIG_GRAPHICS_INPUT_TOOL_STACKSIZE} + PRIORITY + ${CONFIG_GRAPHICS_INPUT_TOOL_PRIORITY} + SRCS + generator/input.c) +endif() diff --git a/graphics/input/Kconfig b/graphics/input/Kconfig index f4358da94..a2719fc90 100644 --- a/graphics/input/Kconfig +++ b/graphics/input/Kconfig @@ -9,3 +9,51 @@ config GRAPHICS_INPUT_GENERATOR ---help--- This is a simple input generator library that can be used to generate input events for testing graphics applications. + +menuconfig GRAPHICS_INPUT_MONKEY + tristate "Monkey test" + select UINPUT_TOUCH + select UINPUT_BUTTONS + select LIBC_PRINT_EXTENSION + default n + +if GRAPHICS_INPUT_MONKEY + +config GRAPHICS_INPUT_MONKEY_PRIORITY + int "Task priority" + default 110 + +config GRAPHICS_INPUT_MONKEY_STACKSIZE + int "Stack size" + default 4096 + +config GRAPHICS_INPUT_MONKEY_REC_DIR_PATH + string "Recorder directory path" + default "/data/monkey" + +endif + +menuconfig GRAPHICS_INPUT_TOOL + tristate "Enable input tool" + default n + select UINPUT_TOUCH + select UINPUT_BUTTONS + select UINPUT_KEYBOARD + ---help--- + Enable support for a command line input tool. + +if GRAPHICS_INPUT_TOOL + +config GRAPHICS_INPUT_TOOL_STACKSIZE + int "input stack size" + default DEFAULT_TASK_STACKSIZE + ---help--- + The size of stack allocated for the input task. + +config GRAPHICS_INPUT_TOOL_PRIORITY + int "input priority" + default 100 + ---help--- + The priority of the input task. + +endif # GRAPHICS_INPUT_TOOL diff --git a/graphics/input/Makefile b/graphics/input/Makefile index 2fc9e696f..b88166a09 100644 --- a/graphics/input/Makefile +++ b/graphics/input/Makefile @@ -23,7 +23,31 @@ include $(APPDIR)/Make.defs ifneq ($(CONFIG_GRAPHICS_INPUT_GENERATOR),) -CSRCS = $(wildcard generator/*.c) +CSRCS = $(filter-out generator/input.c, $(wildcard generator/*.c)) +endif + +# Monkey test + +ifneq ($(CONFIG_GRAPHICS_INPUT_MONKEY),) +PROGNAME += monkey +PRIORITY += $(CONFIG_GRAPHICS_INPUT_MONKEY_PRIORITY) +STACKSIZE += $(CONFIG_GRAPHICS_INPUT_MONKEY_STACKSIZE) +MODULE += $(CONFIG_GRAPHICS_INPUT_MONKEY) + +MAINSRC += monkey/monkey_main.c + +CSRCS += $(filter-out monkey/monkey_main.c, $(wildcard monkey/*.c)) +endif + +# Input tool + +ifneq ($(CONFIG_GRAPHICS_INPUT_TOOL),) +PROGNAME += input +PRIORITY += $(CONFIG_GRAPHICS_INPUT_TOOL_PRIORITY) +STACKSIZE += $(CONFIG_GRAPHICS_INPUT_TOOL_STACKSIZE) +MODULE += $(CONFIG_GRAPHICS_INPUT_TOOL) + +MAINSRC += generator/input.c endif include $(APPDIR)/Application.mk diff --git a/system/input/input.c b/graphics/input/generator/input.c similarity index 99% rename from system/input/input.c rename to graphics/input/generator/input.c index 94004af93..bf7cab40f 100644 --- a/system/input/input.c +++ b/graphics/input/generator/input.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/input/input.c + * apps/graphics/input/generator/input.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey.c b/graphics/input/monkey/monkey.c similarity index 99% rename from system/monkey/monkey.c rename to graphics/input/monkey/monkey.c index 30a92aaa6..c79e94751 100644 --- a/system/monkey/monkey.c +++ b/graphics/input/monkey/monkey.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey.c + * apps/graphics/input/monkey/monkey.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey.h b/graphics/input/monkey/monkey.h similarity index 95% rename from system/monkey/monkey.h rename to graphics/input/monkey/monkey.h index b86c0d122..ef3be8d90 100644 --- a/system/monkey/monkey.h +++ b/graphics/input/monkey/monkey.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey.h + * apps/graphics/input/monkey/monkey.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_H -#define __APPS_SYSTEM_MONKEY_MONKEY_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_H /**************************************************************************** * Included Files @@ -97,4 +97,4 @@ bool monkey_set_recorder_path(FAR struct monkey_s *monkey, } #endif -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_H */ diff --git a/system/monkey/monkey_assert.h b/graphics/input/monkey/monkey_assert.h similarity index 87% rename from system/monkey/monkey_assert.h rename to graphics/input/monkey/monkey_assert.h index e11773b85..8ff474c28 100644 --- a/system/monkey/monkey_assert.h +++ b/graphics/input/monkey/monkey_assert.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_assert.h + * apps/graphics/input/monkey/monkey_assert.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_ASSERT_H -#define __APPS_SYSTEM_MONKEY_MONKEY_ASSERT_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_ASSERT_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_ASSERT_H /**************************************************************************** * Included Files @@ -36,4 +36,4 @@ #define MONKEY_ASSERT(expr) DEBUGASSERT(expr) #define MONKEY_ASSERT_NULL(ptr) MONKEY_ASSERT(ptr != NULL) -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_ASSERT_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_ASSERT_H */ diff --git a/system/monkey/monkey_dev.c b/graphics/input/monkey/monkey_dev.c similarity index 99% rename from system/monkey/monkey_dev.c rename to graphics/input/monkey/monkey_dev.c index ce3d8e05b..47c1a82f1 100644 --- a/system/monkey/monkey_dev.c +++ b/graphics/input/monkey/monkey_dev.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_dev.c + * apps/graphics/input/monkey/monkey_dev.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey_dev.h b/graphics/input/monkey/monkey_dev.h similarity index 94% rename from system/monkey/monkey_dev.h rename to graphics/input/monkey/monkey_dev.h index dc5dfb7c2..cdfcd4b6c 100644 --- a/system/monkey/monkey_dev.h +++ b/graphics/input/monkey/monkey_dev.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_dev.h + * apps/graphics/input/monkey/monkey_dev.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_DEV_H -#define __APPS_SYSTEM_MONKEY_MONKEY_DEV_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_DEV_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_DEV_H /**************************************************************************** * Included Files @@ -96,4 +96,4 @@ int monkey_dev_get_available(FAR struct monkey_dev_s *devs[], int dev_num); } #endif -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_DEV_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_DEV_H */ diff --git a/system/monkey/monkey_event.c b/graphics/input/monkey/monkey_event.c similarity index 99% rename from system/monkey/monkey_event.c rename to graphics/input/monkey/monkey_event.c index fc0149bf3..3f8239186 100644 --- a/system/monkey/monkey_event.c +++ b/graphics/input/monkey/monkey_event.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_event.c + * apps/graphics/input/monkey/monkey_event.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey_event.h b/graphics/input/monkey/monkey_event.h similarity index 92% rename from system/monkey/monkey_event.h rename to graphics/input/monkey/monkey_event.h index 905b4fe61..f1dc29724 100644 --- a/system/monkey/monkey_event.h +++ b/graphics/input/monkey/monkey_event.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_event.h + * apps/graphics/input/monkey/monkey_event.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_EVENT_H -#define __APPS_SYSTEM_MONKEY_EVENT_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_EVENT_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_EVENT_H /**************************************************************************** * Included Files @@ -76,4 +76,4 @@ bool monkey_event_exec(FAR struct monkey_s *monkey, } #endif -#endif /* __APPS_SYSTEM_MONKEY_EVENT_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_EVENT_H */ diff --git a/system/monkey/monkey_log.c b/graphics/input/monkey/monkey_log.c similarity index 98% rename from system/monkey/monkey_log.c rename to graphics/input/monkey/monkey_log.c index 2eab51d2a..473570578 100644 --- a/system/monkey/monkey_log.c +++ b/graphics/input/monkey/monkey_log.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_log.c + * apps/graphics/input/monkey/monkey_log.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey_log.h b/graphics/input/monkey/monkey_log.h similarity index 94% rename from system/monkey/monkey_log.h rename to graphics/input/monkey/monkey_log.h index e798d887c..30a8c18e0 100644 --- a/system/monkey/monkey_log.h +++ b/graphics/input/monkey/monkey_log.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_log.h + * apps/graphics/input/monkey/monkey_log.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_LOG_H -#define __APPS_SYSTEM_MONKEY_MONKEY_LOG_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_LOG_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_LOG_H /**************************************************************************** * Included Files @@ -105,4 +105,4 @@ enum monkey_log_level_type_e monkey_log_get_level(void); } #endif -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_LOG_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_LOG_H */ diff --git a/system/monkey/monkey_main.c b/graphics/input/monkey/monkey_main.c similarity index 99% rename from system/monkey/monkey_main.c rename to graphics/input/monkey/monkey_main.c index 8ed5b6d07..72fdc6bd4 100644 --- a/system/monkey/monkey_main.c +++ b/graphics/input/monkey/monkey_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_main.c + * apps/graphics/input/monkey/monkey_main.c * * SPDX-License-Identifier: Apache-2.0 * @@ -330,7 +330,7 @@ static FAR struct monkey_s *monkey_init( { monkey_set_mode(monkey, MONKEY_MODE_RECORD); if (!monkey_set_recorder_path(monkey, - CONFIG_SYSTEM_MONKEY_REC_DIR_PATH)) + CONFIG_GRAPHICS_INPUT_MONKEY_REC_DIR_PATH)) { goto failed; } diff --git a/system/monkey/monkey_proc.c b/graphics/input/monkey/monkey_proc.c similarity index 99% rename from system/monkey/monkey_proc.c rename to graphics/input/monkey/monkey_proc.c index d410e025e..9bd0ccd01 100644 --- a/system/monkey/monkey_proc.c +++ b/graphics/input/monkey/monkey_proc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_proc.c + * apps/graphics/input/monkey/monkey_proc.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey_recorder.c b/graphics/input/monkey/monkey_recorder.c similarity index 99% rename from system/monkey/monkey_recorder.c rename to graphics/input/monkey/monkey_recorder.c index 500ec95e6..13a41d8ff 100644 --- a/system/monkey/monkey_recorder.c +++ b/graphics/input/monkey/monkey_recorder.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_recorder.c + * apps/graphics/input/monkey/monkey_recorder.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey_recorder.h b/graphics/input/monkey/monkey_recorder.h similarity index 94% rename from system/monkey/monkey_recorder.h rename to graphics/input/monkey/monkey_recorder.h index 2848538f2..7dee8ae56 100644 --- a/system/monkey/monkey_recorder.h +++ b/graphics/input/monkey/monkey_recorder.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_recorder.h + * apps/graphics/input/monkey/monkey_recorder.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_RECORDER_H -#define __APPS_SYSTEM_MONKEY_MONKEY_RECORDER_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_RECORDER_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_RECORDER_H /**************************************************************************** * Included Files @@ -109,4 +109,4 @@ enum monkey_recorder_res_e monkey_recorder_reset( } #endif -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_RECORDER_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_RECORDER_H */ diff --git a/system/monkey/monkey_type.h b/graphics/input/monkey/monkey_type.h similarity index 94% rename from system/monkey/monkey_type.h rename to graphics/input/monkey/monkey_type.h index e919f67d9..46dc644ad 100644 --- a/system/monkey/monkey_type.h +++ b/graphics/input/monkey/monkey_type.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_type.h + * apps/graphics/input/monkey/monkey_type.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_TYPE_H -#define __APPS_SYSTEM_MONKEY_MONKEY_TYPE_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_TYPE_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_TYPE_H /**************************************************************************** * Included Files @@ -131,4 +131,4 @@ struct monkey_s } playback_ctx; }; -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_TYPE_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_TYPE_H */ diff --git a/system/monkey/monkey_utils.c b/graphics/input/monkey/monkey_utils.c similarity index 99% rename from system/monkey/monkey_utils.c rename to graphics/input/monkey/monkey_utils.c index 640bd28ef..829f81399 100644 --- a/system/monkey/monkey_utils.c +++ b/graphics/input/monkey/monkey_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_utils.c + * apps/graphics/input/monkey/monkey_utils.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/system/monkey/monkey_utils.h b/graphics/input/monkey/monkey_utils.h similarity index 95% rename from system/monkey/monkey_utils.h rename to graphics/input/monkey/monkey_utils.h index 618c0c3a5..59e63b577 100644 --- a/system/monkey/monkey_utils.h +++ b/graphics/input/monkey/monkey_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/monkey/monkey_utils.h + * apps/graphics/input/monkey/monkey_utils.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __APPS_SYSTEM_MONKEY_MONKEY_UTILS_H -#define __APPS_SYSTEM_MONKEY_MONKEY_UTILS_H +#ifndef __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_UTILS_H +#define __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_UTILS_H /**************************************************************************** * Included Files @@ -105,4 +105,4 @@ FAR const char *monkey_event_type2name(enum monkey_event_e event); } #endif -#endif /* __APPS_SYSTEM_MONKEY_MONKEY_UTILS_H */ +#endif /* __APPS_GRAPHICS_INPUT_MONKEY_MONKEY_UTILS_H */ diff --git a/system/input/CMakeLists.txt b/system/input/CMakeLists.txt deleted file mode 100644 index 17d07e6a5..000000000 --- a/system/input/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -# ############################################################################## -# apps/system/input/CMakeLists.txt -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements. See the NOTICE file distributed with this work for -# additional information regarding copyright ownership. The ASF licenses this -# file to you under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. -# -# ############################################################################## - -if(CONFIG_SYSTEM_INPUT) - nuttx_add_application( - MODULE - ${CONFIG_SYSTEM_INPUT} - NAME - input - STACKSIZE - ${CONFIG_SYSTEM_INPUT_STACKSIZE} - PRIORITY - ${CONFIG_SYSTEM_INPUT_PRIORITY} - SRCS - input.c) -endif() diff --git a/system/input/Kconfig b/system/input/Kconfig deleted file mode 100644 index 7e1763643..000000000 --- a/system/input/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menuconfig SYSTEM_INPUT - tristate "Enable input tool" - default n - depends on INPUT_UINPUT - ---help--- - Enable support for a command line input tool. - -if SYSTEM_INPUT - -config SYSTEM_INPUT_STACKSIZE - int "system/input stack size" - default DEFAULT_TASK_STACKSIZE - ---help--- - The size of stack allocated for the input task. - -config SYSTEM_INPUT_PRIORITY - int "input priority" - default 100 - ---help--- - The priority of the input task. - - -endif # SYSTEM_INPUT diff --git a/system/input/Make.defs b/system/input/Make.defs deleted file mode 100644 index e1fe92b7e..000000000 --- a/system/input/Make.defs +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################ -# apps/system/input/Make.defs -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -ifneq ($(CONFIG_SYSTEM_INPUT),) -CONFIGURED_APPS += $(APPDIR)/system/input -endif diff --git a/system/input/Makefile b/system/input/Makefile deleted file mode 100644 index 75c5c6bda..000000000 --- a/system/input/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -# apps/system/input/Makefile -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -include $(APPDIR)/Make.defs - -PROGNAME = input -PRIORITY = $(CONFIG_SYSTEM_INPUT_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_INPUT_STACKSIZE) -MODULE = $(CONFIG_SYSTEM_INPUT) - -MAINSRC = input.c - -include $(APPDIR)/Application.mk diff --git a/system/monkey/CMakeLists.txt b/system/monkey/CMakeLists.txt deleted file mode 100644 index ec7ab1e91..000000000 --- a/system/monkey/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# ############################################################################## -# apps/system/monkey/CMakeLists.txt -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements. See the NOTICE file distributed with this work for -# additional information regarding copyright ownership. The ASF licenses this -# file to you under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. -# -# ############################################################################## - -if(CONFIG_SYSTEM_MONKEY) - file(GLOB CURRENT_SRCS *.c) - list(REMOVE_ITEM CURRENT_SRCS monkey_main.c) - set(SRCS monkey_main.c ${CURRENT_SRCS}) - nuttx_add_application( - NAME - monkey - PRIORITY - ${CONFIG_SYSTEM_MONKEY_PRIORITY} - STACKSIZE - ${CONFIG_SYSTEM_MONKEY_STACKSIZE} - MODULE - ${CONFIG_SYSTEM_MONKEY} - SRCS - ${SRCS}) -endif() diff --git a/system/monkey/Kconfig b/system/monkey/Kconfig deleted file mode 100644 index 9c84a040f..000000000 --- a/system/monkey/Kconfig +++ /dev/null @@ -1,27 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menuconfig SYSTEM_MONKEY - tristate "Monkey test" - select UINPUT_TOUCH - select UINPUT_BUTTONS - select LIBC_PRINT_EXTENSION - default n - -if SYSTEM_MONKEY - -config SYSTEM_MONKEY_PRIORITY - int "Task priority" - default 110 - -config SYSTEM_MONKEY_STACKSIZE - int "Stack size" - default 4096 - -config SYSTEM_MONKEY_REC_DIR_PATH - string "Recorder directory path" - default "/data/monkey" - -endif diff --git a/system/monkey/Make.defs b/system/monkey/Make.defs deleted file mode 100644 index 21e780a77..000000000 --- a/system/monkey/Make.defs +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################ -# apps/system/monkey/Make.defs -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -ifneq ($(CONFIG_SYSTEM_MONKEY),) -CONFIGURED_APPS += $(APPDIR)/system/monkey -endif diff --git a/system/monkey/Makefile b/system/monkey/Makefile deleted file mode 100644 index e7a26a16f..000000000 --- a/system/monkey/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -# apps/system/monkey/Makefile -# -# SPDX-License-Identifier: Apache-2.0 -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. The -# ASF licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -############################################################################ - -include $(APPDIR)/Make.defs - -# Monkey test example - -PROGNAME = monkey -PRIORITY = $(CONFIG_SYSTEM_MONKEY_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_MONKEY_STACKSIZE) -MODULE = $(CONFIG_SYSTEM_MONKEY) - -MAINSRC = monkey_main.c - -CSRCS += $(filter-out monkey_main.c, $(wildcard *.c)) - -include $(APPDIR)/Application.mk