Skip to content
This repository was archived by the owner on Sep 20, 2022. It is now read-only.

RIOT-OS Submodule : Update to 2022.07 release #78

Merged
miri64 merged 6 commits into from
Sep 19, 2022
Merged

RIOT-OS Submodule : Update to 2022.07 release #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae4a77d
RIOT-OS Submodule : Update to 2022.07 release
akshaim Sep 6, 2022
600bd36
coap-chat: Update to 2022.07 release
chrysn Sep 16, 2022
d219d33
spectrum-scanner: Update to 2022.07 release
chrysn Sep 16, 2022
2bfd508
sniffer: Update to 2022.07 release
chrysn Sep 16, 2022
c48284a
dependencies: Replace deprecated module
chrysn Sep 19, 2022
ca6d08c
sniffer: Migrate to ztimer
chrysn Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RIOT
Open in desktop
Submodule RIOT updated 10151 files
2 changes: 1 addition & 1 deletion coap-chat/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BOARD ?= native
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../RIOT

USEMODULE += gnrc_netdev_default
USEMODULE += netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules
USEMODULE += gnrc_ipv6_default
Expand Down
4 changes: 2 additions & 2 deletions coap-chat/coap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#define COAP_CHAT_PATH "/chat"

static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, void *ctx);
static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, coap_request_ctx_t *ctx);

/* CoAP resources */
static const coap_resource_t _resources[] = {
Expand All @@ -43,7 +43,7 @@ static gcoap_listener_t _listener = {
.next = NULL,
};

static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, void *ctx)
static ssize_t _chat_handler(coap_pkt_t *pdu, uint8_t *buf, size_t len, coap_request_ctx_t *ctx)
{
(void)ctx;

Expand Down
4 changes: 2 additions & 2 deletions sniffer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ RIOTBASE ?= $(CURDIR)/../RIOT
# Define modules that are used
USEMODULE += fmt
USEMODULE += gnrc
USEMODULE += gnrc_netdev_default
USEMODULE += netdev_default
USEMODULE += auto_init_gnrc_netif
USEMODULE += shell
USEMODULE += shell_commands
Copy link
Member

@miri64 miri64 Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

USEMODULE += gnrc_netdev_default

is deprecated in 2022.07. Please use netdev_default instead.

USEMODULE += ps
USEMODULE += xtimer
USEMODULE += ztimer64_usec

# Change this to 0 show compiler invocation lines by default:
QUIET ?= 1
Expand Down
5 changes: 2 additions & 3 deletions sniffer/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@

#include "fmt.h"
#include "thread.h"
#include "xtimer.h"
#include "shell.h"
#include "shell_commands.h"
#include "net/gnrc.h"
#include "ztimer64.h"

/**
* @brief Buffer size used by the shell
Expand Down Expand Up @@ -63,7 +62,7 @@ void dump_pkt(gnrc_pktsnip_t *pkt)
pkt = gnrc_pktbuf_remove_snip(pkt, pkt->next);
}
}
uint64_t now_us = xtimer_usec_from_ticks64(xtimer_now64());
uint64_t now_us = ztimer64_now(ZTIMER64_USEC);

print_str("rftest-rx --- len ");
print_u32_hex((uint32_t)gnrc_pkt_len(pkt));
Expand Down
3 changes: 2 additions & 1 deletion spectrum-scanner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ RIOTBASE ?= $(CURDIR)/../RIOT

# Define modules that are used
USEMODULE += gnrc
USEMODULE += gnrc_netdev_default
USEMODULE += netdev_default
USEMODULE += auto_init_gnrc_netif
USEMODULE += xtimer
USEMODULE += ztimer64_xtimer_compat
Comment on lines 14 to +15
Copy link
Member

@miri64 miri64 Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use ztimer64 outright?

Copy link
Member

@chrysn chrysn Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works just as well, now using that.

Copy link
Member

@miri64 miri64 Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mhhh I accidentally commented on the wrong file, but you fixed it for the correct one ^^, but I guess the same question is true for spectrum-scanner too.

Copy link
Member

@chrysn chrysn Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There there's a concrete reason: It does arithmetic on the ztimer values (rather than just showing them), and that has prerequisites that are not met.

(Strictly speaking that's also the case for the one where I've changed it, but there it's timestamps that are merely being displayed, so shrug)

USEMODULE += fmt

# Change this to 0 show compiler invocation lines by default:
Expand Down