Skip to content

Commit 6102a76

Browse files
committed
Merge branch 'main' into pr-runtime-configuration-registry
2 parents f68fbb1 + 4250c15 commit 6102a76

721 files changed

Lines changed: 434414 additions & 2052 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release-test.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,19 @@ jobs:
7878
ssh -oStrictHostKeyChecking=accept-new \
7979
${IOTLAB_USER}@saclay.iot-lab.info exit
8080
- name: Fetch host key from IoT-LAB lille site
81+
# Not being used in the most recent release specs but kept in for
82+
# backwords compatibility
8183
if: ${{ matrix.pytest_mark == 'iotlab_creds' }}
8284
run: |
8385
IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:)
8486
ssh -oStrictHostKeyChecking=accept-new \
8587
${IOTLAB_USER}@lille.iot-lab.info exit
88+
- name: Fetch host key from IoT-LAB strasbourg site
89+
if: ${{ matrix.pytest_mark == 'iotlab_creds' }}
90+
run: |
91+
IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:)
92+
ssh -oStrictHostKeyChecking=accept-new \
93+
${IOTLAB_USER}@strasbourg.iot-lab.info exit
8694
- name: Checkout Release-Specs
8795
uses: actions/checkout@main
8896
with:

.github/workflows/test-on-iotlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- riot: dwm1001
3737
iotlab:
3838
archi: dwm1001:dw1000
39-
site: lille
39+
site: toulouse
4040
- riot: iotlab-m3
4141
iotlab:
4242
archi: m3:at86rf231

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"editor.rulers": [
33
80,
4-
120
4+
100
55
],
66
"editor.detectIndentation": false,
77
"files.insertFinalNewline": true,

CODING_CONVENTIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Wrong:
257257
functionality.
258258
* Every function must be documented - including parameters and return value.
259259

260-
An examplary doxygen documentation in a header file can look like this.
260+
An exemplary doxygen documentation in a header file can look like this.
261261

262262
```
263263
/*

boards/adafruit-grand-central-m4-express/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static mtd_spi_nor_t samd51_nor_dev = {
5959
.params = &_samd51_nor_params,
6060
};
6161

62-
mtd_dev_t *mtd0 = (mtd_dev_t *)&samd51_nor_dev;
62+
MTD_XFA_ADD(samd51_nor_dev, 0);
6363

6464
#ifdef MODULE_VFS_DEFAULT
6565
VFS_AUTO_MOUNT(littlefs2, VFS_MTD(samd51_nor_dev), VFS_DEFAULT_NVM(0), 0);

boards/adafruit-grand-central-m4-express/doc.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
### General information
77

8-
![Adafruit Grand Central M4 Expressboard]
9-
(https://cdn-learn.adafruit.com/assets/assets/000/068/748/medium800/adafruit_products_grand_central_top_angle.jpg?1546734839)
8+
![Adafruit Grand Central M4 Expressboard](https://cdn-learn.adafruit.com/assets/assets/000/068/748/medium800/adafruit_products_grand_central_top_angle.jpg?1546734839)
109

1110
The main features of the board are:
1211
- ATSAMD51 Cortex M4 running at 120 MHz

boards/adafruit-itsybitsy-m4/Makefile.dep

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@ ifneq (,$(filter mtd,$(USEMODULE)))
77
USEMODULE += mtd_spi_nor
88
endif
99

10+
# default to using littlefs2 on the external flash
11+
ifneq (,$(filter vfs_default,$(USEMODULE)))
12+
USEPKG += littlefs2
13+
USEMODULE += mtd
14+
endif
15+
1016
# setup the samd21 arduino bootloader related dependencies
1117
include $(RIOTBOARD)/common/samdx1-arduino-bootloader/Makefile.dep

boards/adafruit-itsybitsy-m4/board.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
#include "periph/gpio.h"
2222
#include "mtd_spi_nor.h"
2323
#include "timex.h"
24+
#ifdef MODULE_VFS_DEFAULT
25+
#include "vfs_default.h"
26+
#endif
2427

2528
#ifdef MODULE_MTD
2629
/* GD25x16 */
@@ -51,7 +54,11 @@ static mtd_spi_nor_t samd51_nor_dev = {
5154
.params = &_samd51_nor_params,
5255
};
5356

54-
mtd_dev_t *mtd0 = (mtd_dev_t *)&samd51_nor_dev;
57+
MTD_XFA_ADD(samd51_nor_dev, 0);
58+
59+
#ifdef MODULE_VFS_DEFAULT
60+
VFS_AUTO_MOUNT(littlefs2, VFS_MTD(samd51_nor_dev), VFS_DEFAULT_NVM(0), 0);
61+
#endif
5562
#endif /* MODULE_MTD */
5663

5764
static inline void _toggle(unsigned n)

boards/adafruit-itsybitsy-m4/doc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
![Adafruit-Itsybitsy-M4 compared to a quarter dollar](https://cdn-learn.adafruit.com/assets/assets/000/055/465/large1024/adafruit_products_3800_quarter_ORIG_2018_06.jpg?1529192175)
99

10-
This is a small formfactor (only 1.4" long by 0.7" wide) SAM D51 board made by Adafruit.
10+
This is a small formfactor (only 1.4\" long by 0.7\" wide) SAM D51 board made by Adafruit.
1111

1212
The board features one red LED (LD1), one DotStar / APA102 RGB LED, a reset button as well as
1313
21 configurable external pins(6 of which can be analog in).

boards/adafruit-itsybitsy-nrf52/doc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
### General information
77

8-
This is a small formfactor (only 1.4" long by 0.7" wide) nRF52840 board made by Adafruit.
8+
This is a small formfactor (only 1.4\" long by 0.7\" wide) nRF52840 board made by Adafruit.
99

1010
The board features one red LED (LD1), one DotStar / APA102 RGB LED, a user (SW1), a
1111
reset button as well as 21 configurable external pins(6 of which can be analog in).

0 commit comments

Comments
 (0)