Skip to content

Commit 2660fda

Browse files
AnnsAnnsAnnsAnns
committed
Merge remote-tracking branch 'origin/master' into restructureExamplesFolder
2 parents 6228475 + 9ae0023 commit 2660fda

File tree

194 files changed

+4423
-875
lines changed

Some content is hidden

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

194 files changed

+4423
-875
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ cachegrind.out*
4343
tags
4444
# GDB initialization scripts
4545
.gdbinit
46+
# GDB history (when using gdb-dashboard)
47+
.gdb_history
4648

4749
# Eclipse symbol file (output from make eclipsesym)
4850
eclipsesym.xml

‎.mailmap

+2
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
2626
René Kijewski <rene.kijewski@fu-berlin.de>
2727
René Kijewski <rene.kijewski@fu-berlin.de> <kijewski@mi.fu-berlin.de>
2828
Sebastian Meiling <s@mlng.net>
29+
Marian Buschsieweke <marian.buschsieweke@posteo.net> <marian.buschsieweke@posteo.net>
2930
Marian Buschsieweke <marian.buschsieweke@posteo.net> <marian.buschsieweke@ovgu.de>
31+
Marian Buschsieweke <marian.buschsieweke@posteo.net> <marian.buschsieweke@ml-pa.com>

‎LOSTANDFOUND.md

+13
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,18 @@ therefore, have no interest in supporting this board. As result, none of the
302302
RIOT core contributors has access to the hardware, preventing us from doing the
303303
necessary testing for maintaining this board.
304304

305+
### boards/nrf6310 [4953ba8e6759d2b1a1a1ea497a4ad1e71489195a]
306+
Author(s):
307+
- Christian Kühling <kuehling@zedat.fu-berlin.de>
308+
- Timo Ziegler <timo.ziegler@fu-berlin.de>
309+
- Hauke Petersen <hauke.petersen@fu-berlin.de>
310+
311+
Reason for removal:
312+
- this was an early development board by Nordic which was discontinued
313+
(successor: `nrf51dk`)
314+
- also for a `BLE DEVKIT.N` board from Mommosoft, which was discontinued as well
315+
- no hardware available anymore for testing, many exclusions from CI
316+
305317
[6cad5d24771ba6199228351a11b5062cd2e9b36d]: https://github.com/RIOT-OS/RIOT/commit/6cad5d24771ba6199228351a11b5062cd2e9b36d
306318
[d83d08f0995a88f399e70a7d07b44dd780082436]: https://github.com/RIOT-OS/RIOT/commit/d83d08f0995a88f399e70a7d07b44dd780082436
307319
[cdc252ab7bd4161cc046bf93a3e55995704b24d4]: https://github.com/RIOT-OS/RIOT/commit/cdc252ab7bd4161cc046bf93a3e55995704b24d4
@@ -334,3 +346,4 @@ necessary testing for maintaining this board.
334346
[fe941ac9fe3f81c0f08ff3b8564cf439639abcda]: https://github.com/RIOT-OS/RIOT/commit/fe941ac9fe3f81c0f08ff3b8564cf439639abcda
335347
[81458c8eed8949c686d5ded652dbee10748e860b]: https://github.com/RIOT-OS/RIOT/commit/81458c8eed8949c686d5ded652dbee10748e860b
336348
[2b8a0d48940517f7df4e78c7a0b16024f46a8694]: https://github.com/RIOT-OS/RIOT/commit/2b8a0d48940517f7df4e78c7a0b16024f46a8694
349+
[4953ba8e6759d2b1a1a1ea497a4ad1e71489195a]: https://github.com/RIOT-OS/RIOT/commit/4953ba8e6759d2b1a1a1ea497a4ad1e71489195a

‎Makefile.include

+3-2
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ include $(RIOTMAKE)/tools/targets.inc.mk
934934
include $(RIOTMAKE)/usb-codes.inc.mk
935935

936936
# Warn if the selected board and drivers don't provide all needed features:
937-
ifneq (, $(filter all flash, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all)))
937+
ifeq (, $(filter help generate-Makefile.ci, $(MAKECMDGOALS)))
938938
EXPECT_ERRORS :=
939939

940940
# Test if there where dependencies against a module in DISABLE_MODULE.
@@ -1012,7 +1012,8 @@ endif
10121012

10131013
help:
10141014
# filter all targets starting with lowercase and containing lowercase letters, hyphens, or underscores; explicitly include generate-Makefile.ci
1015-
@$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\|generate-Makefile.ci\):.*/\1/p' | sort -u
1015+
# inspired by: https://stackoverflow.com/a/26339924
1016+
@LC_ALL=C $(MAKE) -pRrq -f $(firstword $(MAKEFILE_LIST)) : 2>/dev/null | sed -ne 's/\(^[a-z][a-z_-]*\|generate-Makefile.ci\):.*/\1/p' | sort -u
10161017

10171018
ifeq (iotlab-m3,$(BOARD))
10181019
ifneq (,$(filter iotlab-%,$(MAKECMDGOALS)))

‎boards/arduino-due/doc.txt

+55-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,59 @@
33
@ingroup boards
44
@brief Support for the Arduino Due board
55

6-
@see boards_common_arduino_due for details
6+
\section arduino_due Arduino-Due
7+
8+
## Table of Contents {#arduino_due_toc}
9+
10+
1. [Overview](#arduino_due_overview)
11+
2. [Hardware](#arduino_due_hardware)
12+
1. [MCU](#atmel_sam3x8e_mcu)
13+
2. [Board Configuration](#arduino_due_board_configuration)
14+
3. [Board Pinout](#arduino_due_pinout)
15+
3. [Flashing the Device](#arduino_due_flashing)
16+
17+
## Overview {#arduino_due_overview}
18+
19+
The Arduino Due is a microcontroller board based on the Atmel SAM3X8E ARM Cortex-M3 CPU.
20+
It is the first Arduino board based on a 32-bit ARM core microcontroller.
21+
22+
\image html "https://store.arduino.cc/cdn/shop/files/A000062_00.front_1000x750.jpg" "Arduino Due board" width=750px
23+
24+
## Hardware {#arduino_due_hardware}
25+
26+
### MCU {#atmel_sam3x8e_mcu}
27+
28+
The board features a SAM3X8E MCU (ARM Cortex-M3) running at up to 84MHz.
29+
It embeds 96 KiB of SRAM and 512 KiB of flash memory.
30+
The board reference manual is available [here](https://docs.arduino.cc/resources/datasheets/A000062-datasheet.pdf)
31+
and the MCU datasheet is available [here](https://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-11057-32-bit-Cortex-M3-Microcontroller-SAM3X-SAM3A_Datasheet.pdf).
32+
33+
### Board configuration {#arduino_due_board_configuration}
34+
The Arduino Due provides the following features:
35+
- 54 I/Os (of which 12 PWM outputs)
36+
- 12 analog inputs
37+
- 4 UARTs
38+
- 1 USB OTG
39+
- 2 DAC outputs
40+
- 2 TWI
41+
- 1 power jack
42+
- 1 SPI header
43+
- 1 JTAG header
44+
- 2 CAN Buses
45+
- A reset button
46+
- An erase button
47+
48+
### Board pinout {#arduino_due_pinout}
49+
50+
\image html "https://content.arduino.cc/assets/Pinout-Due_latest.png" "Arduino Due pinout"
51+
52+
The board schematics are available [here](https://docs.arduino.cc/resources/schematics/A000056-schematics.pdf).
53+
54+
## Flashing the device {#arduino_due_flashing}
55+
Flashing RIOT on the Arduino Due is quite straight forward as it relies on
56+
the preinstalled arduino bootloader. Connect your board using the programming
57+
port to your host computer and type:
58+
59+
`make BOARD=arduino-due flash`
60+
761
*/

‎boards/esp32-ethernet-kit-v1_0/doc.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626

2727
## Overview {#esp32_ethernet_kit_v1_0_overview}
2828

29-
The Espressif [ESP32-Ethernet-Kit](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/esp32/get-started-ethernet-kit-v1.0.html) is a development board that uses the ESP32-WROVER-B module. Most important features of the board are
29+
The Espressif [ESP32-Ethernet-Kit](https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32/esp32-ethernet-kit/user_guide.html) is a development board that uses the ESP32-WROVER-B module. Most important features of the board are
3030

3131
- 100 Mbps Ethernet via IP101G PHY
3232
- USB bridge with JTAG interface
3333

3434
Furthermore, some GPIOs are broken out for extension. The USB bridge based on FDI FT2232HL provides a JTAG interface for OCD debugging through the USB interface.
3535
For flashing and debugging the board, see \ref boards_esp32_esp-ethernet-kit common board documentation.
3636

37-
@image html "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/_images/esp32-ethernet-kit-v1.0.png" "ESP32-Ethernet-Kit V1.0" width=500
37+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32/_images/esp32-ethernet-kit-v1.0.png" "ESP32-Ethernet-Kit V1.0" width=500
3838

3939
[Back to table of contents](#esp32_ethernet_kit_v1_0_toc)
4040

‎boards/esp32-ethernet-kit-v1_1/doc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The Espressif [ESP32-Ethernet-Kit](https://docs.espressif.com/projects/esp-idf/e
3434
Furthermore, some GPIOs are broken out for extension. The USB bridge based on FDI FT2232HL provides a JTAG interface for OCD debugging through the USB interface.
3535
For flashing and debugging the board, see \ref boards_esp32_esp-ethernet-kit common board documentation.
3636

37-
@image html "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/_images/esp32-ethernet-kit-v1.1.png" "ESP32-Ethernet-Kit V1.1" width=500
37+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32/_images/esp32-ethernet-kit-v1.1.png" "ESP32-Ethernet-Kit V1.1" width=500
3838

3939
[Back to table of contents](#esp32_ethernet_kit_v1_1_toc)
4040

‎boards/esp32-ethernet-kit-v1_2/doc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The Espressif [ESP32-Ethernet-Kit](https://docs.espressif.com/projects/esp-idf/e
3434
Furthermore, some GPIOs are broken out for extension. The USB bridge based on FDI FT2232HL provides a JTAG interface for OCD debugging through the USB interface.
3535
For flashing and debugging the board, see \ref boards_esp32_esp-ethernet-kit common board documentation.
3636

37-
@image html "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/_images/esp32-ethernet-kit-v1.2.jpg" "ESP32-Ethernet-Kit V1.2" width=500
37+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32/_images/esp32-ethernet-kit-v1.2.jpg" "ESP32-Ethernet-Kit V1.2" width=500
3838

3939
[Back to table of contents](#esp32_ethernet_kit_v1_2_toc)
4040

‎boards/esp32-heltec-lora32-v2/doc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Since the board is
3737
[open source hardware](https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series),
3838
a number of clones are available.
3939

40-
@image html "https://heltec.org/wp-content/uploads/2020/04/SAM_0748_800X800.png" "Heltec WiFi Lora 32 V2" width=400px
40+
@image html "https://heltec.org/wp-content/uploads/2024/07/wifi-lora-32-v2-1.png" "Heltec WiFi Lora 32 V2" width=400px
4141

4242
[Back to table of contents](#esp32_heltec_lora32_v2_toc)
4343

‎boards/esp32c3-devkit/doc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limited, the ESP32-C3-DevKit should also work for most other ESP32-C3 boards.
3636
Any modifications required for specific applications could be overridden by
3737
\ref esp32_application_specific_configurations "application-specific board configuration".
3838

39-
\image html "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/_images/esp32-c3-devkitm-1-v1-annotated-photo.png" "Espressif ESP32-C3-DevKitM-1" width=800px
39+
\image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32c3/_images/esp32-c3-devkitm-1-v1-annotated-photo.png" "Espressif ESP32-C3-DevKitM-1" width=800px
4040

4141
[Back to table of contents](#esp32c3_devkit_toc)
4242

‎boards/esp32s2-devkit/doc.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ the following modules:
3535
- ESP32-S2-WROOM module (ESP32-S2-Saola-1 board)
3636
- ESP32-S2-WROVER-N4R2 module (ESP32-S2-Saola-1R board)
3737

38-
\image html "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/_images/esp32-s2-devkitm-1-v1-annotated-photo.png" "Espressif ESP32-S2-DevKitM-1" width=600px
38+
\image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s2/_images/esp32-s2-devkitm-1-v1-annotated-photo.png" "Espressif ESP32-S2-DevKitM-1" width=600px
3939

4040
<br>
4141
Due to the different modules used, the available versions of the
@@ -174,9 +174,9 @@ boards, see section \ref esp32_peripherals "Common Peripherals".
174174
The following figures show the pinouts as configured by default board
175175
definition.
176176

177-
@image html https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/_images/esp32-s2-devkitm-1-v1-pin-layout.png "ESP32-S2-DevKitM-1x Pinout" width=900px
178-
@image html https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/_images/esp32-s2-devkitc-1-v1-pinout.png "ESP32-S2-DevKitC-1x Pinout" width=900px
179-
@image html https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/_images/esp32-s2_saola1-pinout.jpg "ESP32-S2-Saola-1x Pinout" width=900px
177+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s2/_images/esp32-s2-devkitm-1-v1-pin-layout.png" "ESP32-S2-DevKitM-1x Pinout" width=900px
178+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s2/_images/esp32-s2-devkitm-1-v1-pin-layout.png" "ESP32-S2-DevKitC-1x Pinout" width=900px
179+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s2/_images/esp32-s2_saola1-pinout.jpg" "ESP32-S2-Saola-1x Pinout" width=900px
180180

181181
The corresponding board schematics can be found:
182182

‎boards/esp32s3-devkit/doc.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ the following modules:
3232
- ESP32-S3-WROOM-1x module (ESP32-S3-DevKitC-1 board)
3333
- ESP32-S3-WROOM-2 module (ESP32-S3-DevKitC-1 board)
3434

35-
\image html "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/_images/ESP32-S3-DevKitC-1_v2-annotated-photo.png" "Espressif ESP32-S3-DevKitM-1" width=600px
35+
\image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/_images/ESP32-S3-DevKitC-1_v2-annotated-photo.png" "Espressif ESP32-S3-DevKitM-1" width=600px
3636

3737
<br>
3838
Due to the different modules used, the available versions of the
@@ -179,8 +179,8 @@ boards, see section \ref esp32_peripherals "Common Peripherals".
179179
The following figures show the pinouts as configured by default board
180180
definition.
181181

182-
@image html https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/_images/ESP32-S3_DevKitC-1_pinlayout.jpg "ESP32-S3-DevKitC-1 Pinout" width=900px
183-
@image html https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/_images/ESP32-S3_DevKitM-1_pinlayout.jpg "ESP32-S3-DevKitM-1 Pinout" width=900px
182+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/_images/ESP32-S3_DevKitC-1_pinlayout_v1.1.jpg" "ESP32-S3-DevKitC-1 Pinout" width=900px
183+
@image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/_images/ESP32-S3_DevKitM-1_pinlayout.jpg" "ESP32-S3-DevKitM-1 Pinout" width=900px
184184

185185
The corresponding board schematics can be found:
186186

‎boards/esp32s3-usb-otg/doc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ it is equipped with two USB type A ports:
3232
- `USB_DEV` male port that is used to connect the board as a USB device to a host.
3333
- `USB_HOST` female port that is used to connect other USB devices to the board.
3434

35-
\image html "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/_images/pic_board_top_lable.png" "Espressif ESP32-S3-USB-OTG" width=600px
35+
\image html "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/_images/pic_board_top_lable.png" "Espressif ESP32-S3-USB-OTG" width=600px
3636

3737
@note RIOT-OS does only support the `USB_DEV` port, that is the board can only
3838
be used as USB device.

‎boards/nrf6310/Kconfig

-16
This file was deleted.

‎boards/nrf6310/Makefile

-3
This file was deleted.

‎boards/nrf6310/Makefile.dep

-1
This file was deleted.

‎boards/nrf6310/Makefile.features

-8
This file was deleted.

‎boards/nrf6310/Makefile.include

-12
This file was deleted.

‎boards/nrf6310/board.c

-31
This file was deleted.

‎boards/nrf6310/doc.txt

-5
This file was deleted.

‎boards/nrf6310/include/board.h

-60
This file was deleted.

0 commit comments

Comments
 (0)