RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #18649 from maribu/sys/shell/cmds

Browse Source 
sys/shell/cmds: fix shell_cmd_netif LoRaWAN integration
This commit is contained in:
Marian Buschsieweke 2022-10-07 12:19:57 +02:00 committed by GitHub
commit 213c35bb71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefiles/deprecated_modules.inc.mk
View File

@ -2,6 +2,7 @@
# Keep this list ALPHABETICALLY SORTED!!!!111elven # Keep this list ALPHABETICALLY SORTED!!!!111elven
DEPRECATED_MODULES += event_thread_lowest DEPRECATED_MODULES += event_thread_lowest
DEPRECATED_MODULES += gnrc_netdev_default DEPRECATED_MODULES += gnrc_netdev_default
DEPRECATED_MODULES += gnrc_netif_cmd_lora # use shell_cmd_gnrc_netif_lorawan instead
DEPRECATED_MODULES += gnrc_pktbuf_cmd # use shell_cmd_gnrc_pktbuf instead DEPRECATED_MODULES += gnrc_pktbuf_cmd # use shell_cmd_gnrc_pktbuf instead
DEPRECATED_MODULES += gnrc_udp_cmd # use shell_cmd_grnc_udp instead DEPRECATED_MODULES += gnrc_udp_cmd # use shell_cmd_grnc_udp instead
DEPRECATED_MODULES += heap_cmd # use shell_cmd_heap instead DEPRECATED_MODULES += heap_cmd # use shell_cmd_heap instead
@ -10,7 +11,7 @@ DEPRECATED_MODULES += md5sum # use shell_cmd_md5sum instead
DEPRECATED_MODULES += nice # use shell_cmd_nice instead DEPRECATED_MODULES += nice # use shell_cmd_nice instead
DEPRECATED_MODULES += random_cmd # use shell_cmd_random instead DEPRECATED_MODULES += random_cmd # use shell_cmd_random instead
DEPRECATED_MODULES += sema_deprecated DEPRECATED_MODULES += sema_deprecated
DEPRECATED_MODULES += shell_commands # use shell_cmds_default instead
DEPRECATED_MODULES += sha1sum # use shell_cmd_sha1sum instead DEPRECATED_MODULES += sha1sum # use shell_cmd_sha1sum instead
DEPRECATED_MODULES += sha256sum # use shell_cmd_sha256sum instead DEPRECATED_MODULES += sha256sum # use shell_cmd_sha256sum instead
DEPRECATED_MODULES += shell_commands # use shell_cmds_default instead
DEPRECATED_MODULES += ztimer_now64 DEPRECATED_MODULES += ztimer_now64

1
makefiles/pseudomodules.inc.mk
View File

@ -305,6 +305,7 @@ PSEUDOMODULES += shell_cmd_gnrc_ipv6_frag_stats
PSEUDOMODULES += shell_cmd_gnrc_ipv6_nib PSEUDOMODULES += shell_cmd_gnrc_ipv6_nib
PSEUDOMODULES += shell_cmd_gnrc_ipv6_whitelist PSEUDOMODULES += shell_cmd_gnrc_ipv6_whitelist
PSEUDOMODULES += shell_cmd_gnrc_netif PSEUDOMODULES += shell_cmd_gnrc_netif
PSEUDOMODULES += shell_cmd_gnrc_netif_lorawan
PSEUDOMODULES += shell_cmd_gnrc_pktbuf PSEUDOMODULES += shell_cmd_gnrc_pktbuf
PSEUDOMODULES += shell_cmd_gnrc_rpl PSEUDOMODULES += shell_cmd_gnrc_rpl
PSEUDOMODULES += shell_cmd_gnrc_sixlowpan_ctx PSEUDOMODULES += shell_cmd_gnrc_sixlowpan_ctx

4
sys/net/gnrc/Makefile.dep
View File

@ -76,6 +76,10 @@ ifneq (,$(filter gnrc_dhcpv6_client_simple_pd,$(USEMODULE)))
USEMODULE += dhcpv6_client_ia_pd USEMODULE += dhcpv6_client_ia_pd
endif endif
ifneq (,$(filter gnrc_netif_cmd_lora,$(USEMODULE)))
USEMODULE += shell_cmd_gnrc_netif_lorawan
endif
ifneq (,$(filter gnrc_uhcpc,$(USEMODULE))) ifneq (,$(filter gnrc_uhcpc,$(USEMODULE)))
DEFAULT_MODULE += auto_init_gnrc_uhcpc DEFAULT_MODULE += auto_init_gnrc_uhcpc
USEMODULE += uhcpc USEMODULE += uhcpc

7
sys/shell/Makefile.dep
View File

@ -57,6 +57,9 @@ ifneq (,$(filter shell_cmds_default,$(USEMODULE)))
ifneq (,$(filter gnrc_netif,$(USEMODULE))) ifneq (,$(filter gnrc_netif,$(USEMODULE)))
USEMODULE += shell_cmd_gnrc_netif USEMODULE += shell_cmd_gnrc_netif
endif endif
ifneq (,$(filter gnrc_netif_lorawan,$(USEMODULE)))
USEMODULE += shell_cmd_gnrc_netif_lorawan
endif
ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE))) ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE)))
USEMODULE += shell_cmd_gnrc_pktbuf USEMODULE += shell_cmd_gnrc_pktbuf
endif endif
@ -186,6 +189,10 @@ endif
ifneq (,$(filter shell_cmd_gnrc_netif,$(USEMODULE))) ifneq (,$(filter shell_cmd_gnrc_netif,$(USEMODULE)))
USEMODULE += gnrc_netif USEMODULE += gnrc_netif
endif endif
ifneq (,$(filter shell_cmd_gnrc_netif_lorawan,$(USEMODULE)))
USEMODULE += gnrc_netif_lorawan
USEMODULE += shell_cmd_gnrc_netif
endif
ifneq (,$(filter shell_cmd_gnrc_pktbuf,$(USEMODULE))) ifneq (,$(filter shell_cmd_gnrc_pktbuf,$(USEMODULE)))
USEMODULE += gnrc_pktbuf USEMODULE += gnrc_pktbuf
endif endif

8
sys/shell/cmds/Kconfig
View File

@ -119,6 +119,14 @@ config MODULE_SHELL_CMD_GNRC_NETIF
depends on MODULE_SHELL_CMDS depends on MODULE_SHELL_CMDS
depends on MODULE_GNRC_NETIF depends on MODULE_GNRC_NETIF
config MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN
bool "LoRa integration to the GNRC network interface command (ifconfig)"
default y if MODULE_SHELL_CMD_GNRC_NETIF && MODULE_GNRC_NETIF_LORAWAN
depends on MODULE_GNRC_NETIF
depends on MODULE_GNRC_NETIF_LORAWAN
depends on MODULE_SHELL_CMDS
depends on MODULE_SHELL_CMD_GNRC_NETIF
config MODULE_SHELL_CMD_GNRC_PKTBUF config MODULE_SHELL_CMD_GNRC_PKTBUF
bool "Command to print stats of the GNRC packet buffer" bool "Command to print stats of the GNRC packet buffer"
default y if MODULE_SHELL_CMDS_DEFAULT default y if MODULE_SHELL_CMDS_DEFAULT

24
sys/shell/cmds/gnrc_netif.c
View File

@ -214,7 +214,7 @@ static void _set_usage(char *cmd_name)
" * \"pan\" - alias for \"nid\"\n" " * \"pan\" - alias for \"nid\"\n"
" * \"pan_id\" - alias for \"nid\"\n" " * \"pan_id\" - alias for \"nid\"\n"
" * \"phy_busy\" - set busy mode on-off\n" " * \"phy_busy\" - set busy mode on-off\n"
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
" * \"bw\" - alias for channel bandwidth\n" " * \"bw\" - alias for channel bandwidth\n"
" * \"sf\" - alias for spreading factor\n" " * \"sf\" - alias for spreading factor\n"
" * \"cr\" - alias for coding rate\n" " * \"cr\" - alias for coding rate\n"
@ -390,7 +390,7 @@ static void _print_netopt(netopt_t opt)
printf("encryption key"); printf("encryption key");
break; break;
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
case NETOPT_BANDWIDTH: case NETOPT_BANDWIDTH:
printf("bandwidth"); printf("bandwidth");
break; break;
@ -402,7 +402,7 @@ static void _print_netopt(netopt_t opt)
case NETOPT_CODING_RATE: case NETOPT_CODING_RATE:
printf("coding rate"); printf("coding rate");
break; break;
#endif /* MODULE_GNRC_NETIF_CMD_LORA */ #endif /* MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN */
#ifdef MODULE_NETDEV_IEEE802154_MULTIMODE #ifdef MODULE_NETDEV_IEEE802154_MULTIMODE
case NETOPT_IEEE802154_PHY: case NETOPT_IEEE802154_PHY:
@ -503,7 +503,7 @@ static const char *_netopt_state_str[] = {
[NETOPT_STATE_STANDBY] = "STANDBY" [NETOPT_STATE_STANDBY] = "STANDBY"
}; };
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
static const char *_netopt_bandwidth_str[] = { static const char *_netopt_bandwidth_str[] = {
[LORA_BW_125_KHZ] = "125", [LORA_BW_125_KHZ] = "125",
[LORA_BW_250_KHZ] = "250", [LORA_BW_250_KHZ] = "250",
@ -675,7 +675,7 @@ static void _netif_list(netif_t *iface)
if (res >= 0) { if (res >= 0) {
printf(" RSSI: %d ", i16); printf(" RSSI: %d ", i16);
} }
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
res = netif_get_opt(iface, NETOPT_BANDWIDTH, 0, &u8, sizeof(u8)); res = netif_get_opt(iface, NETOPT_BANDWIDTH, 0, &u8, sizeof(u8));
if (res >= 0) { if (res >= 0) {
printf(" BW: %skHz ", _netopt_bandwidth_str[u8]); printf(" BW: %skHz ", _netopt_bandwidth_str[u8]);
@ -688,7 +688,7 @@ static void _netif_list(netif_t *iface)
if (res >= 0) { if (res >= 0) {
printf(" CR: %s ", _netopt_coding_rate_str[u8]); printf(" CR: %s ", _netopt_coding_rate_str[u8]);
} }
#endif /* MODULE_GNRC_NETIF_CMD_LORA */ #endif /* MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN */
#ifdef MODULE_NETDEV_IEEE802154 #ifdef MODULE_NETDEV_IEEE802154
res = netif_get_opt(iface, NETOPT_IEEE802154_PHY, 0, &u8, sizeof(u8)); res = netif_get_opt(iface, NETOPT_IEEE802154_PHY, 0, &u8, sizeof(u8));
if (res >= 0) { if (res >= 0) {
@ -808,7 +808,7 @@ static void _netif_list(netif_t *iface)
} }
line_thresh++; line_thresh++;
} }
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
res = netif_get_opt(iface, NETOPT_DEMOD_MARGIN, 0, &u8, sizeof(u8)); res = netif_get_opt(iface, NETOPT_DEMOD_MARGIN, 0, &u8, sizeof(u8));
if (res >= 0) { if (res >= 0) {
printf(" Demod margin.: %u ", (unsigned)u8); printf(" Demod margin.: %u ", (unsigned)u8);
@ -998,7 +998,7 @@ static int _netif_set_u32(netif_t *iface, netopt_t opt, uint32_t context,
return 0; return 0;
} }
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
static int _netif_set_bandwidth(netif_t *iface, char *value) static int _netif_set_bandwidth(netif_t *iface, char *value)
{ {
uint8_t bw; uint8_t bw;
@ -1059,7 +1059,7 @@ static int _netif_set_coding_rate(netif_t *iface, char *value)
return 0; return 0;
} }
#endif /* MODULE_GNRC_NETIF_CMD_LORA */ #endif /* MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN */
#ifdef MODULE_NETDEV_IEEE802154_MR_FSK #ifdef MODULE_NETDEV_IEEE802154_MR_FSK
static int _netif_set_fsk_fec(netif_t *iface, char *value) static int _netif_set_fsk_fec(netif_t *iface, char *value)
@ -1251,7 +1251,7 @@ static int _netif_set_flag(netif_t *iface, netopt_t opt, netopt_enable_t set)
return 0; return 0;
} }
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
static int _netif_set_lw_key(netif_t *iface, netopt_t opt, char *key_str) static int _netif_set_lw_key(netif_t *iface, netopt_t opt, char *key_str)
{ {
/* This is the longest key */ /* This is the longest key */
@ -1503,7 +1503,7 @@ static int _netif_set(char *cmd_name, netif_t *iface, char *key, char *value)
else if ((strcmp("frequency", key) == 0) || (strcmp("freq", key) == 0)) { else if ((strcmp("frequency", key) == 0) || (strcmp("freq", key) == 0)) {
return _netif_set_u32(iface, NETOPT_CHANNEL_FREQUENCY, 0, value); return _netif_set_u32(iface, NETOPT_CHANNEL_FREQUENCY, 0, value);
} }
#ifdef MODULE_GNRC_NETIF_CMD_LORA #if IS_USED(MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN)
else if ((strcmp("bandwidth", key) == 0) || (strcmp("bw", key) == 0)) { else if ((strcmp("bandwidth", key) == 0) || (strcmp("bw", key) == 0)) {
return _netif_set_bandwidth(iface, value); return _netif_set_bandwidth(iface, value);
} }
@ -1553,7 +1553,7 @@ static int _netif_set(char *cmd_name, netif_t *iface, char *key, char *value)
else if (strcmp("rx2_dr", key) == 0) { else if (strcmp("rx2_dr", key) == 0) {
return _netif_set_u8(iface, NETOPT_LORAWAN_RX2_DR, 0, value); return _netif_set_u8(iface, NETOPT_LORAWAN_RX2_DR, 0, value);
} }
#endif /* MODULE_GNRC_NETIF_CMD_LORA */ #endif /* MODULE_SHELL_CMD_GNRC_NETIF_LORAWAN */
#ifdef MODULE_NETDEV_IEEE802154_MULTIMODE #ifdef MODULE_NETDEV_IEEE802154_MULTIMODE
else if ((strcmp("phy_mode", key) == 0) || (strcmp("phy", key) == 0)) { else if ((strcmp("phy_mode", key) == 0) || (strcmp("phy", key) == 0)) {
return _netif_set_ieee802154_phy_mode(iface, value); return _netif_set_ieee802154_phy_mode(iface, value);