diff --git a/examples/asymcute_mqttsn/Makefile b/examples/asymcute_mqttsn/Makefile index eaac05ff3d..6fb7001e9f 100644 --- a/examples/asymcute_mqttsn/Makefile +++ b/examples/asymcute_mqttsn/Makefile @@ -17,7 +17,7 @@ USEMODULE += gnrc_ipv6_default USEMODULE += asymcute # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # For testing we also include the ping command and some stats USEMODULE += gnrc_icmpv6_echo diff --git a/examples/benchmark_udp/Makefile b/examples/benchmark_udp/Makefile index d7444b1088..1417b39d2c 100644 --- a/examples/benchmark_udp/Makefile +++ b/examples/benchmark_udp/Makefile @@ -23,7 +23,7 @@ endif # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += netstats_l2 USEMODULE += netstats_ipv6 diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile index a225bccf96..1d980407ed 100644 --- a/examples/ccn-lite-relay/Makefile +++ b/examples/ccn-lite-relay/Makefile @@ -27,7 +27,7 @@ QUIET ?= 1 USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # Include packages that pull up and auto-init the link layer. # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present USEMODULE += netdev_default diff --git a/examples/cord_ep/Makefile b/examples/cord_ep/Makefile index 19cea30150..044764ea63 100644 --- a/examples/cord_ep/Makefile +++ b/examples/cord_ep/Makefile @@ -15,7 +15,7 @@ USEMODULE += gnrc_icmpv6_echo USEMODULE += cord_ep_standalone USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += fmt diff --git a/examples/cord_lc/Makefile b/examples/cord_lc/Makefile index 26ce10729b..3bcc0e6de9 100644 --- a/examples/cord_lc/Makefile +++ b/examples/cord_lc/Makefile @@ -15,7 +15,7 @@ USEMODULE += gnrc_icmpv6_echo USEMODULE += cord_lc USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # The default size of GCOAP_PDU_BUF_SIZE can be too small for the response diff --git a/examples/default/Makefile b/examples/default/Makefile index 467c36f3f8..4442f7e724 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -29,7 +29,7 @@ QUIET ?= 1 # Modules to include: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # include and auto-initialize all available sensors USEMODULE += saul_default diff --git a/examples/dtls-echo/Makefile b/examples/dtls-echo/Makefile index 87053dad83..cd9f8d3054 100644 --- a/examples/dtls-echo/Makefile +++ b/examples/dtls-echo/Makefile @@ -17,7 +17,7 @@ USEMODULE += sock_udp # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEPKG += tinydtls # tinydtls needs crypto secure PRNG diff --git a/examples/dtls-sock/Makefile b/examples/dtls-sock/Makefile index fa10cb2358..1252275dbb 100644 --- a/examples/dtls-sock/Makefile +++ b/examples/dtls-sock/Makefile @@ -32,7 +32,7 @@ USEMODULE += prng_sha1prng # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # UDP Port to use (20220 is default for DTLS). DTLS_PORT ?= 20220 diff --git a/examples/dtls-wolfssl/Makefile b/examples/dtls-wolfssl/Makefile index 3d1068aa2f..cbfc1db36c 100644 --- a/examples/dtls-wolfssl/Makefile +++ b/examples/dtls-wolfssl/Makefile @@ -17,7 +17,7 @@ USEMODULE += sock_udp # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEPKG += wolfssl USEMODULE += wolfcrypt diff --git a/examples/emcute_mqttsn/Makefile b/examples/emcute_mqttsn/Makefile index 254c8339e7..218d7cb621 100644 --- a/examples/emcute_mqttsn/Makefile +++ b/examples/emcute_mqttsn/Makefile @@ -17,7 +17,7 @@ USEMODULE += gnrc_ipv6_default USEMODULE += emcute # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # For testing we also include the ping command and some stats USEMODULE += gnrc_icmpv6_echo diff --git a/examples/filesystem/Makefile b/examples/filesystem/Makefile index c5c821c932..a4805be0cb 100644 --- a/examples/filesystem/Makefile +++ b/examples/filesystem/Makefile @@ -21,7 +21,7 @@ QUIET ?= 1 # Modules to include: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Use the default file system diff --git a/examples/gcoap/Makefile b/examples/gcoap/Makefile index bcb3c4731e..8fb9e795f4 100644 --- a/examples/gcoap/Makefile +++ b/examples/gcoap/Makefile @@ -35,7 +35,7 @@ USEMODULE += fmt USEMODULE += netutils # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Comment this out to disable code in RIOT that does safety checking diff --git a/examples/gcoap/Makefile.slip b/examples/gcoap/Makefile.slip index aab6cda8f3..cbef8accf3 100644 --- a/examples/gcoap/Makefile.slip +++ b/examples/gcoap/Makefile.slip @@ -53,7 +53,7 @@ USEMODULE += od USEMODULE += fmt # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Comment this out to disable code in RIOT that does safety checking diff --git a/examples/gcoap_block_server/Makefile b/examples/gcoap_block_server/Makefile index d4e2c6b26a..f54a91b7df 100644 --- a/examples/gcoap_block_server/Makefile +++ b/examples/gcoap_block_server/Makefile @@ -33,7 +33,7 @@ USEMODULE += fmt USEMODULE += hashes # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Comment this out to disable code in RIOT that does safety checking diff --git a/examples/gcoap_dtls/Makefile b/examples/gcoap_dtls/Makefile index b11e58fc10..078c224838 100644 --- a/examples/gcoap_dtls/Makefile +++ b/examples/gcoap_dtls/Makefile @@ -35,7 +35,7 @@ USEMODULE += fmt USEMODULE += netutils # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Comment this out to disable code in RIOT that does safety checking diff --git a/examples/gcoap_fileserver/Makefile b/examples/gcoap_fileserver/Makefile index 96a6aac045..cf43ba75d3 100644 --- a/examples/gcoap_fileserver/Makefile +++ b/examples/gcoap_fileserver/Makefile @@ -17,7 +17,7 @@ QUIET ?= 1 # Modules to include: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # enable the fileserver module USEMODULE += gcoap_fileserver diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile index bd73d1c6b2..8ed6bbc4e4 100644 --- a/examples/gnrc_border_router/Makefile +++ b/examples/gnrc_border_router/Makefile @@ -29,7 +29,7 @@ USEMODULE += gnrc_sixlowpan_border_router_default USEMODULE += gnrc_icmpv6_echo # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Optionally include RPL as a routing protocol. When includede gnrc_uhcpc will diff --git a/examples/gnrc_lorawan/Makefile b/examples/gnrc_lorawan/Makefile index ba91058a15..b3ea8d2fab 100644 --- a/examples/gnrc_lorawan/Makefile +++ b/examples/gnrc_lorawan/Makefile @@ -20,7 +20,7 @@ USEMODULE += gnrc_pktdump # Include the shell and shell commands. USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # Use GNRC Txtsnd to transmit LoRaWAN from the shell USEMODULE += gnrc_txtsnd diff --git a/examples/gnrc_networking/Makefile b/examples/gnrc_networking/Makefile index 202d1eb080..df2cb0ddcc 100644 --- a/examples/gnrc_networking/Makefile +++ b/examples/gnrc_networking/Makefile @@ -20,10 +20,10 @@ USEMODULE += gnrc_rpl USEMODULE += auto_init_gnrc_rpl # Additional networking modules that can be dropped if not needed USEMODULE += gnrc_icmpv6_echo -USEMODULE += gnrc_udp_cmd +USEMODULE += shell_cmd_gnrc_udp # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += netstats_l2 USEMODULE += netstats_ipv6 diff --git a/examples/gnrc_networking_mac/Makefile b/examples/gnrc_networking_mac/Makefile index 366fd9cda3..4019f71a32 100644 --- a/examples/gnrc_networking_mac/Makefile +++ b/examples/gnrc_networking_mac/Makefile @@ -31,7 +31,7 @@ USEMODULE += gnrc_pktdump USEMODULE += gnrc_icmpv6_echo # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += netstats_l2 USEMODULE += netstats_ipv6 diff --git a/examples/gnrc_networking_subnets/Makefile b/examples/gnrc_networking_subnets/Makefile index 7aa8f80a66..192000cbdf 100644 --- a/examples/gnrc_networking_subnets/Makefile +++ b/examples/gnrc_networking_subnets/Makefile @@ -20,7 +20,7 @@ USEMODULE += gnrc_pktdump USEMODULE += gnrc_icmpv6_echo # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += netstats_l2 USEMODULE += netstats_ipv6 diff --git a/examples/ndn-ping/Makefile b/examples/ndn-ping/Makefile index 278dfebf43..c84643b0f8 100644 --- a/examples/ndn-ping/Makefile +++ b/examples/ndn-ping/Makefile @@ -12,7 +12,7 @@ USEMODULE += netdev_default USEMODULE += auto_init_gnrc_netif USEMODULE += random USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEPKG += ndn-riot diff --git a/examples/paho-mqtt/Makefile b/examples/paho-mqtt/Makefile index bf1570ff40..e6e6c2e083 100644 --- a/examples/paho-mqtt/Makefile +++ b/examples/paho-mqtt/Makefile @@ -28,7 +28,7 @@ ifneq (,$(DEFAULT_MQTT_PWD)) endif USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += netdev_default USEPKG += paho-mqtt diff --git a/examples/posix_sockets/Makefile b/examples/posix_sockets/Makefile index 92ccca172c..eaa8a27edc 100644 --- a/examples/posix_sockets/Makefile +++ b/examples/posix_sockets/Makefile @@ -19,7 +19,7 @@ USEMODULE += posix_sleep USEMODULE += posix_inet # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Comment this out to disable code in RIOT that does safety checking diff --git a/examples/saul/Makefile b/examples/saul/Makefile index 7f2ca1e297..ca121d835a 100644 --- a/examples/saul/Makefile +++ b/examples/saul/Makefile @@ -11,7 +11,7 @@ RIOTBASE ?= $(CURDIR)/../.. USEMODULE += saul_default # include the shell: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # additional modules for debugging: USEMODULE += ps diff --git a/examples/suit_update/Makefile b/examples/suit_update/Makefile index 28a7ec0c56..8d61ced457 100644 --- a/examples/suit_update/Makefile +++ b/examples/suit_update/Makefile @@ -25,7 +25,7 @@ USEMODULE += gnrc_icmpv6_echo # include this for printing IP addresses USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # Set this to 1 to enable code in RIOT that does safety checking # which is not needed in a production environment but helps in the diff --git a/examples/telnet_server/Makefile b/examples/telnet_server/Makefile index 07d2664125..a865188ddf 100644 --- a/examples/telnet_server/Makefile +++ b/examples/telnet_server/Makefile @@ -30,7 +30,7 @@ endif USEMODULE += netutils # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include the telnet server USEMODULE += stdio_telnet diff --git a/examples/twr_aloha/Makefile b/examples/twr_aloha/Makefile index 15114d03c4..94a79a03ca 100644 --- a/examples/twr_aloha/Makefile +++ b/examples/twr_aloha/Makefile @@ -32,7 +32,7 @@ USEMODULE += uwb-core_twr_ds_ext # System modules used by this application USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += l2util USEMODULE += event_callback diff --git a/examples/twr_aloha/app.config.test b/examples/twr_aloha/app.config.test index 9a6860d329..42c4e643b4 100644 --- a/examples/twr_aloha/app.config.test +++ b/examples/twr_aloha/app.config.test @@ -7,7 +7,7 @@ CONFIG_MODULE_UWB-CORE_TWR_SS_EXT=y CONFIG_MODULE_UWB-CORE_TWR_DS=y CONFIG_MODULE_UWB-CORE_TWR_DS_EXT=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_PS=y CONFIG_MODULE_L2UTIL=y CONFIG_MODULE_EVENT_PERIODIC=y diff --git a/examples/wakaama/Makefile b/examples/wakaama/Makefile index 5a3f3fd38b..741773e8e4 100644 --- a/examples/wakaama/Makefile +++ b/examples/wakaama/Makefile @@ -19,7 +19,7 @@ USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_icmpv6_echo # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Comment this out to disable code in RIOT that does safety checking diff --git a/makefiles/deprecated_modules.inc.mk b/makefiles/deprecated_modules.inc.mk index 13973e94c5..5b98baaaef 100644 --- a/makefiles/deprecated_modules.inc.mk +++ b/makefiles/deprecated_modules.inc.mk @@ -2,5 +2,15 @@ # Keep this list ALPHABETICALLY SORTED!!!!111elven DEPRECATED_MODULES += event_thread_lowest DEPRECATED_MODULES += gnrc_netdev_default +DEPRECATED_MODULES += gnrc_pktbuf_cmd # use shell_cmd_gnrc_pktbuf instead +DEPRECATED_MODULES += gnrc_udp_cmd # use shell_cmd_grnc_udp instead +DEPRECATED_MODULES += heap_cmd # use shell_cmd_heap instead +DEPRECATED_MODULES += i2c_scan # use shell_cmd_i2c_scan instead +DEPRECATED_MODULES += md5sum # use shell_cmd_md5sum instead +DEPRECATED_MODULES += nice # use shell_cmd_nice instead +DEPRECATED_MODULES += random_cmd # use shell_cmd_random instead DEPRECATED_MODULES += sema_deprecated +DEPRECATED_MODULES += shell_commands # use shell_cmds_default instead +DEPRECATED_MODULES += sha1sum # use shell_cmd_sha1sum instead +DEPRECATED_MODULES += sha256sum # use shell_cmd_sha256sum instead DEPRECATED_MODULES += ztimer_now64 diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk index 1cce447193..aefc778d83 100644 --- a/makefiles/pseudomodules.inc.mk +++ b/makefiles/pseudomodules.inc.mk @@ -211,6 +211,53 @@ PSEUDOMODULES += senml_phydat PSEUDOMODULES += senml_saul PSEUDOMODULES += sha1sum PSEUDOMODULES += sha256sum +PSEUDOMODULES += shell_cmd_app_metadata +PSEUDOMODULES += shell_cmd_at30tse75x +PSEUDOMODULES += shell_cmd_benchmark_udp +PSEUDOMODULES += shell_cmd_ccn-lite-utils +PSEUDOMODULES += shell_cmd_conn_can +PSEUDOMODULES += shell_cmd_cord_ep +PSEUDOMODULES += shell_cmd_cryptoauthlib +PSEUDOMODULES += shell_cmd_dfplayer +PSEUDOMODULES += shell_cmd_fib +PSEUDOMODULES += shell_cmd_gnrc_icmpv6_echo +PSEUDOMODULES += shell_cmd_gnrc_ipv6_blacklist +PSEUDOMODULES += shell_cmd_gnrc_ipv6_frag_stats +PSEUDOMODULES += shell_cmd_gnrc_ipv6_nib +PSEUDOMODULES += shell_cmd_gnrc_ipv6_whitelist +PSEUDOMODULES += shell_cmd_gnrc_netif +PSEUDOMODULES += shell_cmd_gnrc_pktbuf +PSEUDOMODULES += shell_cmd_gnrc_rpl +PSEUDOMODULES += shell_cmd_gnrc_sixlowpan_ctx +PSEUDOMODULES += shell_cmd_gnrc_sixlowpan_frag_stats +PSEUDOMODULES += shell_cmd_gnrc_udp +PSEUDOMODULES += shell_cmd_heap +PSEUDOMODULES += shell_cmd_i2c_scan +PSEUDOMODULES += shell_cmd_lwip_netif +PSEUDOMODULES += shell_cmd_mci +PSEUDOMODULES += shell_cmd_md5sum +PSEUDOMODULES += shell_cmd_nanocoap_vfs +PSEUDOMODULES += shell_cmd_netstats_neighbor +PSEUDOMODULES += shell_cmd_nice +PSEUDOMODULES += shell_cmd_nimble_netif +PSEUDOMODULES += shell_cmd_nimble_statconn +PSEUDOMODULES += shell_cmd_openwsn +PSEUDOMODULES += shell_cmd_pm +PSEUDOMODULES += shell_cmd_ps +PSEUDOMODULES += shell_cmd_random +PSEUDOMODULES += shell_cmd_rtc +PSEUDOMODULES += shell_cmd_rtt +PSEUDOMODULES += shell_cmd_saul_reg +PSEUDOMODULES += shell_cmd_semtech-loramac +PSEUDOMODULES += shell_cmd_sha1sum +PSEUDOMODULES += shell_cmd_sha256sum +PSEUDOMODULES += shell_cmd_sht1x +PSEUDOMODULES += shell_cmd_sntp +PSEUDOMODULES += shell_cmd_suit +PSEUDOMODULES += shell_cmd_sys +PSEUDOMODULES += shell_cmd_vfs +PSEUDOMODULES += shell_cmds_default +PSEUDOMODULES += shell_commands PSEUDOMODULES += shell_hooks PSEUDOMODULES += shell_lock_auto_locking PSEUDOMODULES += slipdev_stdio diff --git a/sys/Makefile b/sys/Makefile index c8f1853a4a..d483fc0b53 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -182,8 +182,8 @@ endif ifneq (,$(filter skald,$(USEMODULE))) DIRS += net/ble/skald endif -ifneq (,$(filter shell_commands,$(USEMODULE))) - DIRS += shell/commands +ifneq (,$(filter shell_cmds,$(USEMODULE))) + DIRS += shell/cmds endif ifneq (,$(filter suit%,$(USEMODULE))) DIRS += suit diff --git a/sys/Makefile.dep b/sys/Makefile.dep index 6f9e55a935..e15977a0bb 100644 --- a/sys/Makefile.dep +++ b/sys/Makefile.dep @@ -57,10 +57,6 @@ ifneq (,$(filter fmt_table,$(USEMODULE))) USEMODULE += fmt endif -ifneq (,$(filter i2c_scan,$(USEMODULE))) - FEATURES_REQUIRED += periph_i2c -endif - ifneq (,$(filter prng_fortuna,$(USEMODULE))) USEMODULE += crypto_aes_128 endif @@ -88,10 +84,6 @@ ifneq (,$(filter ieee802154_security,$(USEMODULE))) USEMODULE += cipher_modes endif -ifneq (,$(filter rtt_cmd,$(USEMODULE))) - FEATURES_REQUIRED += periph_rtt -endif - ifneq (,$(filter trace,$(USEMODULE))) USEMODULE += ztimer USEMODULE += ztimer_usec @@ -289,8 +281,25 @@ ifneq (,$(filter posix_sockets,$(USEMODULE))) USEMODULE += posix_headers endif -ifneq (,$(filter shell,$(USEMODULE))) +ifneq (,$(filter md5sum ,$(USEMODULE))) + USEMODULE += shell_cmd_md5sum +endif + +ifneq (,$(filter sha1sum,$(USEMODULE))) + USEMODULE += shell_cmd_sha1sum +endif + +ifneq (,$(filter sha256sum,$(USEMODULE))) + USEMODULE += shell_cmd_sha256sum +endif + +ifneq (,$(filter random_cmd,$(USEMODULE))) + USEMODULE += shell_cmd_random +endif + +ifneq (,$(filter shell%,$(USEMODULE))) USEMODULE += stdin + include $(RIOTBASE)/sys/shell/Makefile.dep endif # Include all stdio_% dependencies after all USEMODULE += stdio_% @@ -305,49 +314,6 @@ ifneq (,$(filter isrpipe_read_timeout,$(USEMODULE))) USEMODULE += xtimer endif -ifneq (,$(filter shell_commands,$(USEMODULE))) - ifneq (,$(filter dfplayer,$(USEMODULE))) - USEMODULE += auto_init_multimedia - USEMODULE += fmt - endif - - ifneq (,$(filter fib,$(USEMODULE))) - USEMODULE += posix_inet - endif - - ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE))) - USEMODULE += netutils ztimer_usec - endif - - ifneq (,$(gnrc_udp_cmd,$(USEMODULE))) - USEMODULE += netutils - endif - - ifneq (,$(filter nanocoap_vfs,$(USEMODULE))) - USEMODULE += vfs_util - endif - - ifneq (,$(filter nimble_netif,$(USEMODULE))) - USEMODULE += nimble_scanner - USEMODULE += nimble_scanlist - USEMODULE += fmt - endif - - ifneq (,$(filter openwsn_%,$(USEMODULE))) - USEMODULE += netif - USEMODULE += ipv6_addr - endif - - ifneq (,$(filter gnrc_lorawan,$(USEMODULE))) - USEMODULE += gnrc_netif_cmd_lora - endif -endif - -ifneq (,$(filter shell_democommands,$(USEMODULE))) - USEMODULE += rust_riotmodules - USEMODULE += shell -endif - ifneq (,$(filter md5sum sha1sum sha256sum,$(USEMODULE))) USEMODULE += vfs_util USEMODULE += hashes @@ -776,9 +742,6 @@ endif ifneq (,$(filter cord_lc cord_ep,$(USEMODULE))) USEMODULE += core_thread_flags USEMODULE += cord_common - ifneq (,$(filter shell_commands,$(USEMODULE))) - USEMODULE += sock_util - endif ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE))) # requires 64bit timestamps when using xtimer USEMODULE += ztimer64_xtimer_compat diff --git a/sys/net/gnrc/Makefile.dep b/sys/net/gnrc/Makefile.dep index a825c02ffc..dc82c11f8f 100644 --- a/sys/net/gnrc/Makefile.dep +++ b/sys/net/gnrc/Makefile.dep @@ -394,11 +394,6 @@ ifneq (,$(filter gnrc_udp,$(USEMODULE))) USEMODULE += udp endif -ifneq (,$(filter gnrc_udp_cmd,$(USEMODULE))) - USEMODULE += gnrc_udp - USEMODULE += gnrc_pktdump -endif - ifneq (,$(filter gnrc_tcp,$(USEMODULE))) DEFAULT_MODULE += auto_init_gnrc_tcp USEMODULE += gnrc_nettype_tcp diff --git a/sys/shell/Kconfig b/sys/shell/Kconfig index 996c7b05aa..087167fd1f 100644 --- a/sys/shell/Kconfig +++ b/sys/shell/Kconfig @@ -23,7 +23,7 @@ menuconfig MODULE_SHELL select MODULE_STDIN depends on TEST_KCONFIG -rsource "commands/Kconfig" +rsource "cmds/Kconfig" if MODULE_SHELL rsource "Kconfig.config" diff --git a/sys/shell/Makefile.dep b/sys/shell/Makefile.dep new file mode 100644 index 0000000000..65fffb0115 --- /dev/null +++ b/sys/shell/Makefile.dep @@ -0,0 +1,289 @@ +ifneq (,$(filter shell_cmd_%,$(USEMODULE))) + # each and every command is a submodule of shell_cmds + USEMODULE += shell_cmds +endif + +ifneq (,$(filter shell_commands,$(USEMODULE))) + # shell_commands has been renamed to shell_cmds_default, but let's keep this + # for backward compatibility + USEMODULE += shell_cmds_default +endif + +ifneq (,$(filter shell_cmds_default,$(USEMODULE))) + USEMODULE += shell_cmd_sys + + ifneq (,$(filter app_metadata,$(USEMODULE))) + USEMODULE += shell_cmd_app_metadata + endif + ifneq (,$(filter at30tse75x,$(USEMODULE))) + USEMODULE += shell_cmd_at30tse75x + endif + ifneq (,$(filter benchmark_udp,$(USEMODULE))) + USEMODULE += shell_cmd_benchmark_udp + endif + ifneq (,$(filter ccn-lite-utils,$(USEMODULE))) + USEMODULE += shell_cmd_ccn-lite-utils + endif + ifneq (,$(filter conn_can,$(USEMODULE))) + USEMODULE += shell_cmd_conn_can + endif + ifneq (,$(filter cord_ep,$(USEMODULE))) + USEMODULE += shell_cmd_cord_ep + endif + ifneq (,$(filter cryptoauthlib,$(USEPKG))) + USEMODULE += shell_cmd_cryptoauthlib + endif + ifneq (,$(filter dfplayer,$(USEMODULE))) + USEMODULE += shell_cmd_dfplayer + endif + ifneq (,$(filter fib,$(USEMODULE))) + USEMODULE += shell_cmd_fib + endif + ifneq (,$(filter gnrc_ipv6_ext_frag_stats,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_ipv6_frag_stats + endif + ifneq (,$(filter gnrc_ipv6_nib,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_ipv6_nib + endif + ifneq (,$(filter gnrc_ipv6_whitelist,$(USEMODULE))) + USEMODULE += shell_cmd_whitelist + endif + ifneq (,$(filter gnrc_ipv6_blacklist,$(USEMODULE))) + USEMODULE += shell_cmd_blacklist + endif + ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_icmpv6_echo + endif + ifneq (,$(filter gnrc_netif,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_netif + endif + ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_pktbuf + endif + ifneq (,$(filter gnrc_rpl,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_rpl + endif + ifneq (,$(filter gnrc_sixlowpan_ctx,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_sixlowpan_ctx + endif + ifneq (,$(filter gnrc_sixlowpan_frag_stats,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_sixlowpan_frag_stats + endif + ifneq (,$(filter gnrc_udp_cmd,$(USEMODULE))) + USEMODULE += shell_cmd_gnrc_udp + endif + ifneq (,$(filter heap_cmd,$(USEMODULE))) + USEMODULE += shell_cmd_heap + endif + ifneq (,$(filter i2c_scan,$(USEMODULE))) + USEMODULE += shell_cmd_i2c_scan + endif + ifneq (,$(filter lpc2387,$(USEMODULE))) + USEMODULE += shell_cmd_heap + endif + ifneq (,$(filter lwip_netif,$(USEMODULE))) + USEMODULE += shell_cmd_lwip_netif + endif + ifneq (,$(filter mci,$(USEMODULE))) + USEMODULE += shell_cmd_mci + endif + ifneq (,$(filter nanocoap_vfs,$(USEMODULE))) + USEMODULE += shell_cmd_nanocoap_vfs + endif + ifneq (,$(filter netstats_neighbor,$(USEMODULE))) + USEMODULE += shell_cmd_netstats_neighbor + endif + ifneq (,$(filter nice,$(USEMODULE))) + USEMODULE += shell_cmd_nice + endif + ifneq (,$(filter nimble_netif,$(USEMODULE))) + USEMODULE += shell_cmd_nimble_netif + endif + ifneq (,$(filter nimble_statconn,$(USEMODULE))) + USEMODULE += shell_cmd_nimble_statconn + endif + ifneq (,$(filter openwsn,$(USEPKG))) + USEMODULE += shell_cmd_openwsn + endif + ifneq (,$(filter rtt_rtc periph_rtc,$(USEMODULE))) + USEMODULE += shell_cmd_rtc + endif + ifneq (,$(filter saul_reg,$(USEMODULE))) + USEMODULE += shell_cmd_saul_reg + endif + ifneq (,$(filter semtech-loramac,$(USEPKG))) + USEMODULE += shell_cmd_semtech-loramac + endif + ifneq (,$(filter sntp,$(USEMODULE))) + USEMODULE += shell_cmd_sntp + endif + ifneq (,$(filter periph_pm,$(USEMODULE))) + USEMODULE += shell_cmd_pm + endif + ifneq (,$(filter ps,$(USEMODULE))) + USEMODULE += shell_cmd_ps + endif + ifneq (,$(filter sht1x,$(USEMODULE))) + USEMODULE += shell_cmd_sht1x + endif + ifneq (,$(filter suit_transport_worker,$(USEMODULE))) + USEMODULE += shell_cmd_suit + endif + ifneq (,$(filter vfs,$(USEMODULE))) + USEMODULE += shell_cmd_vfs + endif +endif + +ifneq (,$(filter shell_cmd_app_metadata,$(USEMODULE))) + USEMODULE += app_metadata +endif +ifneq (,$(filter shell_cmd_at30tse75x,$(USEMODULE))) + USEMODULE += at30tse75x +endif +ifneq (,$(filter shell_cmd_benchmark_udp,$(USEMODULE))) + USEMODULE += benchmark_udp +endif +ifneq (,$(filter shell_cmd_ccn-lite-utils,$(USEMODULE))) + USEMODULE += ccn-lite-utils +endif +ifneq (,$(filter shell_cmd_conn_can,$(USEMODULE))) + USEMODULE += conn_can +endif +ifneq (,$(filter shell_cmd_cord_ep,$(USEMODULE))) + USEMODULE += cord_ep + USEMODULE += sock_util +endif +ifneq (,$(filter shell_cmd_cryptoauthlib,$(USEPKG))) + USEMODULE += cryptoauthlib +endif +ifneq (,$(filter shell_cmd_dfplayer,$(USEMODULE))) + USEMODULE += auto_init_multimedia + USEMODULE += dfplayer + USEMODULE += fmt +endif +ifneq (,$(filter shell_cmd_fib,$(USEMODULE))) + USEMODULE += fib + USEMODULE += posix_inet +endif +ifneq (,$(filter shell_cmd_gnrc_icmpv6_echo,$(USEMODULE))) + USEMODULE += gnrc_icmpv6_echo + USEMODULE += netutils + USEMODULE += ztimer_usec +endif +ifneq (,$(filter shell_cmd_gnrc_ipv6_blacklist,$(USEMODULE))) + USEMODULE += gnrc_ipv6_blacklist +endif +ifneq (,$(filter shell_cmd_gnrc_ipv6_ext_frag_stats,$(USEMODULE))) + USEMODULE += gnrc_ipv6_frag_stats +endif +ifneq (,$(filter shell_cmd_gnrc_ipv6_nib,$(USEMODULE))) + USEMODULE += gnrc_ipv6_nib +endif +ifneq (,$(filter shell_cmd_gnrc_ipv6_whitelist,$(USEMODULE))) + USEMODULE += gnrc_ipv6_whitelist +endif +ifneq (,$(filter shell_cmd_gnrc_netif,$(USEMODULE))) + USEMODULE += gnrc_netif +endif +ifneq (,$(filter shell_cmd_gnrc_pktbuf,$(USEMODULE))) + USEMODULE += gnrc_pktbuf +endif +ifneq (,$(filter shell_cmd_gnrc_rpl,$(USEMODULE))) + USEMODULE += gnrc_rpl +endif +ifneq (,$(filter shell_cmd_gnrc_sixlowpan_ctx,$(USEMODULE))) + USEMODULE += gnrc_sixlowpan_ctx +endif +ifneq (,$(filter shell_cmd_gnrc_sixlowpan_frag_stats,$(USEMODULE))) + USEMODULE += gnrc_sixlowpan_frag_stats +endif +ifneq (,$(filter shell_cmd_gnrc_udp,$(USEMODULE))) + USEMODULE += gnrc_udp + USEMODULE += gnrc_pktdump +endif +ifneq (,$(filter shell_cmd_i2c_scan,$(USEMODULE))) + FEATURES_REQUIRED += periph_i2c +endif +ifneq (,$(filter shell_cmd_lwip_netif,$(USEMODULE))) + USEMODULE += lwip_netif +endif +ifneq (,$(filter shell_cmd_mci,$(USEMODULE))) + USEMODULE += mci +endif +ifneq (,$(filter shell_cmd_md5sum,$(USEMODULE))) + USEMODULE += shell_cmd_vfs +endif +ifneq (,$(filter shell_cmd_nanocoap_vfs,$(USEMODULE))) + USEMODULE += nanocoap_vfs + USEMODULE += vfs_util +endif +ifneq (,$(filter shell_cmd_netstats_neighbor,$(USEMODULE))) + USEMODULE += netstats_neighbor +endif +ifneq (,$(filter shell_cmd_nimble_netif,$(USEMODULE))) + USEMODULE += fmt + USEMODULE += nimble_netif + USEMODULE += nimble_scanlist + USEMODULE += nimble_scanner +endif +ifneq (,$(filter shell_cmd_nimble_statconn,$(USEMODULE))) + USEMODULE += nimble_statconn +endif +ifneq (,$(filter shell_cmd_openwsn,$(USEMODULE))) + USEMODULE += ipv6_addr + USEMODULE += l2util + USEMODULE += netif + USEPKG += openwsn +endif +ifneq (,$(filter shell_cmd_pm,$(USEMODULE))) + FEATURES_REQUIRED += periph_pm +endif +ifneq (,$(filter shell_cmd_ps,$(USEMODULE))) + USEMODULE += ps +endif +ifneq (,$(filter shell_cmd_random_cmd,$(USEMODULE))) + USEMODULE += random +endif +ifneq (,$(filter shell_cmd_rtc,$(USEMODULE))) + FEATURES_REQUIRED_ANY += periph_rtc|periph_rtt + # beware: this is a bit more tricky than it looks. Before the + # FEAUTRES_REQUIRED_ANY is taken into account, neither periph_rtc nor + # periph_rtt is used. Once it comes to affect, at least one will be in use. + # If periph_rtc is not in used but periph_rtt is, we can provide the RTC + # with rtt_rtc. + ifeq (periph_rtt,$(filter periph_rtc periph_rtt,$(USEMODULE))) + USEMODULE += rtt_rtc + endif +endif +ifneq (,$(filter shell_cmd_rtt,$(USEMODULE))) + FEATURES_REQUIRED += periph_rtt +endif +ifneq (,$(filter shell_cmd_saul_reg,$(USEMODULE))) + USEMODULE += saul_reg +endif +ifneq (,$(filter shell_cmd_semtech-loramac,$(USEPKG))) + USEMODULE += semtech-loramac +endif +ifneq (,$(filter shell_cmd_sha1sum,$(USEMODULE))) + USEMODULE += shell_cmd_vfs +endif +ifneq (,$(filter shell_cmd_sha256sum,$(USEMODULE))) + USEMODULE += shell_cmd_vfs +endif +ifneq (,$(filter shell_cmd_sht1x,$(USEMODULE))) + USEMODULE += sht1x +endif +ifneq (,$(filter shell_cmd_sntp,$(USEMODULE))) + USEMODULE += sntp +endif +ifneq (,$(filter shell_cmd_suit,$(USEMODULE))) + USEMODULE += suit_transport_worker +endif +ifneq (,$(filter shell_cmd_vfs,$(USEMODULE))) + USEMODULE += vfs +endif + +ifneq (,$(filter shell_democommands,$(USEMODULE))) + USEMODULE += rust_riotmodules + USEMODULE += shell +endif diff --git a/sys/shell/cmds/Kconfig b/sys/shell/cmds/Kconfig new file mode 100644 index 0000000000..685eade8c0 --- /dev/null +++ b/sys/shell/cmds/Kconfig @@ -0,0 +1,298 @@ +# Copyright (c) 2022 Otto-von-Guericke-Universität Magdeburg +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +menuconfig MODULE_SHELL_CMDS + bool "Support for shell commands" + depends on MODULE_SHELL + +config CONFIG_MODULE_SHELL_COMMANDS + bool + select MODULE_SHELL_CMDS_DEFAULT + help + Deprecated alias for MODULE_SHELL_CMDS_DEFAULT. For new apps, use + MODULE_SHELL_CMDS_DEFAULT directly. + +config MODULE_SHELL_CMDS_DEFAULT + bool "Default shell commands for enabled modules" + select MODULE_SHELL_CMDS + help + Shell commands can be enabled and disabled individually as dedicated + modules. This module instead will select the shell commands of modules + already used, if this is considered as "good default choice". + +config MODULE_SHELL_CMD_APP_METADATA + bool "Command to print app meta data as JSON" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_APP_METADATA + +config MODULE_SHELL_CMD_AT30TSE75X + bool "Command to testAT30TSE75x temperature sensors" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_AT30TSE75X + +config MODULE_SHELL_CMD_BENCHMARK_UDP + bool "Command to perform a UDP benchmark" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_BENCHMARK_UDP + +config MODULE_SHELL_CMD_CCN-LITE-UTILS + bool "Commands to interact with the CCN-Lite stack" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_CCN-LITE-UTILS + +config MODULE_SHELL_CMD_CONN_CAN + bool "Command to interact with the CAN stack" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_CONN_CAN + +config MODULE_SHELL_CMD_CORD_EP + bool "Command to interact with a resource directory endpoint" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_CORD_EP + +config MODULE_SHELL_CMD_CRYPTOAUTHLIB + bool "Command to interact with Microchip CryptoAuth devices" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_CRYPTOAUTHLIB + +config MODULE_SHELL_CMD_DFPLAYER + bool "Command to control a dfplayer MP3 player" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_DFPLAYER + select MODULE_AUTO_INIT_MULTIMEDIA + select MODULE_FMT + +config MODULE_SHELL_CMD_FIB + bool "Command to interact with the Forwarding Information Base (FIB)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_FIB + depends on MODULE_POSIX_INET + +config MODULE_SHELL_CMD_GNRC_ICMPV6_ECHO + bool "Command to send ICMPv6 Echo Requests (a.k.a. ping)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_ICMPV6_ECHO + depends on MODULE_NETUTILS + depends on MODULE_ZTIMER_USEC + +config MODULE_SHELL_CMD_GNRC_IPV6_BLACKLIST + bool "Command to manage IPv6 addresses in reception deny list" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_IPV6_BLACKLIST + +config MODULE_SHELL_CMD_GNRC_IPV6_FRAG_STATS + bool "Command to show IPv6 fragmentation statistics" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_IPV6_FRAG_STATS + +config MODULE_SHELL_CMD_GNRC_IPV6_NIB + bool "Command to configure the neighbor information base" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_IPV6_NIB + +config MODULE_SHELL_CMD_GNRC_IPV6_WHITELIST + bool "Command to manage IPv6 addresses in reception allow list" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_IPV6_WHITELIST + +config MODULE_SHELL_CMD_GNRC_NETIF + bool "Command to manage GNRC network interfaces (ifconfig)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_NETIF + +config MODULE_SHELL_CMD_GNRC_PKTBUF + bool "Command to print stats of the GNRC packet buffer" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_PKTBUF + +config MODULE_SHELL_CMD_GNRC_RPL + bool "Command to configure GNRC's RPL implementation" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_RPL + +config MODULE_SHELL_CMD_GNRC_SIXLOWPAN_CTX + bool "Command to configure 6LoWPAN context in GNRC" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_SIXLOWPAN_CTX + +config MODULE_SHELL_CMD_GNRC_SIXLOWPAN_FRAG_STATS + bool "Command to display 6LoWPAN fragment statistics" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_SIXLOWPAN_FRAG_STATS + +config MODULE_SHELL_CMD_GNRC_UDP + bool "Command interface to a UDP server and client" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_GNRC_UDP + depends on MODULE_GNRC_PKTDUMP + +config MODULE_SHELL_CMD_HEAP + bool "Command to print dynamic memory allocation statistics" + depends on MODULE_SHELL_CMDS + +config MODULE_SHELL_CMD_I2C_SCAN + bool "Command to scan for I2C devices" + depends on MODULE_SHELL_CMDS + depends on MODULE_PERIPH_I2C + +config MODULE_SHELL_CMD_LWIP_NETIF + bool "Command to manage lwIP network interfaces (ifconfig)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_LWIP_NETIF + +config MODULE_SHELL_CMD_MCI + bool "Commands to query parameters and read contents from memory cards" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_MCI + +config MODULE_SHELL_CMD_MD5SUM + bool "Command to calculate the MD5 sum of a file" + depends on MODULE_SHELL_CMDS + depends on MODULE_SHELL_CMD_VFS + +config MODULE_SHELL_CMD_NANOCOAP_VFS + bool "Commands to upload/download files to/from a CoAP server" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_NANOCOAP_VFS + depends on MODULE_VFS_UTIL + +config MODULE_SHELL_CMD_NETSTATS_NEIGHBOR + bool "Command to show neighbor statistics" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_NETSTATS_NEIGHBOR + +config MODULE_SHELL_CMD_NICE + bool "Command to change the priority of running threads" + depends on MODULE_SHELL_CMDS + +config MODULE_SHELL_CMD_NIMBLE_NETIF + bool "Command to manage BLE connections for NimBLE" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_FMT + depends on MODULE_NIMBLE_NETIF + depends on MODULE_NIMBLE_SCANLIST + depends on MODULE_NIMBLE_SCANNER + +config MODULE_SHELL_CMD_NIMBLE_STATCONN + bool "Command to controle the NimBLE netif statconn connection manager" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_NIMBLE_STATCONN + +config MODULE_SHELL_CMD_OPENWSN + bool "Commands to interact with the OpenWSN network statck (ifconfig, openwsn)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_IPV6_ADDR + depends on MODULE_L2UTIL + depends on MODULE_NETIF + depends on MODULE_SHELL_CMDS + depends on USEPKG_OPENWSN + +config MODULE_SHELL_CMD_PM + bool "Command to interact with the layered power management subsystem" + default y if MODULE_SHELL_CMDS_DEFAULT && MODULE_PERIPH_PM + depends on MODULE_SHELL_CMDS + depends on HAS_PERIPH_PM + +config MODULE_SHELL_CMD_PS + bool "Command to print information about running threads" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_PS + +config MODULE_SHELL_CMD_RANDOM + bool "Commands to initialize the PRNG and print 32 bit pseudo-random numbers" + depends on MODULE_SHELL_CMDS + depends on MODULE_RANDOM + +config MODULE_SHELL_CMD_RTC + bool "Command to control the peripheral real time clock" + default y if MODULE_SHELL_CMDS_DEFAULT && MODULE_PERIPH_RTC + depends on MODULE_SHELL_CMDS + depends on HAS_PERIPH_RTC || HAS_PERIPH_RTT + depends on MODULE_RTT_RTC || HAS_PERIPH_RTC + +config MODULE_SHELL_CMD_RTT + bool "Command to control the peripheral real time timer" + depends on MODULE_SHELL_CMDS + depends on HAS_PERIPH_RTT + +config MODULE_SHELL_CMD_SAUL_REG + bool "Command to read sensors and control actuators via SAUL" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_SAUL_REG + +config MODULE_SHELL_CMD_SEMTECH-LORAMAC + bool "Command to control the Semtech LoRaMAC stack" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_SEMTECH-LORAMAC + +config MODULE_SHELL_CMD_SHA1SUM + bool "Command to compute the SHA1 sum of a file" + depends on MODULE_SHELL_CMDS + depends on MODULE_SHELL_CMD_VFS + +config MODULE_SHELL_CMD_SHA256SUM + bool "Command to compute the SHA256 sum of a file" + depends on MODULE_SHELL_CMDS + depends on MODULE_SHELL_CMD_VFS + +config MODULE_SHELL_CMD_SHT1X + bool "Commands to interact with SHT1x sensors" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_SHT1X + +config MODULE_SHELL_CMD_SNTP + bool "Command to synchronize time with an SNTP server" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_SNTP + +config MODULE_SHELL_CMD_SUIT + bool "Command to trigger a SUIT firmware update" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_SUIT_TRANSPORT_WORKER + +config MODULE_SHELL_CMD_SYS + bool "Common utility commands (version, reboot, bootloader)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + +config MODULE_SHELL_CMD_VFS + bool "Commands for the VFS module (ls, vfs)" + default y if MODULE_SHELL_CMDS_DEFAULT + depends on MODULE_SHELL_CMDS + depends on MODULE_VFS diff --git a/sys/shell/cmds/Makefile b/sys/shell/cmds/Makefile new file mode 100644 index 0000000000..381b1ce28a --- /dev/null +++ b/sys/shell/cmds/Makefile @@ -0,0 +1,5 @@ +MODULE = shell_cmds +BASE_MODULE := shell_cmd +SUBMODULES := 1 + +include $(RIOTBASE)/Makefile.base diff --git a/sys/shell/commands/sc_app_metadata.c b/sys/shell/cmds/app_metadata.c similarity index 100% rename from sys/shell/commands/sc_app_metadata.c rename to sys/shell/cmds/app_metadata.c diff --git a/sys/shell/commands/sc_at30tse75x.c b/sys/shell/cmds/at30tse75x.c similarity index 100% rename from sys/shell/commands/sc_at30tse75x.c rename to sys/shell/cmds/at30tse75x.c diff --git a/sys/shell/commands/sc_benchmark_udp.c b/sys/shell/cmds/benchmark_udp.c similarity index 100% rename from sys/shell/commands/sc_benchmark_udp.c rename to sys/shell/cmds/benchmark_udp.c diff --git a/sys/shell/commands/sc_ccnl.c b/sys/shell/cmds/ccn-lite-utils.c similarity index 100% rename from sys/shell/commands/sc_ccnl.c rename to sys/shell/cmds/ccn-lite-utils.c diff --git a/sys/shell/commands/sc_can.c b/sys/shell/cmds/conn_can.c similarity index 100% rename from sys/shell/commands/sc_can.c rename to sys/shell/cmds/conn_can.c diff --git a/sys/shell/commands/sc_cord_ep.c b/sys/shell/cmds/cord_ep.c similarity index 100% rename from sys/shell/commands/sc_cord_ep.c rename to sys/shell/cmds/cord_ep.c diff --git a/sys/shell/commands/sc_cryptoauthlib.c b/sys/shell/cmds/cryptoauthlib.c similarity index 100% rename from sys/shell/commands/sc_cryptoauthlib.c rename to sys/shell/cmds/cryptoauthlib.c diff --git a/sys/shell/commands/sc_dfplayer.c b/sys/shell/cmds/dfplayer.c similarity index 100% rename from sys/shell/commands/sc_dfplayer.c rename to sys/shell/cmds/dfplayer.c diff --git a/sys/shell/commands/sc_fib.c b/sys/shell/cmds/fib.c similarity index 100% rename from sys/shell/commands/sc_fib.c rename to sys/shell/cmds/fib.c diff --git a/sys/shell/commands/sc_gnrc_icmpv6_echo.c b/sys/shell/cmds/gnrc_icmpv6_echo.c similarity index 100% rename from sys/shell/commands/sc_gnrc_icmpv6_echo.c rename to sys/shell/cmds/gnrc_icmpv6_echo.c diff --git a/sys/shell/commands/sc_blacklist.c b/sys/shell/cmds/gnrc_ipv6_blacklist.c similarity index 94% rename from sys/shell/commands/sc_blacklist.c rename to sys/shell/cmds/gnrc_ipv6_blacklist.c index 249d63939e..31de14ab42 100644 --- a/sys/shell/commands/sc_blacklist.c +++ b/sys/shell/cmds/gnrc_ipv6_blacklist.c @@ -62,7 +62,7 @@ static int _blacklist(int argc, char **argv) } SHELL_COMMAND(blacklist, - "blacklists an address for receival ('blacklist [add|del|help]')", + "manage IPv6 addresses in reception deny list ('blacklist [add|del|help]')", _blacklist); /** @} */ diff --git a/sys/shell/commands/sc_gnrc_ipv6_frag_stats.c b/sys/shell/cmds/gnrc_ipv6_frag_stats.c similarity index 100% rename from sys/shell/commands/sc_gnrc_ipv6_frag_stats.c rename to sys/shell/cmds/gnrc_ipv6_frag_stats.c diff --git a/sys/shell/commands/sc_gnrc_ipv6_nib.c b/sys/shell/cmds/gnrc_ipv6_nib.c similarity index 100% rename from sys/shell/commands/sc_gnrc_ipv6_nib.c rename to sys/shell/cmds/gnrc_ipv6_nib.c diff --git a/sys/shell/commands/sc_whitelist.c b/sys/shell/cmds/gnrc_ipv6_whitelist.c similarity index 91% rename from sys/shell/commands/sc_whitelist.c rename to sys/shell/cmds/gnrc_ipv6_whitelist.c index 6861da2535..482591285a 100644 --- a/sys/shell/commands/sc_whitelist.c +++ b/sys/shell/cmds/gnrc_ipv6_whitelist.c @@ -60,6 +60,8 @@ static int _whitelist(int argc, char **argv) return 0; } -SHELL_COMMAND(whitelist, "whitelists an address for receival ('whitelist [add|del|help]')", _whitelist); +SHELL_COMMAND(whitelist, + "manage IPv6 addresses in reception allow list ('whitelist [add|del|help]')", + _whitelist); /** @} */ diff --git a/sys/shell/commands/sc_gnrc_netif.c b/sys/shell/cmds/gnrc_netif.c similarity index 100% rename from sys/shell/commands/sc_gnrc_netif.c rename to sys/shell/cmds/gnrc_netif.c diff --git a/sys/shell/commands/sc_gnrc_pktbuf.c b/sys/shell/cmds/gnrc_pktbuf.c similarity index 100% rename from sys/shell/commands/sc_gnrc_pktbuf.c rename to sys/shell/cmds/gnrc_pktbuf.c diff --git a/sys/shell/commands/sc_gnrc_rpl.c b/sys/shell/cmds/gnrc_rpl.c similarity index 100% rename from sys/shell/commands/sc_gnrc_rpl.c rename to sys/shell/cmds/gnrc_rpl.c diff --git a/sys/shell/commands/sc_gnrc_6ctx.c b/sys/shell/cmds/gnrc_sixlowpan_ctx.c similarity index 100% rename from sys/shell/commands/sc_gnrc_6ctx.c rename to sys/shell/cmds/gnrc_sixlowpan_ctx.c diff --git a/sys/shell/commands/sc_gnrc_6lo_frag_stats.c b/sys/shell/cmds/gnrc_sixlowpan_frag_stats.c similarity index 100% rename from sys/shell/commands/sc_gnrc_6lo_frag_stats.c rename to sys/shell/cmds/gnrc_sixlowpan_frag_stats.c diff --git a/sys/shell/commands/sc_gnrc_udp.c b/sys/shell/cmds/gnrc_udp.c similarity index 100% rename from sys/shell/commands/sc_gnrc_udp.c rename to sys/shell/cmds/gnrc_udp.c diff --git a/sys/shell/commands/sc_heap.c b/sys/shell/cmds/heap.c similarity index 100% rename from sys/shell/commands/sc_heap.c rename to sys/shell/cmds/heap.c diff --git a/sys/shell/commands/sc_i2c_scan.c b/sys/shell/cmds/i2c_scan.c similarity index 100% rename from sys/shell/commands/sc_i2c_scan.c rename to sys/shell/cmds/i2c_scan.c diff --git a/sys/shell/commands/sc_lwip_netif.c b/sys/shell/cmds/lwip_netif.c similarity index 100% rename from sys/shell/commands/sc_lwip_netif.c rename to sys/shell/cmds/lwip_netif.c diff --git a/sys/shell/commands/sc_disk.c b/sys/shell/cmds/mci.c similarity index 100% rename from sys/shell/commands/sc_disk.c rename to sys/shell/cmds/mci.c diff --git a/sys/shell/commands/sc_nanocoap_vfs.c b/sys/shell/cmds/nanocoap_vfs.c similarity index 100% rename from sys/shell/commands/sc_nanocoap_vfs.c rename to sys/shell/cmds/nanocoap_vfs.c diff --git a/sys/shell/commands/sc_netstats_nb.c b/sys/shell/cmds/netstats_neighbor.c similarity index 100% rename from sys/shell/commands/sc_netstats_nb.c rename to sys/shell/cmds/netstats_neighbor.c diff --git a/sys/shell/commands/sc_nice.c b/sys/shell/cmds/nice.c similarity index 100% rename from sys/shell/commands/sc_nice.c rename to sys/shell/cmds/nice.c diff --git a/sys/shell/commands/sc_nimble_netif.c b/sys/shell/cmds/nimble_netif.c similarity index 100% rename from sys/shell/commands/sc_nimble_netif.c rename to sys/shell/cmds/nimble_netif.c diff --git a/sys/shell/commands/sc_nimble_statconn.c b/sys/shell/cmds/nimble_statconn.c similarity index 100% rename from sys/shell/commands/sc_nimble_statconn.c rename to sys/shell/cmds/nimble_statconn.c diff --git a/sys/shell/commands/sc_openwsn.c b/sys/shell/cmds/openwsn.c similarity index 100% rename from sys/shell/commands/sc_openwsn.c rename to sys/shell/cmds/openwsn.c diff --git a/sys/shell/commands/sc_pm.c b/sys/shell/cmds/pm.c similarity index 100% rename from sys/shell/commands/sc_pm.c rename to sys/shell/cmds/pm.c diff --git a/sys/shell/commands/sc_ps.c b/sys/shell/cmds/ps.c similarity index 100% rename from sys/shell/commands/sc_ps.c rename to sys/shell/cmds/ps.c diff --git a/sys/shell/commands/sc_random.c b/sys/shell/cmds/random.c similarity index 76% rename from sys/shell/commands/sc_random.c rename to sys/shell/cmds/random.c index 0afcbe6d73..9944a500f7 100644 --- a/sys/shell/commands/sc_random.c +++ b/sys/shell/cmds/random.c @@ -27,24 +27,22 @@ #include "random.h" #include "shell.h" -#ifdef MODULE_XTIMER -#include "xtimer.h" -#endif +#include "ztimer.h" static int _random_init(int argc, char **argv) { int initval; if (argc == 1) { -#ifdef MODULE_XTIMER - initval = _xtimer_now(); - printf("PRNG initialized to current time: %d\n", initval); -#else - (void)initval; - puts("xtimer module not compiled in, can't initialize by time.\n" - "Please provide a seed.\n"); - return 1; -#endif + if (IS_USED(MODULE_ZTIMER_USEC)) { + initval = ztimer_now(ZTIMER_USEC); + printf("PRNG initialized to current time: %d\n", initval); + } + else { + puts("xtimer module not compiled in, can't initialize by time.\n" + "Please provide a seed.\n"); + return 1; + } } else { initval = atoi(argv[1]); diff --git a/sys/shell/commands/sc_rtc.c b/sys/shell/cmds/rtc.c similarity index 100% rename from sys/shell/commands/sc_rtc.c rename to sys/shell/cmds/rtc.c diff --git a/sys/shell/commands/sc_rtt.c b/sys/shell/cmds/rtt.c similarity index 100% rename from sys/shell/commands/sc_rtt.c rename to sys/shell/cmds/rtt.c diff --git a/sys/shell/commands/sc_saul_reg.c b/sys/shell/cmds/saul_reg.c similarity index 100% rename from sys/shell/commands/sc_saul_reg.c rename to sys/shell/cmds/saul_reg.c diff --git a/sys/shell/commands/sc_loramac.c b/sys/shell/cmds/semtech-loramac.c similarity index 100% rename from sys/shell/commands/sc_loramac.c rename to sys/shell/cmds/semtech-loramac.c diff --git a/sys/shell/commands/sc_sht1x.c b/sys/shell/cmds/sht1x.c similarity index 100% rename from sys/shell/commands/sc_sht1x.c rename to sys/shell/cmds/sht1x.c diff --git a/sys/shell/commands/sc_sntp.c b/sys/shell/cmds/sntp.c similarity index 100% rename from sys/shell/commands/sc_sntp.c rename to sys/shell/cmds/sntp.c diff --git a/sys/shell/commands/sc_suit.c b/sys/shell/cmds/suit.c similarity index 100% rename from sys/shell/commands/sc_suit.c rename to sys/shell/cmds/suit.c diff --git a/sys/shell/commands/sc_sys.c b/sys/shell/cmds/sys.c similarity index 100% rename from sys/shell/commands/sc_sys.c rename to sys/shell/cmds/sys.c diff --git a/sys/shell/commands/sc_vfs.c b/sys/shell/cmds/vfs.c similarity index 99% rename from sys/shell/commands/sc_vfs.c rename to sys/shell/cmds/vfs.c index f654041e47..1111093369 100644 --- a/sys/shell/commands/sc_vfs.c +++ b/sys/shell/cmds/vfs.c @@ -805,7 +805,7 @@ static inline void _print_digest(const uint8_t *digest, size_t len, const char * printf(" %s\n", file); } -#if MODULE_MD5SUM +#if MODULE_SHELL_CMD_MD5SUM #include "hashes/md5.h" static int _vfs_md5sum_cmd(int argc, char **argv) { @@ -834,7 +834,7 @@ static int _vfs_md5sum_cmd(int argc, char **argv) SHELL_COMMAND(md5sum, "Compute and check MD5 message digest", _vfs_md5sum_cmd); #endif -#if MODULE_SHA1SUM +#if MODULE_SHELL_CMD_SHA1SUM #include "hashes/sha1.h" static int _vfs_sha1sum_cmd(int argc, char **argv) { @@ -863,7 +863,7 @@ static int _vfs_sha1sum_cmd(int argc, char **argv) SHELL_COMMAND(sha1sum, "Compute and check SHA1 message digest", _vfs_sha1sum_cmd); #endif -#if MODULE_SHA256SUM +#if MODULE_SHELL_CMD_SHA256SUM #include "hashes/sha256.h" static int _vfs_sha256sum_cmd(int argc, char **argv) { diff --git a/sys/shell/commands/Kconfig b/sys/shell/commands/Kconfig deleted file mode 100644 index 667308ae7a..0000000000 --- a/sys/shell/commands/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2020 HAW Hamburg -# -# This file is subject to the terms and conditions of the GNU Lesser -# General Public License v2.1. See the file LICENSE in the top level -# directory for more details. -# - -menuconfig MODULE_SHELL_COMMANDS - bool "Basic shell commands" - depends on MODULE_SHELL - -config MODULE_I2C_SCAN - bool "I2c scanner" - depends on MODULE_SHELL - depends on MODULE_PERIPH_I2C diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile deleted file mode 100644 index a69bfba6a6..0000000000 --- a/sys/shell/commands/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -MODULE = shell_commands - -SRC = sc_sys.c - -ifneq (,$(filter app_metadata,$(USEMODULE))) - SRC += sc_app_metadata.c -endif -ifneq (,$(filter benchmark_udp,$(USEMODULE))) - SRC += sc_benchmark_udp.c -endif -ifneq (,$(filter dfplayer,$(USEMODULE))) - SRC += sc_dfplayer.c -endif -ifneq (,$(filter mci,$(USEMODULE))) - SRC += sc_disk.c -endif -ifneq (,$(filter nice,$(USEMODULE))) - SRC += sc_nice.c -endif -ifneq (,$(filter periph_pm,$(USEMODULE))) - SRC += sc_pm.c -endif -ifneq (,$(filter ps,$(USEMODULE))) - SRC += sc_ps.c -endif -ifneq (,$(filter heap_cmd,$(USEMODULE))) - SRC += sc_heap.c -endif -ifneq (,$(filter sht1x,$(USEMODULE))) - SRC += sc_sht1x.c -endif -ifneq (,$(filter lpc2387,$(USEMODULE))) - SRC += sc_heap.c -endif -ifneq (,$(filter random_cmd,$(USEMODULE))) - SRC += sc_random.c -endif -ifneq (,$(filter at30tse75x,$(USEMODULE))) - SRC += sc_at30tse75x.c -endif -ifneq (,$(filter gnrc_netif,$(USEMODULE))) - SRC += sc_gnrc_netif.c -endif -ifneq (,$(filter gnrc_udp_cmd,$(USEMODULE))) - SRC += sc_gnrc_udp.c -endif -ifneq (,$(filter netstats_neighbor,$(USEMODULE))) - SRC += sc_netstats_nb.c -endif -ifneq (,$(filter fib,$(USEMODULE))) - SRC += sc_fib.c -endif -ifneq (,$(filter gnrc_ipv6_ext_frag_stats,$(USEMODULE))) - SRC += sc_gnrc_ipv6_frag_stats.c -endif -ifneq (,$(filter gnrc_ipv6_nib,$(USEMODULE))) - SRC += sc_gnrc_ipv6_nib.c -endif -ifneq (,$(filter gnrc_ipv6_whitelist,$(USEMODULE))) - SRC += sc_whitelist.c -endif -ifneq (,$(filter gnrc_ipv6_blacklist,$(USEMODULE))) - SRC += sc_blacklist.c -endif -ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE))) - SRC += sc_gnrc_icmpv6_echo.c -endif -ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE))) - SRC += sc_gnrc_pktbuf.c -endif -ifneq (,$(filter gnrc_rpl,$(USEMODULE))) - SRC += sc_gnrc_rpl.c -endif -ifneq (,$(filter gnrc_sixlowpan_ctx,$(USEMODULE))) - SRC += sc_gnrc_6ctx.c -endif -ifneq (,$(filter gnrc_sixlowpan_frag_stats,$(USEMODULE))) - SRC += sc_gnrc_6lo_frag_stats.c -endif -ifneq (,$(filter saul_reg,$(USEMODULE))) - SRC += sc_saul_reg.c -endif -ifneq (,$(filter ccn-lite-utils,$(USEMODULE))) - SRC += sc_ccnl.c -endif -ifneq (,$(filter sntp,$(USEMODULE))) - SRC += sc_sntp.c -endif -ifneq (,$(filter vfs,$(USEMODULE))) - SRC += sc_vfs.c -endif -ifneq (,$(filter conn_can,$(USEMODULE))) - SRC += sc_can.c -endif -ifneq (,$(filter cord_ep,$(USEMODULE))) - SRC += sc_cord_ep.c -endif - -ifneq (,$(filter openwsn,$(USEPKG))) - SRC += sc_openwsn.c -endif - -ifneq (,$(filter lwip_netif,$(USEMODULE))) - SRC += sc_lwip_netif.c -endif - -ifneq (,$(filter rtt_rtc periph_rtc,$(USEMODULE))) - SRC += sc_rtc.c -endif - -ifneq (,$(filter rtt_cmd,$(USEMODULE))) - SRC += sc_rtt.c -endif - -ifneq (,$(filter i2c_scan,$(USEMODULE))) - SRC += sc_i2c_scan.c -endif - -ifneq (,$(filter semtech-loramac,$(USEPKG))) - SRC += sc_loramac.c -endif - -ifneq (,$(filter nanocoap_vfs,$(USEMODULE))) - SRC += sc_nanocoap_vfs.c -endif - -ifneq (,$(filter nimble_netif,$(USEMODULE))) - SRC += sc_nimble_netif.c -endif - -ifneq (,$(filter nimble_statconn,$(USEMODULE))) - SRC += sc_nimble_statconn.c -endif - -ifneq (,$(filter suit_transport_worker,$(USEMODULE))) - SRC += sc_suit.c -endif - -ifneq (,$(filter cryptoauthlib,$(USEPKG))) - SRC += sc_cryptoauthlib.c -endif - -include $(RIOTBASE)/Makefile.base diff --git a/tests/can_trx/Makefile b/tests/can_trx/Makefile index 3a69586dbe..95a1a7a0a6 100644 --- a/tests/can_trx/Makefile +++ b/tests/can_trx/Makefile @@ -2,7 +2,7 @@ export APPLICATION = can_trx include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += can_trx diff --git a/tests/congure_reno/Makefile b/tests/congure_reno/Makefile index 17e35e72a5..0cfbaf609f 100644 --- a/tests/congure_reno/Makefile +++ b/tests/congure_reno/Makefile @@ -4,7 +4,7 @@ USEMODULE += congure_reno USEMODULE += congure_test USEMODULE += fmt USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default INCLUDES += -I$(CURDIR) diff --git a/tests/congure_reno/app.config.test b/tests/congure_reno/app.config.test index ff27b641f7..e4f68a34ae 100644 --- a/tests/congure_reno/app.config.test +++ b/tests/congure_reno/app.config.test @@ -4,7 +4,7 @@ CONFIG_MODULE_CONGURE_TEST=y CONFIG_MODULE_FMT=y CONFIG_MODULE_SEQ=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_CONGURE_TEST_LOST_MSG_POOL_SIZE=6 CONFIG_SHELL_NO_ECHO=y diff --git a/tests/congure_test/Makefile b/tests/congure_test/Makefile index cce77d5867..0c48cd5a6d 100644 --- a/tests/congure_test/Makefile +++ b/tests/congure_test/Makefile @@ -4,7 +4,7 @@ USEMODULE += congure_mock USEMODULE += congure_test USEMODULE += fmt USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default INCLUDES += -I$(CURDIR) diff --git a/tests/congure_test/app.config.test b/tests/congure_test/app.config.test index ec56840c46..bfc82353d2 100644 --- a/tests/congure_test/app.config.test +++ b/tests/congure_test/app.config.test @@ -3,5 +3,5 @@ CONFIG_MODULE_CONGURE_MOCK=y CONFIG_MODULE_CONGURE_TEST=y CONFIG_MODULE_FMT=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_SHELL_NO_ECHO=y diff --git a/tests/conn_can/Makefile b/tests/conn_can/Makefile index 74ca2568a8..9189c96e50 100644 --- a/tests/conn_can/Makefile +++ b/tests/conn_can/Makefile @@ -3,7 +3,7 @@ BOARD ?= nucleo-f767zi include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += conn_can diff --git a/tests/cpu_cortexm_address_check/Makefile b/tests/cpu_cortexm_address_check/Makefile index cb9552c7e3..7e55a00326 100644 --- a/tests/cpu_cortexm_address_check/Makefile +++ b/tests/cpu_cortexm_address_check/Makefile @@ -5,6 +5,6 @@ include ../Makefile.tests_common FEATURES_REQUIRED += cpu_check_address USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_at30tse75x/Makefile b/tests/driver_at30tse75x/Makefile index f759b09afd..9bae2457da 100644 --- a/tests/driver_at30tse75x/Makefile +++ b/tests/driver_at30tse75x/Makefile @@ -2,6 +2,6 @@ include ../Makefile.tests_common USEMODULE += at30tse75x USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_at30tse75x/app.config.test b/tests/driver_at30tse75x/app.config.test index 2fe7cd3077..b9540a7b0a 100644 --- a/tests/driver_at30tse75x/app.config.test +++ b/tests/driver_at30tse75x/app.config.test @@ -2,4 +2,4 @@ # application configuration. This is only needed during migration. CONFIG_MODULE_AT30TSE75X=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/driver_ata8520e/Makefile b/tests/driver_ata8520e/Makefile index 207c000bba..cc8bd5fbef 100644 --- a/tests/driver_ata8520e/Makefile +++ b/tests/driver_ata8520e/Makefile @@ -2,6 +2,6 @@ include ../Makefile.tests_common USEMODULE += ata8520e USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_ata8520e/app.config.test b/tests/driver_ata8520e/app.config.test index 08023d550f..056958125b 100644 --- a/tests/driver_ata8520e/app.config.test +++ b/tests/driver_ata8520e/app.config.test @@ -2,4 +2,4 @@ # application configuration. This is only needed during migration. CONFIG_MODULE_ATA8520E=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/driver_bq2429x/Makefile b/tests/driver_bq2429x/Makefile index 444836743e..113e4dcab0 100644 --- a/tests/driver_bq2429x/Makefile +++ b/tests/driver_bq2429x/Makefile @@ -2,6 +2,6 @@ include ../Makefile.tests_common USEMODULE += bq2429x USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_bq2429x/app.config.test b/tests/driver_bq2429x/app.config.test index 18a1cc39e9..148c39fdc4 100644 --- a/tests/driver_bq2429x/app.config.test +++ b/tests/driver_bq2429x/app.config.test @@ -1,4 +1,4 @@ CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y # include driver for bq2429x CONFIG_MODULE_BQ2429X=y diff --git a/tests/driver_cc110x/Makefile b/tests/driver_cc110x/Makefile index a237ce6918..c5ec5157d0 100644 --- a/tests/driver_cc110x/Makefile +++ b/tests/driver_cc110x/Makefile @@ -6,7 +6,7 @@ DEVICE ?= cc1100 # The MSB-A2 uses the CC1100. New boards use CC1101 # This test will rely on a human interacting with the shell, so we better add # the shell and some commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # Add the device driver USEMODULE += $(DEVICE) # Add a network stack and auto init of the network devices diff --git a/tests/driver_dfplayer/Makefile b/tests/driver_dfplayer/Makefile index b4f8e4f7d3..608aff8131 100644 --- a/tests/driver_dfplayer/Makefile +++ b/tests/driver_dfplayer/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common USEMODULE += dfplayer USEMODULE += event_thread USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_dfplayer/app.config.test b/tests/driver_dfplayer/app.config.test index 413048393b..7bf727fc4d 100644 --- a/tests/driver_dfplayer/app.config.test +++ b/tests/driver_dfplayer/app.config.test @@ -2,10 +2,11 @@ # application configuration. This is only needed during migration. CONFIG_MODULE_DFPLAYER=y -# enable event thread in lowest priority +# enable event thread CONFIG_MODULE_EVENT=y CONFIG_MODULE_EVENT_THREAD=y -# enable shell with basic commands +# enable shell CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +# pull in default commands for selected modules +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/driver_lis2dh12/Makefile b/tests/driver_lis2dh12/Makefile index 0fcc4a30c8..e8368077c2 100644 --- a/tests/driver_lis2dh12/Makefile +++ b/tests/driver_lis2dh12/Makefile @@ -7,7 +7,7 @@ USEMODULE += fmt USEMODULE += ztimer USEMODULE += ztimer_msec USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += $(DRIVER) # for using lis2dh12 with interrupt function diff --git a/tests/driver_lis2dh12/app.config.test b/tests/driver_lis2dh12/app.config.test index 414f43613c..d3b7469698 100644 --- a/tests/driver_lis2dh12/app.config.test +++ b/tests/driver_lis2dh12/app.config.test @@ -4,7 +4,7 @@ CONFIG_MODULE_FMT=y CONFIG_MODULE_ZTIMER=y CONFIG_MODULE_ZTIMER_MSEC=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_LIS2DH12=y CONFIG_MODULE_LIS2DH12_SPI=y diff --git a/tests/driver_motor_driver/Makefile b/tests/driver_motor_driver/Makefile index 649264d831..f46b722f31 100644 --- a/tests/driver_motor_driver/Makefile +++ b/tests/driver_motor_driver/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common USEMODULE += motor_driver USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += xtimer FEATURES_REQUIRED += periph_qdec diff --git a/tests/driver_motor_driver/app.config.test b/tests/driver_motor_driver/app.config.test index da65f95c55..8c82f9746d 100644 --- a/tests/driver_motor_driver/app.config.test +++ b/tests/driver_motor_driver/app.config.test @@ -2,6 +2,6 @@ # application configuration. This is only needed during migration. CONFIG_MODULE_MOTOR_DRIVER=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_XTIMER=y CONFIG_MODULE_PERIPH_QDEC=y diff --git a/tests/driver_netdev_common/Makefile.netdev.mk b/tests/driver_netdev_common/Makefile.netdev.mk index 9aa40120ed..6537631ae4 100644 --- a/tests/driver_netdev_common/Makefile.netdev.mk +++ b/tests/driver_netdev_common/Makefile.netdev.mk @@ -2,7 +2,7 @@ include ../Makefile.tests_common # Modules to include: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # allow to use a smaller packet buffer in low-PDU drivers diff --git a/tests/driver_nrf24l01p_lowlevel/Makefile b/tests/driver_nrf24l01p_lowlevel/Makefile index e84317a233..cbe24024b1 100644 --- a/tests/driver_nrf24l01p_lowlevel/Makefile +++ b/tests/driver_nrf24l01p_lowlevel/Makefile @@ -1,7 +1,7 @@ include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += ztimer_usec USEMODULE += nrf24l01p diff --git a/tests/driver_nrf24l01p_ng/Makefile b/tests/driver_nrf24l01p_ng/Makefile index 50ef24806d..c7321397fe 100644 --- a/tests/driver_nrf24l01p_ng/Makefile +++ b/tests/driver_nrf24l01p_ng/Makefile @@ -3,7 +3,7 @@ DEBUG ?= 0 include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += gnrc USEMODULE += auto_init_gnrc_netif diff --git a/tests/driver_nrfmin/Makefile b/tests/driver_nrfmin/Makefile index 2bdd3bb01a..490f54d003 100644 --- a/tests/driver_nrfmin/Makefile +++ b/tests/driver_nrfmin/Makefile @@ -9,7 +9,7 @@ USEMODULE += gnrc_ipv6 USEMODULE += gnrc_icmpv6_echo # also add the shell with some basic shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # microbit qemu failing currently TEST_ON_CI_BLACKLIST += microbit diff --git a/tests/driver_rn2xx3/Makefile b/tests/driver_rn2xx3/Makefile index 743e9be136..a01599fcfd 100644 --- a/tests/driver_rn2xx3/Makefile +++ b/tests/driver_rn2xx3/Makefile @@ -4,6 +4,6 @@ DRIVER ?= rn2483 USEMODULE += $(DRIVER) USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_rn2xx3/app.config.test b/tests/driver_rn2xx3/app.config.test index 6b73a740ca..c6e04ba512 100644 --- a/tests/driver_rn2xx3/app.config.test +++ b/tests/driver_rn2xx3/app.config.test @@ -2,4 +2,4 @@ # application configuration. This is only needed during migration. CONFIG_MODULE_RN2483=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/driver_sht1x/Makefile b/tests/driver_sht1x/Makefile index 4c51663c52..c12a297d86 100644 --- a/tests/driver_sht1x/Makefile +++ b/tests/driver_sht1x/Makefile @@ -6,7 +6,7 @@ BOARD ?= msba2 USEMODULE += $(DRIVER) USEMODULE += shell USEMODULE += saul_default -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_sht1x/app.config.test b/tests/driver_sht1x/app.config.test index ef1de3576c..92c3e6aef9 100644 --- a/tests/driver_sht1x/app.config.test +++ b/tests/driver_sht1x/app.config.test @@ -10,4 +10,4 @@ CONFIG_MODULE_SHT11=y CONFIG_MODULE_PS=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/driver_sx126x/Makefile b/tests/driver_sx126x/Makefile index 68af3a584c..5e9d36786e 100644 --- a/tests/driver_sx126x/Makefile +++ b/tests/driver_sx126x/Makefile @@ -5,6 +5,6 @@ LORA_DRIVER ?= sx1261 USEMODULE += $(LORA_DRIVER) USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_sx126x/app.config.test b/tests/driver_sx126x/app.config.test index 39ebfc6d2a..a2b70947a1 100644 --- a/tests/driver_sx126x/app.config.test +++ b/tests/driver_sx126x/app.config.test @@ -4,4 +4,4 @@ CONFIG_MODULE_SX126X=y CONFIG_MODULE_SX1261=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/driver_sx127x/Makefile b/tests/driver_sx127x/Makefile index dc1b6c8f94..17f463077a 100644 --- a/tests/driver_sx127x/Makefile +++ b/tests/driver_sx127x/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common USEMODULE += od USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps DRIVER ?= sx1276 diff --git a/tests/driver_sx127x/app.config.test b/tests/driver_sx127x/app.config.test index ef321ba62d..fc09713fbc 100644 --- a/tests/driver_sx127x/app.config.test +++ b/tests/driver_sx127x/app.config.test @@ -5,5 +5,5 @@ CONFIG_MODULE_SX1276=y CONFIG_MODULE_OD=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_PS=y diff --git a/tests/driver_sx1280/Makefile b/tests/driver_sx1280/Makefile index c7869c3c5e..3b683cd057 100644 --- a/tests/driver_sx1280/Makefile +++ b/tests/driver_sx1280/Makefile @@ -6,7 +6,7 @@ include ../Makefile.tests_common USEMODULE += sx1280 USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += iolist diff --git a/tests/driver_sx1280/app.config.test b/tests/driver_sx1280/app.config.test index aecb9479c4..c036b13850 100644 --- a/tests/driver_sx1280/app.config.test +++ b/tests/driver_sx1280/app.config.test @@ -5,4 +5,4 @@ CONFIG_MODULE_SX1280=y CONFIG_MODULE_IOLIST=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/emcute/Makefile b/tests/emcute/Makefile index b3a218a18e..e22fead280 100644 --- a/tests/emcute/Makefile +++ b/tests/emcute/Makefile @@ -22,7 +22,7 @@ USEMODULE += gnrc_netif_single # Only one interface used and it makes USEMODULE += emcute USEMODULE += od USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += sock_util CFLAGS += -DSTDIO_UART_RX_BUFSIZE="512" # Adapt to SHELL_BUFSIZE in app diff --git a/tests/gcoap_dns/Makefile b/tests/gcoap_dns/Makefile index b4934d414c..9a946c8bb9 100644 --- a/tests/gcoap_dns/Makefile +++ b/tests/gcoap_dns/Makefile @@ -11,7 +11,7 @@ USEMODULE += gnrc_ipv6_default USEMODULE += netdev_default USEMODULE += od USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default COAPS ?= 1 diff --git a/tests/gnrc_dhcpv6_client/Makefile b/tests/gnrc_dhcpv6_client/Makefile index 8ed0620acf..3c3efde5d6 100644 --- a/tests/gnrc_dhcpv6_client/Makefile +++ b/tests/gnrc_dhcpv6_client/Makefile @@ -28,7 +28,7 @@ else endif USEMODULE += auto_init_gnrc_netif -USEMODULE += shell_commands +USEMODULE += shell_cmds_default CFLAGS += -DDHCPV6_SERVER_PORT=$(DHCPV6_SERVER_PORT) diff --git a/tests/gnrc_dhcpv6_client_6lbr/Makefile b/tests/gnrc_dhcpv6_client_6lbr/Makefile index 8cf98b71d9..68c47192f4 100644 --- a/tests/gnrc_dhcpv6_client_6lbr/Makefile +++ b/tests/gnrc_dhcpv6_client_6lbr/Makefile @@ -11,7 +11,7 @@ USEMODULE += gnrc_pktdump USEMODULE += gnrc_sixlowpan_border_router_default USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # use Ethernet as link-layer protocol ifeq (native,$(BOARD)) diff --git a/tests/gnrc_dhcpv6_client_stateless/Makefile b/tests/gnrc_dhcpv6_client_stateless/Makefile index a8cd67525c..f3c8304e77 100644 --- a/tests/gnrc_dhcpv6_client_stateless/Makefile +++ b/tests/gnrc_dhcpv6_client_stateless/Makefile @@ -12,7 +12,7 @@ USEMODULE += netdev_default USEMODULE += gnrc_pktdump USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # use Ethernet as link-layer protocol ifeq (native,$(BOARD)) diff --git a/tests/gnrc_dhcpv6_relay/Makefile b/tests/gnrc_dhcpv6_relay/Makefile index bf1fce0cc0..efab4e650b 100644 --- a/tests/gnrc_dhcpv6_relay/Makefile +++ b/tests/gnrc_dhcpv6_relay/Makefile @@ -24,7 +24,7 @@ USEMODULE += auto_init_gnrc_netif USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # The test requires some setup and to be run as root # So it cannot currently be run diff --git a/tests/gnrc_gomach/Makefile b/tests/gnrc_gomach/Makefile index be72e4c496..26adca1493 100644 --- a/tests/gnrc_gomach/Makefile +++ b/tests/gnrc_gomach/Makefile @@ -9,7 +9,7 @@ BOARD_WHITELIST := samr21-xpro iotlab-m3 # Modules to include: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # include and auto-initialize all available sensors USEMODULE += saul_default diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile index 726989df9e..d87b16004b 100644 --- a/tests/gnrc_ipv6_ext/Makefile +++ b/tests/gnrc_ipv6_ext/Makefile @@ -25,7 +25,7 @@ USEMODULE += gnrc_ipv6_ext USEMODULE += od # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # The test requires some setup and to be run as root diff --git a/tests/gnrc_ipv6_ext_frag/Makefile b/tests/gnrc_ipv6_ext_frag/Makefile index c7ba5f083f..9339258af2 100644 --- a/tests/gnrc_ipv6_ext_frag/Makefile +++ b/tests/gnrc_ipv6_ext_frag/Makefile @@ -33,7 +33,7 @@ USEMODULE += od USEMODULE += embunit # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # The test requires some setup and to be run as root diff --git a/tests/gnrc_ipv6_ext_opt/Makefile b/tests/gnrc_ipv6_ext_opt/Makefile index c773ff8822..6deeb83c1c 100644 --- a/tests/gnrc_ipv6_ext_opt/Makefile +++ b/tests/gnrc_ipv6_ext_opt/Makefile @@ -24,7 +24,7 @@ USEMODULE += gnrc_ipv6_ext_opt USEMODULE += od # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # The test requires some setup and to be run as root diff --git a/tests/gnrc_ipv6_fwd_w_sub/Makefile b/tests/gnrc_ipv6_fwd_w_sub/Makefile index cdb15cf755..1d32d96fe5 100644 --- a/tests/gnrc_ipv6_fwd_w_sub/Makefile +++ b/tests/gnrc_ipv6_fwd_w_sub/Makefile @@ -9,7 +9,7 @@ USEMODULE += netdev_test USEMODULE += od USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += xtimer CFLAGS += -DTEST_SUITES diff --git a/tests/gnrc_ipv6_nib_dns/Makefile b/tests/gnrc_ipv6_nib_dns/Makefile index 656cdf248a..7d4225c734 100644 --- a/tests/gnrc_ipv6_nib_dns/Makefile +++ b/tests/gnrc_ipv6_nib_dns/Makefile @@ -21,7 +21,7 @@ endif USEMODULE += auto_init_gnrc_netif USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += posix_inet diff --git a/tests/gnrc_lwmac/Makefile b/tests/gnrc_lwmac/Makefile index 511bbd971f..37e8db3c91 100644 --- a/tests/gnrc_lwmac/Makefile +++ b/tests/gnrc_lwmac/Makefile @@ -9,7 +9,7 @@ BOARD_WHITELIST := samr21-xpro # Modules to include: USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Use modules for networking # gnrc is a meta module including all required, basic gnrc networking modules diff --git a/tests/gnrc_rpl/Makefile b/tests/gnrc_rpl/Makefile index c195e2d78e..2980cae979 100644 --- a/tests/gnrc_rpl/Makefile +++ b/tests/gnrc_rpl/Makefile @@ -7,7 +7,7 @@ USEMODULE += gnrc_icmpv6_echo USEMODULE += gnrc_rpl USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # automated test only works on native TEST_ON_CI_WHITELIST += native diff --git a/tests/gnrc_rpl_srh/Makefile b/tests/gnrc_rpl_srh/Makefile index c7e3112c4b..365e533990 100644 --- a/tests/gnrc_rpl_srh/Makefile +++ b/tests/gnrc_rpl_srh/Makefile @@ -29,7 +29,7 @@ USEMODULE += od USEMODULE += embunit # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # The test requires some setup and to be run as root diff --git a/tests/gnrc_sock_dns/Makefile b/tests/gnrc_sock_dns/Makefile index 778859888e..5b60dc584d 100644 --- a/tests/gnrc_sock_dns/Makefile +++ b/tests/gnrc_sock_dns/Makefile @@ -22,7 +22,7 @@ endif USEMODULE += auto_init_gnrc_netif USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += posix_inet diff --git a/tests/gnrc_sock_dodtls/Makefile b/tests/gnrc_sock_dodtls/Makefile index 5c65a19505..68018f167d 100644 --- a/tests/gnrc_sock_dodtls/Makefile +++ b/tests/gnrc_sock_dodtls/Makefile @@ -18,7 +18,7 @@ USEMODULE += posix_inet # tinydtls needs crypto secure PRNG USEMODULE += prng_sha1prng USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEPKG += tinydtls diff --git a/tests/gnrc_sock_tcp/Makefile b/tests/gnrc_sock_tcp/Makefile index 198ec5b55c..05b2d1824f 100644 --- a/tests/gnrc_sock_tcp/Makefile +++ b/tests/gnrc_sock_tcp/Makefile @@ -29,7 +29,7 @@ USEMODULE += gnrc_pktbuf_cmd USEMODULE += gnrc_netif_single # Only one interface used and it makes # shell commands easier USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += od # Export used tap device to environment diff --git a/tests/gnrc_tcp/Makefile b/tests/gnrc_tcp/Makefile index d8cfb187c7..3f27b297d0 100644 --- a/tests/gnrc_tcp/Makefile +++ b/tests/gnrc_tcp/Makefile @@ -34,7 +34,7 @@ USEMODULE += gnrc_pktbuf_cmd USEMODULE += gnrc_netif_single # Only one interface used and it makes # shell commands easier USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += od # Export used tap device to environment diff --git a/tests/gnrc_udp/Makefile b/tests/gnrc_udp/Makefile index 955b671d17..84349e1ecd 100644 --- a/tests/gnrc_udp/Makefile +++ b/tests/gnrc_udp/Makefile @@ -10,7 +10,7 @@ USEMODULE += gnrc_rpl USEMODULE += auto_init_gnrc_rpl USEMODULE += gnrc_icmpv6_echo USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += netstats_l2 USEMODULE += netstats_ipv6 diff --git a/tests/heap_cmd/Makefile b/tests/heap_cmd/Makefile index cf76693b16..c697144c0c 100644 --- a/tests/heap_cmd/Makefile +++ b/tests/heap_cmd/Makefile @@ -1,8 +1,8 @@ include ../Makefile.tests_common -USEMODULE += heap_cmd USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmd_heap +USEMODULE += shell_cmds_default USEMODULE += ps # microbit qemu failing currently diff --git a/tests/heap_cmd/app.config.test b/tests/heap_cmd/app.config.test new file mode 100644 index 0000000000..116ea6168a --- /dev/null +++ b/tests/heap_cmd/app.config.test @@ -0,0 +1,7 @@ +# this file enables modules defined in Kconfig. Do not use this file for +# application configuration. This is only needed during migration. + +CONFIG_MODULE_PS=y +CONFIG_MODULE_SHELL=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y +CONFIG_MODULE_SHELL_CMD_HEAP=y diff --git a/tests/heap_cmd/main.c b/tests/heap_cmd/main.c index 7aa4c54013..8fb24e4520 100644 --- a/tests/heap_cmd/main.c +++ b/tests/heap_cmd/main.c @@ -43,8 +43,8 @@ static int free_cmd(int argc, char **argv) unsigned int p = strtoul(argv[1], NULL, 16); void *ptr = (void *)p; + printf("freeing %p\n", ptr); free(ptr); - printf("freed %p\n", ptr); return 0; } diff --git a/tests/heap_cmd/mods-k b/tests/heap_cmd/mods-k new file mode 100644 index 0000000000..05442f1617 --- /dev/null +++ b/tests/heap_cmd/mods-k @@ -0,0 +1,61 @@ +=== [ATTENTION] Testing Kconfig dependency modelling === +=== [ATTENTION] Testing Kconfig dependency modelling === +auto_init +board +board_common_init +boards_common_nucleo +core +core_init +core_lib +core_msg +core_panic +core_thread +cortexm_common +cortexm_common_periph +cortexm_fpu +cpu +div +isrpipe +malloc_thread_safe +mpu_stack_guard +newlib +newlib_nano +newlib_syscalls_default +periph +periph_common +periph_gpio +periph_init +periph_init_gpio +periph_init_led0 +periph_init_led1 +periph_init_led2 +periph_init_led3 +periph_init_led4 +periph_init_led5 +periph_init_led6 +periph_init_led7 +periph_init_leds +periph_init_pm +periph_init_uart +periph_pm +periph_uart +pm_layered +ps +shell +shell_cmd_heap +shell_cmd_pm +shell_cmd_ps +shell_cmd_sys +shell_cmds +shell_cmds_default +stdin +stdio_available +stdio_uart +stdio_uart_rx +stm32_clk +stm32_vectors +sys +test_utils_interactive_sync +test_utils_interactive_sync_shell +test_utils_print_stack_usage +tsrb diff --git a/tests/heap_cmd/mods-no-k b/tests/heap_cmd/mods-no-k new file mode 100644 index 0000000000..dd43d63201 --- /dev/null +++ b/tests/heap_cmd/mods-no-k @@ -0,0 +1,59 @@ +auto_init +board +board_common_init +boards_common_nucleo +core +core_init +core_lib +core_msg +core_panic +core_thread +cortexm_common +cortexm_common_periph +cortexm_fpu +cpu +div +isrpipe +malloc_thread_safe +mpu_stack_guard +newlib +newlib_nano +newlib_syscalls_default +periph +periph_common +periph_gpio +periph_init +periph_init_gpio +periph_init_led0 +periph_init_led1 +periph_init_led2 +periph_init_led3 +periph_init_led4 +periph_init_led5 +periph_init_led6 +periph_init_led7 +periph_init_leds +periph_init_pm +periph_init_uart +periph_pm +periph_uart +pm_layered +ps +shell +shell_cmd_heap +shell_cmd_pm +shell_cmd_ps +shell_cmd_sys +shell_cmds +shell_cmds_default +stdin +stdio_available +stdio_uart +stdio_uart_rx +stm32_clk +stm32_vectors +sys +test_utils_interactive_sync +test_utils_interactive_sync_shell +test_utils_print_stack_usage +tsrb diff --git a/tests/ieee802154_hal/Makefile b/tests/ieee802154_hal/Makefile index cc66787e17..3253c8fde1 100644 --- a/tests/ieee802154_hal/Makefile +++ b/tests/ieee802154_hal/Makefile @@ -36,7 +36,7 @@ USEMODULE += luid USEMODULE += l2util USEMODULE += ieee802154 USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += event_thread USEMODULE += event_callback diff --git a/tests/ieee802154_hal/app.config.test b/tests/ieee802154_hal/app.config.test index 1c9285f9bc..59f948423d 100644 --- a/tests/ieee802154_hal/app.config.test +++ b/tests/ieee802154_hal/app.config.test @@ -4,7 +4,7 @@ CONFIG_MODULE_OD=y CONFIG_MODULE_LUID=y CONFIG_MODULE_IEEE802154=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_L2UTIL=y CONFIG_MODULE_PS=y diff --git a/tests/ieee802154_submac/Makefile b/tests/ieee802154_submac/Makefile index e88831b750..a213e7ac75 100644 --- a/tests/ieee802154_submac/Makefile +++ b/tests/ieee802154_submac/Makefile @@ -20,7 +20,7 @@ BOARD_WHITELIST := \ # USEMODULE += od USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += event_thread USEMODULE += netdev_default diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile index fe1668f9e0..24de0e8c92 100644 --- a/tests/lwip/Makefile +++ b/tests/lwip/Makefile @@ -27,7 +27,7 @@ USEMODULE += sock_tcp USEMODULE += sock_udp USEMODULE += sock_util USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += od USEMODULE += netdev_default diff --git a/tests/memarray/Makefile b/tests/memarray/Makefile index 7076703cf1..d51aed6a30 100644 --- a/tests/memarray/Makefile +++ b/tests/memarray/Makefile @@ -2,7 +2,7 @@ include ../Makefile.tests_common USEMODULE += memarray # Used for invoking _ps_handler -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps include $(RIOTBASE)/Makefile.include diff --git a/tests/mtd_raw/Makefile b/tests/mtd_raw/Makefile index 29b2bac58b..812022b200 100644 --- a/tests/mtd_raw/Makefile +++ b/tests/mtd_raw/Makefile @@ -1,7 +1,7 @@ include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += od USEMODULE += mtd diff --git a/tests/mtd_raw/app.config.test b/tests/mtd_raw/app.config.test index 8101ab68e0..a19c041d6b 100644 --- a/tests/mtd_raw/app.config.test +++ b/tests/mtd_raw/app.config.test @@ -4,4 +4,4 @@ CONFIG_MODULE_MTD=y CONFIG_MODULE_MTD_WRITE_PAGE=y CONFIG_MODULE_OD=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/nanocoap_cli/Makefile b/tests/nanocoap_cli/Makefile index f280ab7951..dd950b995b 100644 --- a/tests/nanocoap_cli/Makefile +++ b/tests/nanocoap_cli/Makefile @@ -25,7 +25,7 @@ ifeq (,$(filter $(BOARD),$(LOW_MEMORY_BOARDS))) USEMODULE += nanocoap_vfs USEMODULE += vfs_default # USEMODULE += vfs_auto_format - USEMODULE += shell_commands + USEMODULE += shell_cmds_default # VFS operations require more stack on the main thread CFLAGS += -DTHREAD_STACKSIZE_MAIN=THREAD_STACKSIZE_LARGE diff --git a/tests/netstats_l2/Makefile b/tests/netstats_l2/Makefile index beee00d36b..6b6475952e 100644 --- a/tests/netstats_l2/Makefile +++ b/tests/netstats_l2/Makefile @@ -4,7 +4,7 @@ include $(RIOTBASE)/tests/Makefile.boards.netif BOARD_WHITELIST += $(BOARD_PROVIDES_NETIF) USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += gnrc USEMODULE += netdev_default USEMODULE += auto_init_gnrc_netif diff --git a/tests/nimble_autoconn_ccnl/Makefile b/tests/nimble_autoconn_ccnl/Makefile index fe77690938..2e3cd7980d 100644 --- a/tests/nimble_autoconn_ccnl/Makefile +++ b/tests/nimble_autoconn_ccnl/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/nimble_autoconn_gnrc/Makefile b/tests/nimble_autoconn_gnrc/Makefile index e46e1dd11f..f0147fd783 100644 --- a/tests/nimble_autoconn_gnrc/Makefile +++ b/tests/nimble_autoconn_gnrc/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/nimble_autoconn_gnrc_ext/Makefile b/tests/nimble_autoconn_gnrc_ext/Makefile index d63fd5a7e7..33b08364cc 100644 --- a/tests/nimble_autoconn_gnrc_ext/Makefile +++ b/tests/nimble_autoconn_gnrc_ext/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/nimble_ext_adv/Makefile b/tests/nimble_ext_adv/Makefile index 8d6e5107e2..cf1735b8d1 100644 --- a/tests/nimble_ext_adv/Makefile +++ b/tests/nimble_ext_adv/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # we want shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # setup NimBLE specific modules USEMODULE += nimble_scanner USEMODULE += nimble_scanlist diff --git a/tests/nimble_l2cap/Makefile b/tests/nimble_l2cap/Makefile index 979e7df1ce..2333ef219d 100644 --- a/tests/nimble_l2cap/Makefile +++ b/tests/nimble_l2cap/Makefile @@ -7,7 +7,7 @@ include ../Makefile.tests_common # RIOT modules used in for this test USEMODULE += xtimer USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += bluetil_ad diff --git a/tests/nimble_netif_ext/Makefile b/tests/nimble_netif_ext/Makefile index 744dc8e258..192467a01a 100644 --- a/tests/nimble_netif_ext/Makefile +++ b/tests/nimble_netif_ext/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/nimble_rpble_gnrc/Makefile b/tests/nimble_rpble_gnrc/Makefile index b57fffb558..38cab4d31e 100644 --- a/tests/nimble_rpble_gnrc/Makefile +++ b/tests/nimble_rpble_gnrc/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/nimble_rpble_gnrc_ext/Makefile b/tests/nimble_rpble_gnrc_ext/Makefile index d7b7d01194..82406ac0fb 100644 --- a/tests/nimble_rpble_gnrc_ext/Makefile +++ b/tests/nimble_rpble_gnrc_ext/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Enable single interface optimization. diff --git a/tests/nimble_statconn_gnrc/Makefile b/tests/nimble_statconn_gnrc/Makefile index 4e88778876..702963f37e 100644 --- a/tests/nimble_statconn_gnrc/Makefile +++ b/tests/nimble_statconn_gnrc/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/nimble_statconn_gnrc_ext/Makefile b/tests/nimble_statconn_gnrc_ext/Makefile index c0a373c6dc..5407e75f05 100644 --- a/tests/nimble_statconn_gnrc_ext/Makefile +++ b/tests/nimble_statconn_gnrc_ext/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common # include shell support USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Include GNRC and RPL diff --git a/tests/periph_eeprom/Makefile b/tests/periph_eeprom/Makefile index 141993064e..38f0c9b209 100644 --- a/tests/periph_eeprom/Makefile +++ b/tests/periph_eeprom/Makefile @@ -3,6 +3,6 @@ include ../Makefile.tests_common FEATURES_REQUIRED += periph_eeprom USEMODULE += shell -USEMODULE += shell_commands # provides reboot command +USEMODULE += shell_cmds_default # provides reboot command include $(RIOTBASE)/Makefile.include diff --git a/tests/periph_eeprom/app.config.test b/tests/periph_eeprom/app.config.test index 57992e4cff..475eef2f99 100644 --- a/tests/periph_eeprom/app.config.test +++ b/tests/periph_eeprom/app.config.test @@ -2,4 +2,4 @@ # application configuration. This is only needed during migration. CONFIG_MODULE_PERIPH_EEPROM=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y # provides reboot command +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y # provides reboot command diff --git a/tests/periph_gpio/Makefile b/tests/periph_gpio/Makefile index 22b4aab787..90646cc702 100644 --- a/tests/periph_gpio/Makefile +++ b/tests/periph_gpio/Makefile @@ -8,7 +8,7 @@ FEATURES_OPTIONAL += periph_gpio_fast_read FEATURES_OPTIONAL += periph_gpio_tamper_wake USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += benchmark # disable native GPIOs for automatic test diff --git a/tests/periph_gpio/app.config.test b/tests/periph_gpio/app.config.test index ca8136be1e..a045e68edf 100644 --- a/tests/periph_gpio/app.config.test +++ b/tests/periph_gpio/app.config.test @@ -4,4 +4,4 @@ CONFIG_MODULE_PERIPH_GPIO=y CONFIG_MODULE_BENCHMARK=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/periph_i2c/Makefile b/tests/periph_i2c/Makefile index f2d1595375..fbea86a412 100644 --- a/tests/periph_i2c/Makefile +++ b/tests/periph_i2c/Makefile @@ -5,8 +5,8 @@ FEATURES_REQUIRED = periph_i2c FEATURES_OPTIONAL = periph_i2c_reconfigure USEMODULE += shell -USEMODULE += shell_commands -USEMODULE += i2c_scan +USEMODULE += shell_cmds_default +USEMODULE += shell_cmd_i2c_scan USEMODULE += xtimer # avoid running Kconfig by default diff --git a/tests/periph_i2c/app.config.test b/tests/periph_i2c/app.config.test index 47bbe4894c..e4ef850de6 100644 --- a/tests/periph_i2c/app.config.test +++ b/tests/periph_i2c/app.config.test @@ -1,7 +1,7 @@ # this file enables modules defined in Kconfig. Do not use this file for # application configuration. This is only needed during migration. -CONFIG_MODULE_I2C_SCAN=y CONFIG_MODULE_PERIPH_I2C=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y +CONFIG_MODULE_SHELL_CMD_I2C_SCAN=y CONFIG_MODULE_XTIMER=y diff --git a/tests/periph_pm/Makefile b/tests/periph_pm/Makefile index 22823dafd7..77fb095320 100644 --- a/tests/periph_pm/Makefile +++ b/tests/periph_pm/Makefile @@ -5,7 +5,7 @@ FEATURES_OPTIONAL += periph_rtc FEATURES_OPTIONAL += periph_gpio_irq USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # avoid running Kconfig by default SHOULD_RUN_KCONFIG ?= diff --git a/tests/periph_pm/app.config.test b/tests/periph_pm/app.config.test index 31ed3d3685..3982a41739 100644 --- a/tests/periph_pm/app.config.test +++ b/tests/periph_pm/app.config.test @@ -1,4 +1,4 @@ # this file enables modules defined in Kconfig. Do not use this file for # application configuration. This is only needed during migration. CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y diff --git a/tests/periph_spi/Makefile b/tests/periph_spi/Makefile index db32addf76..c2a51b6f50 100644 --- a/tests/periph_spi/Makefile +++ b/tests/periph_spi/Makefile @@ -13,7 +13,7 @@ endif USEMODULE += ztimer_usec USEMODULE += ztimer_sec USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += schedstatistics # avoid running Kconfig by default diff --git a/tests/periph_spi/app.config.test b/tests/periph_spi/app.config.test index c7079a1a8b..5df76331aa 100644 --- a/tests/periph_spi/app.config.test +++ b/tests/periph_spi/app.config.test @@ -3,7 +3,7 @@ CONFIG_MODULE_PERIPH_SPI=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_SCHEDSTATISTICS=y CONFIG_MODULE_ZTIMER=y CONFIG_MODULE_ZTIMER_SEC=y diff --git a/tests/periph_spi_dma/app.config.test b/tests/periph_spi_dma/app.config.test index e00e33a81b..8e293cf61c 100644 --- a/tests/periph_spi_dma/app.config.test +++ b/tests/periph_spi_dma/app.config.test @@ -4,7 +4,7 @@ CONFIG_MODULE_PERIPH_DMA=y CONFIG_MODULE_PERIPH_SPI=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_SCHEDSTATISTICS=y CONFIG_MODULE_ZTIMER=y CONFIG_MODULE_ZTIMER_SEC=y diff --git a/tests/pkg_edhoc_c/Makefile b/tests/pkg_edhoc_c/Makefile index 4fd47ac3c6..03373e6c1c 100644 --- a/tests/pkg_edhoc_c/Makefile +++ b/tests/pkg_edhoc_c/Makefile @@ -29,7 +29,7 @@ USEMODULE += nanocoap_sock # include this for printing IP addresses USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += xtimer diff --git a/tests/pkg_openwsn/Makefile b/tests/pkg_openwsn/Makefile index 8110e246fe..a0579da463 100644 --- a/tests/pkg_openwsn/Makefile +++ b/tests/pkg_openwsn/Makefile @@ -80,7 +80,7 @@ endif USEMODULE += ps USEMODULE += od_string USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # ztimer is used instead of xtimer because it's a dependency of some # OpenWSN modules. diff --git a/tests/pkg_semtech-loramac/Makefile b/tests/pkg_semtech-loramac/Makefile index ad2f10c202..35cd3f6fc6 100644 --- a/tests/pkg_semtech-loramac/Makefile +++ b/tests/pkg_semtech-loramac/Makefile @@ -21,7 +21,7 @@ endif USEMODULE += auto_init_loramac USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += fmt FEATURES_OPTIONAL += periph_eeprom diff --git a/tests/pkg_tinydtls_sock_async/Makefile b/tests/pkg_tinydtls_sock_async/Makefile index b9af1110f5..f13416cb8d 100644 --- a/tests/pkg_tinydtls_sock_async/Makefile +++ b/tests/pkg_tinydtls_sock_async/Makefile @@ -23,7 +23,7 @@ USEMODULE += prng_sha1prng # Add also the shell, some shell commands USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # Bitfield to log open sessions USEMODULE += bitfield diff --git a/tests/ps_schedstatistics/Makefile b/tests/ps_schedstatistics/Makefile index 064e192ca7..1e2282c1ff 100644 --- a/tests/ps_schedstatistics/Makefile +++ b/tests/ps_schedstatistics/Makefile @@ -1,7 +1,7 @@ include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += schedstatistics USEMODULE += printf_float diff --git a/tests/riotboot/Makefile b/tests/riotboot/Makefile index 47d59012c7..a3a9d019a0 100644 --- a/tests/riotboot/Makefile +++ b/tests/riotboot/Makefile @@ -7,8 +7,8 @@ FEATURES_REQUIRED += riotboot # Include modules to test the bootloader USEMODULE += riotboot_slot USEMODULE += shell -# Add shell_commands to use the shell version of `test_utils_interactive_sync` -USEMODULE += shell_commands +# Add shell_cmds_default to use the shell version of `test_utils_interactive_sync` +USEMODULE += shell_cmds_default # Comment this out to disable code in RIOT that does safety checking # which is not needed in a production environment but helps in the diff --git a/tests/riotboot_flashwrite/Makefile b/tests/riotboot_flashwrite/Makefile index d85bca312c..0ae3df552e 100644 --- a/tests/riotboot_flashwrite/Makefile +++ b/tests/riotboot_flashwrite/Makefile @@ -16,7 +16,7 @@ USEMODULE += nanocoap_sock # include this for printing IP addresses USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # include riotboot modules USEMODULE += riotboot_flashwrite diff --git a/tests/rng/Makefile b/tests/rng/Makefile index 127240b1d3..ecd123a0d7 100644 --- a/tests/rng/Makefile +++ b/tests/rng/Makefile @@ -9,7 +9,7 @@ CFLAGS += -DTHREAD_STACKSIZE_MAIN=\($(MAIN_THREAD_SIZE)\) USEMODULE += fmt USEMODULE += random -USEMODULE += random_cmd +USEMODULE += shell_cmd_random USEMODULE += shell USEMODULE += xtimer diff --git a/tests/sched_change_priority/Makefile b/tests/sched_change_priority/Makefile index a39f492c4a..cf57c24a52 100644 --- a/tests/sched_change_priority/Makefile +++ b/tests/sched_change_priority/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common USEMODULE += nice USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # Use a terminal that does not introduce extra characters into the stream. RIOT_TERMINAL ?= socat diff --git a/tests/shell/Makefile b/tests/shell/Makefile index dd3b6d7db1..206c2c632e 100644 --- a/tests/shell/Makefile +++ b/tests/shell/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common USEMODULE += app_metadata USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps # Use a terminal that does not introduce extra characters into the stream. diff --git a/tests/shell/app.config.test b/tests/shell/app.config.test index 8ff6b558ef..86c4322506 100644 --- a/tests/shell/app.config.test +++ b/tests/shell/app.config.test @@ -1,4 +1,4 @@ CONFIG_MODULE_APP_METADATA=y CONFIG_MODULE_SHELL=y -CONFIG_MODULE_SHELL_COMMANDS=y +CONFIG_MODULE_SHELL_CMDS_DEFAULT=y CONFIG_MODULE_PS=y diff --git a/tests/shell_ble/Makefile b/tests/shell_ble/Makefile index 33fac843d1..dcaf430ad7 100644 --- a/tests/shell_ble/Makefile +++ b/tests/shell_ble/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common USEMODULE += app_metadata USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps USEMODULE += stdio_nimble stdio_nimble_debug diff --git a/tests/shell_lock/Makefile b/tests/shell_lock/Makefile index 2efe63f646..3bbeb75072 100644 --- a/tests/shell_lock/Makefile +++ b/tests/shell_lock/Makefile @@ -2,7 +2,7 @@ DEVELHELP=0 include ../Makefile.tests_common USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += shell_lock USEMODULE += shell_lock_auto_locking diff --git a/tests/slip/Makefile b/tests/slip/Makefile index bfc497ea85..59cad46f65 100644 --- a/tests/slip/Makefile +++ b/tests/slip/Makefile @@ -6,7 +6,7 @@ USEMODULE += gnrc_pktdump USEMODULE += gnrc_txtsnd USEMODULE += slipdev USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default # set slip parameters to default values if unset SLIP_UART ?= "UART_NUMOF-1" diff --git a/tests/sntp/Makefile b/tests/sntp/Makefile index b1de89aa74..10b9035683 100644 --- a/tests/sntp/Makefile +++ b/tests/sntp/Makefile @@ -5,6 +5,6 @@ USEMODULE += gnrc_ipv6_default USEMODULE += auto_init_gnrc_netif USEMODULE += netdev_default USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/sock_udp_aux/Makefile b/tests/sock_udp_aux/Makefile index 9234a4c2a5..ffc651aea0 100644 --- a/tests/sock_udp_aux/Makefile +++ b/tests/sock_udp_aux/Makefile @@ -14,7 +14,7 @@ USEMODULE += netstats_ipv6 USEMODULE += netstats_l2 USEMODULE += ps USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += sock_aux_local USEMODULE += sock_aux_rssi diff --git a/tests/stm32_bootloader/Makefile b/tests/stm32_bootloader/Makefile index ea9ef31f44..b1e1f3dc6c 100644 --- a/tests/stm32_bootloader/Makefile +++ b/tests/stm32_bootloader/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common FEATURES_REQUIRED = bootloader_stm32 USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += usb_board_reset include $(RIOTBASE)/Makefile.include diff --git a/tests/sys_stdio_semihosting/Makefile b/tests/sys_stdio_semihosting/Makefile index 43c6328b18..2884eb0bc5 100644 --- a/tests/sys_stdio_semihosting/Makefile +++ b/tests/sys_stdio_semihosting/Makefile @@ -2,7 +2,7 @@ include ../Makefile.tests_common USEMODULE += stdio_semihosting USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps RIOT_TERMINAL = semihosting diff --git a/tests/usbus_cdc_acm_stdio/Makefile b/tests/usbus_cdc_acm_stdio/Makefile index e3e13039a9..89c688fada 100644 --- a/tests/usbus_cdc_acm_stdio/Makefile +++ b/tests/usbus_cdc_acm_stdio/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common USEMODULE += stdio_cdc_acm USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps include $(RIOTBASE)/Makefile.include diff --git a/tests/usbus_cdc_ecm/Makefile b/tests/usbus_cdc_ecm/Makefile index ae7a94bb4d..f632e5d40c 100644 --- a/tests/usbus_cdc_ecm/Makefile +++ b/tests/usbus_cdc_ecm/Makefile @@ -6,7 +6,7 @@ USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_icmpv6_echo USEMODULE += usbus_cdc_ecm USEMODULE += shell -USEMODULE += shell_commands +USEMODULE += shell_cmds_default USEMODULE += ps include $(RIOTBASE)/Makefile.include diff --git a/tests/vfs_default/Makefile b/tests/vfs_default/Makefile index d63f8f390f..182a670dea 100644 --- a/tests/vfs_default/Makefile +++ b/tests/vfs_default/Makefile @@ -3,9 +3,9 @@ include ../Makefile.tests_common USEMODULE += vfs_default USEMODULE += vfs_auto_format -USEMODULE += shell USEMODULE += ps -USEMODULE += shell_commands +USEMODULE += shell +USEMODULE += shell_cmds_default include $(RIOTBASE)/Makefile.include diff --git a/tests/xtimer_mutex_lock_timeout/Makefile b/tests/xtimer_mutex_lock_timeout/Makefile index 24c6fb4f1d..43c775e0af 100644 --- a/tests/xtimer_mutex_lock_timeout/Makefile +++ b/tests/xtimer_mutex_lock_timeout/Makefile @@ -5,7 +5,7 @@ USEMODULE += shell #for testing #USEMODULE += ps -#USEMODULE += shell_commands +#USEMODULE += shell_cmds_default # microbit qemu failing currently TEST_ON_CI_BLACKLIST += microbit diff --git a/tests/xtimer_mutex_lock_timeout/app.config.test b/tests/xtimer_mutex_lock_timeout/app.config.test index 82f339eb2f..3b139fb8c3 100644 --- a/tests/xtimer_mutex_lock_timeout/app.config.test +++ b/tests/xtimer_mutex_lock_timeout/app.config.test @@ -5,4 +5,4 @@ CONFIG_MODULE_SHELL=y # for testing # CONFIG_MODULE_PS=y -# CONFIG_MODULE_SHELL_COMMANDS=y +# CONFIG_MODULE_SHELL_CMDS_DEFAULT=y