Skip to content

Commit cd1db02

Browse files
authored
Merge pull request #91 from crasbe/pr/bump_RIOT_version
Bump to RIOT 2026.04.01
2 parents bcab617 + 4d437b5 commit cd1db02

17 files changed

Lines changed: 49 additions & 55 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
- run: make -C task-06 -j all
3838
- name: Run make -C task-07 -j all
3939
run: |
40-
make -C RIOT/examples/gnrc_minimal -j all
41-
make -C RIOT/examples/gnrc_networking -j all
40+
make -C RIOT/examples/networking/gnrc/minimal -j all
41+
make -C RIOT/examples/networking/gnrc/networking -j all
4242
- run: make -C task-08 -j all
4343
- run: make -C task-09 -j all
4444

RIOT

Submodule RIOT updated 10910 files

task-01/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ RIOTBASE ?= $(CURDIR)/../RIOT
1010
# Comment this out to disable code in RIOT that does safety checking
1111
# which is not needed in a production environment but helps in the
1212
# development process:
13-
CFLAGS += -DDEVELHELP
13+
DEVELHELP = 1
1414

1515
# Change this to 0 show compiler invocation lines by default:
1616
QUIET ?= 1
1717

1818
# Modules to include:
1919
USEMODULE += shell
20-
USEMODULE += shell_commands
20+
USEMODULE += shell_cmds_default
2121
USEMODULE += ps
2222

2323
include $(RIOTBASE)/Makefile.include

task-01/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@
9393
This command will compile the application, burn the image onto the board and open a
9494
connection to the RIOT shell.
9595

96-
3. Verify the output of `RIOT_BOARD` matches your hardware.
96+
3. Verify the compiler output of matches your hardware, for example:
97+
```
98+
Building application "Task01" for "samr21-xpro" with CPU "samd21".
99+
```
97100

98101
[next task](../task-02)

task-02/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ RIOTBASE ?= $(CURDIR)/../RIOT
1010
# Comment this out to disable code in RIOT that does safety checking
1111
# which is not needed in a production environment but helps in the
1212
# development process:
13-
CFLAGS += -DDEVELHELP
13+
DEVELHELP = 1
1414

1515
# Change this to 0 show compiler invocation lines by default:
1616
QUIET ?= 1
1717

1818
# Modules to include:
1919
USEMODULE += shell
20-
USEMODULE += shell_commands
20+
USEMODULE += shell_cmds_default
2121
USEMODULE += ps
2222

2323
include $(RIOTBASE)/Makefile.include

task-02/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ this shell command plus one for the name of the command.
1313
Your function must return `0` if it runs successfully and or anything else if
1414
an error occurs.
1515
16-
Shell commands need to be added manually to the shell on initialization
16+
Shell commands need to be added manually to the shell on initialization,
17+
usually this is done with the macro command `SHELL_COMMAND()`.
18+
Please note that the command name is *not* written in quotes and can not have
19+
any whitespaces!
1720
```c
1821
#include "shell.h"
1922
20-
static const shell_command_t shell_commands[] = {
21-
{ "command name", "command description", cmd_handler },
22-
{ NULL, NULL, NULL }
23-
};
23+
SHELL_COMMAND(command_name, "command description", cmd_handler);
2424
2525
/* ... */
26-
shell_run(commands, line_buf, SHELL_DEFAULT_BUFSIZE)
26+
shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE)
2727
/* ... */
2828
```
2929

task-02/main.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ int echo(int argc, char **argv)
1212
return 0;
1313
}
1414

15-
static const shell_command_t commands[] = {
16-
{ NULL, NULL, NULL }
17-
};
18-
1915
int main(void)
2016
{
2117
puts("This is Task-02");
2218

2319
char line_buf[SHELL_DEFAULT_BUFSIZE];
24-
shell_run(commands, line_buf, SHELL_DEFAULT_BUFSIZE);
20+
shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE);
2521

2622
return 0;
2723
}

task-03/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ RIOTBASE ?= $(CURDIR)/../RIOT
1010
# Comment this out to disable code in RIOT that does safety checking
1111
# which is not needed in a production environment but helps in the
1212
# development process:
13-
CFLAGS += -DDEVELHELP
13+
DEVELHELP = 1
1414

1515
# Change this to 0 show compiler invocation lines by default:
1616
QUIET ?= 1
1717

1818
# Modules to include:
1919
USEMODULE += shell
20-
USEMODULE += shell_commands
20+
USEMODULE += shell_cmds_default
2121
USEMODULE += ps
2222

2323
include $(RIOTBASE)/Makefile.include

task-04/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ RIOTBASE ?= $(CURDIR)/../RIOT
1010
# Comment this out to disable code in RIOT that does safety checking
1111
# which is not needed in a production environment but helps in the
1212
# development process:
13-
CFLAGS += -DDEVELHELP
13+
DEVELHELP = 1
1414

1515
# Change this to 0 show compiler invocation lines by default:
1616
QUIET ?= 1
1717

1818
# Modules to include:
1919
USEMODULE += shell
20-
USEMODULE += shell_commands
20+
USEMODULE += shell_cmds_default
2121
USEMODULE += ps
2222
USEMODULE += xtimer
2323

task-05/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ RIOTBASE ?= $(CURDIR)/../RIOT
1010
# Comment this out to disable code in RIOT that does safety checking
1111
# which is not needed in a production environment but helps in the
1212
# development process:
13-
CFLAGS += -DDEVELHELP
13+
DEVELHELP = 1
1414

1515
# Change this to 0 show compiler invocation lines by default:
1616
QUIET ?= 1
1717

1818
# Modules to include:
1919
USEMODULE += shell
20-
USEMODULE += shell_commands
20+
USEMODULE += shell_cmds_default
2121
USEMODULE += ps
2222
USEMODULE += gnrc_pktdump
2323
USEMODULE += gnrc_txtsnd
24-
USEMODULE += gnrc_netdev_default
24+
USEMODULE += netdev_default
2525
USEMODULE += auto_init_gnrc_netif
2626

2727
include $(RIOTBASE)/Makefile.include

0 commit comments

Comments
 (0)