Merge remote-tracking branch 'upstream/master' into chacha20-glue-cod…

…e-implementation

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+spelling_language = en
+end_of_line = lf
+
+[*{.c,.h}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{Makefile*,*.mk}]
+indent_style = tab
+indent_size = 2
+tab_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/workflows/check-labels.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.event_name != 'merge_group'
     runs-on: ubuntu-latest
     steps:
-    - uses: RIOT-OS/[email protected].1
+    - uses: RIOT-OS/[email protected].2
       with:
         access_token: ${{ secrets.GITHUB_TOKEN }}
         unset_labels: 'CI: needs squashing,State: waiting for CI update,State: waiting for other PR,Process: blocked by feature freeze'

.github/workflows/release-test.yml

@@ -130,7 +130,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install lib32asan6
     - name: Run release tests
-      id: tests
       timeout-minutes: 350
       run: |
         RIOTBASE="$GITHUB_WORKSPACE/RIOT"
@@ -182,27 +181,6 @@ jobs:
         mkdir test-reports/
         junit2html ${REPORT_XML} ${REPORT_NAME}.html
         cp ${REPORT_XML} ${REPORT_NAME}.xml
-    - name: Generate result message
-      if: always()
-      id: generate_results
-      run: |
-        if [ "${{ steps.tests.conclusion }}" == "success" ]; then
-          nice_str="✅ **PASSED**"
-        elif [ "${{ steps.tests.conclusion }}" == "failure" ]; then
-          nice_str="❌ **FAILED**"
-        fi
-        echo "nice_str=${nice_str}" >> ${GITHUB_OUTPUT}
-    - name: Report to Matrix channel
-      if: ${{ always() && steps.generate_results.outputs.nice_str != '' }}
-      uses: s3krit/[email protected]
-      with:
-        room_id: ${{ secrets.RIOT_CI_RELEASE_REPORT_CHANNEL }}
-        access_token: ${{ secrets.MATRIX_RIOT_CI_ACCESS_TOKEN }}
-        server: "matrix.org"
-        message: >
-          ${{ steps.generate_results.outputs.nice_str}}: Release tests
-          `[${{ join(matrix.*, ', ') }}]` on `${{ github.event_name }}`:
-          ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
     - uses: actions/upload-artifact@v2
       if: always()
       with:

Makefile.include

@@ -688,7 +688,6 @@ BUILDDEPS += $(RIOTBUILD_CONFIG_HEADER_C)
 BUILDDEPS += pkg-prepare
 BUILDDEPS += $(APPDEPS)
 BUILDDEPS += $(MODULE_LIST_DIR)
-BUILDDEPS += $(BUILD_DIR)/CACHEDIR.TAG
 
 # Build dependencies depend on clean (if a make goal), as clean may wipe them.
 # Without them depending on clean parallel builds occasionally fail due to
@@ -756,11 +755,6 @@ $(_SUBMAKE_LIBS): $(APPLICATION_MODULE).module pkg-build $(GENSRC)
 print-size: $(ELFFILE)
 	$(Q)$(SIZE) $(SIZEFLAGS) $<
 
-$(BUILD_DIR)/CACHEDIR.TAG:
-	$(Q)mkdir -p "$(BUILD_DIR)"
-	$(Q)echo "Signature: 8a477f597d28d172789f06886806bc55" > "$@"
-	$(Q)echo "# This folder contains RIOT's build cache" >> "$@"
-
 %.hex: %.elf
 	$(Q)$(OBJCOPY) $(OFLAGS) -Oihex $< $@
 

README.md

@@ -36,8 +36,9 @@
 
 The friendly Operating System for IoT!
 
-RIOT is a real-time multi-threading operating system that supports a range of
-devices that are typically found in the Internet of Things (IoT):
+RIOT is an open-source microcontroller operating system, designed to match
+the requirements of Internet of Things (IoT) devices and other embedded devices.
+It supports a range of devices that are typically found in the Internet of Things (IoT):
 8-bit, 16-bit and 32-bit microcontrollers.
 
 RIOT is based on the following design principles: energy-efficiency, real-time

boards/adafruit-grand-central-m4-express/include/board.h

@@ -20,6 +20,7 @@
 #define BOARD_H
 
 #include "cpu.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/adafruit-itsybitsy-m4/include/board.h

@@ -20,6 +20,7 @@
 #define BOARD_H
 
 #include "cpu.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/arduino-mkr1000/include/board.h

@@ -24,6 +24,7 @@
 #include "periph_conf.h"
 #include "board_common.h"
 #include "arduino_pinmap.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/arduino-mkrfox1200/include/board.h

@@ -24,6 +24,7 @@
 #include "periph_conf.h"
 #include "board_common.h"
 #include "arduino_pinmap.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/arduino-mkrwan1300/include/board.h

@@ -25,6 +25,7 @@
 #include "periph_conf.h"
 #include "board_common.h"
 #include "arduino_pinmap.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/arduino-mkrzero/include/board.h

@@ -24,6 +24,7 @@
 #include "periph_conf.h"
 #include "board_common.h"
 #include "arduino_pinmap.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/arduino-nano-33-iot/include/board.h

@@ -20,6 +20,7 @@
 #define BOARD_H
 
 #include "cpu.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/b-l072z-lrwan1/Makefile.features

@@ -2,6 +2,7 @@ CPU = stm32
 CPU_MODEL = stm32l072cz
 
 # Put defined MCU peripherals here (in alphabetical order)
+FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_dma
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_rtc

boards/b-l072z-lrwan1/include/periph_conf.h

@@ -14,6 +14,7 @@
  * @brief       Peripheral MCU configuration for the ST B-L072Z-LRWAN1 board
  *
  * @author      Alexandre Abadie <[email protected]>
+ * @author      Thibault Tisserand <[email protected]>
  */
 
 #ifndef PERIPH_CONF_H
@@ -147,6 +148,21 @@ static const spi_conf_t spi_config[] = {
 #define SPI_NUMOF           ARRAY_SIZE(spi_config)
 /** @} */
 
+/**
+ * @name    ADC configuration
+ * @{
+ */
+static const adc_conf_t adc_config[] = {
+    { GPIO_PIN(PORT_A, 0), 0 },
+    { GPIO_PIN(PORT_A, 2), 2 },
+    { GPIO_PIN(PORT_A, 3), 3 },
+    { GPIO_PIN(PORT_A, 4), 4 },
+    { GPIO_PIN(PORT_A, 5), 5 }
+};
+
+#define ADC_NUMOF           ARRAY_SIZE(adc_config)
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

boards/bastwan/include/board.h

@@ -25,6 +25,7 @@
 #define BOARD_H
 
 #include "cpu.h"
+#include "periph/gpio.h"
 #include "periph/pm.h"
 
 #ifdef __cplusplus

boards/common/arduino-due/include/board.h

@@ -23,6 +23,7 @@
 
 #include "cpu.h"
 #include "arduino_pinmap.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/common/arduino-zero/include/board.h

@@ -25,6 +25,7 @@
 #include "periph_conf.h"
 #include "periph_cpu.h"
 #include "arduino_pinmap.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/common/saml1x/include/board.h

@@ -23,6 +23,7 @@
 #define BOARD_H
 
 #include "cpu.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/feather-m0/include/board.h

@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "periph_conf.h"
 #include "periph_cpu.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/gd32vf103c-start/include/board.h

@@ -20,6 +20,7 @@
 #define BOARD_H
 
 #include "board_common.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/hamilton/include/board.h

@@ -24,6 +24,7 @@
 #include "cpu.h"
 #include "periph_conf.h"
 #include "periph_cpu.h"
+#include "periph/gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

boards/nucleo-f103rb/Makefile.features

@@ -2,6 +2,7 @@ CPU = stm32
 CPU_MODEL = stm32f103rb
 
 # Put defined MCU peripherals here (in alphabetical order)
+FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_rtc
 FEATURES_PROVIDED += periph_rtt

boards/nucleo-f103rb/doc.txt

@@ -46,7 +46,7 @@ STM32F103RB microcontroller with 20KiB of RAM and 128KiB of Flash.
 | Low-level driver | GPIO    | yes       | |
 |        | PWM       | yes (4 pins available)  |  |
 |        | UART      | 2 UARTs       | USART2 via STLink/USB or D0(RX)/D1(TX), USART1 on PA10(RX)/PA09(TX) and USART3 on PB11(RX)/PB10(TX) |
-|        | ADC       | no        | |
+|        | ADC       | yes       | Pins A0 - A5 |
 |        | I2C       | yes (I2C1 and I2C2)       | |
 |        | SPI       | yes (SPI1 and SPI2)       | |
 |        | USB       | no        | |

boards/nucleo-f103rb/include/periph_conf.h

@@ -172,6 +172,22 @@ static const spi_conf_t spi_config[] = {
 #define SPI_NUMOF           ARRAY_SIZE(spi_config)
 /** @} */
 
+/**
+ * @name   ADC configuration
+ * @{
+ */
+static const adc_conf_t adc_config[] = {
+    { .pin = GPIO_PIN(PORT_A, 0), .dev = 0, .chan = 0 },  /* ADC12_IN0 */
+    { .pin = GPIO_PIN(PORT_A, 1), .dev = 0, .chan = 1 },  /* ADC12_IN1 */
+    { .pin = GPIO_PIN(PORT_A, 4), .dev = 0, .chan = 4 },  /* ADC12_IN4 */
+    { .pin = GPIO_PIN(PORT_B, 0), .dev = 0, .chan = 8 },  /* ADC12_IN8 */
+    { .pin = GPIO_PIN(PORT_C, 1), .dev = 0, .chan = 11 }, /* ADC12_IN11 */
+    { .pin = GPIO_PIN(PORT_C, 0), .dev = 0, .chan = 10 }, /* ADC12_IN10 */
+};
+
+#define ADC_NUMOF           ARRAY_SIZE(adc_config)
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

boards/nucleo-l452re/Makefile.features

@@ -2,6 +2,7 @@ CPU = stm32
 CPU_MODEL = stm32l452re
 
 # Put defined MCU peripherals here (in alphabetical order)
+FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_rtc

boards/nucleo-l452re/include/periph_conf.h

@@ -120,6 +120,57 @@ static const spi_conf_t spi_config[] = {
 #define SPI_NUMOF           ARRAY_SIZE(spi_config)
 /** @} */
 
+/**
+ * @brief ADC configuration
+ *
+ * Note that we do not configure all ADC channels,
+ * and not in the STM32L452RE order. Instead, we
+ * just define 6 ADC channels, for the Nucleo
+ * Arduino header pins A0-A5 and the internal VBAT channel.
+ *
+ * To find appropriate device and channel find in the
+ * board manual, table showing pin assignments and
+ * information about ADC - a text similar to ADC[X]_IN[Y],
+ * where:
+ * [X] - describes used device - indexed from 0,
+ * for example ADC1_IN10 is device 0,
+ * [Y] - describes used channel - indexed from 1,
+ * for example ADC1_IN10 is channel 10
+ *
+ * For Nucleo-L452RE this information is in board manual,
+ * Table 22, page 51, or STM32L452RE MCU datasheet,
+ * Table 16, page 63.
+ *
+ * VBAT is connected ADC1_IN18 or ADC3_IN18 and a voltage divider
+ * is used, so that only 1/3 of the actual VBAT is measured. This
+ * allows for a supply voltage higher than the reference voltage.
+ *
+ * For STM32L452RE more information is provided in MCU datasheet,
+ * in section 3.15.3 - Vbat battery voltage monitoring, page 40.
+ * @{
+ */
+static const adc_conf_t adc_config[] = {
+    { .pin = GPIO_PIN(PORT_A, 0), .dev = 0, .chan =  5 }, /* A0  ADC1_IN5  */
+    { .pin = GPIO_PIN(PORT_A, 1), .dev = 0, .chan =  6 }, /* A1  ADC1_IN6  */
+    { .pin = GPIO_PIN(PORT_A, 4), .dev = 0, .chan =  9 }, /* A2  ADC1_IN9  */
+    { .pin = GPIO_PIN(PORT_B, 0), .dev = 0, .chan = 15 }, /* A3 ADC1_IN15  */
+    { .pin = GPIO_PIN(PORT_C, 1), .dev = 0, .chan =  2 }, /* A4  ADC1_IN2  */
+    { .pin = GPIO_PIN(PORT_C, 0), .dev = 0, .chan =  1 }, /* A5  ADC1_IN1  */
+    { .pin = GPIO_UNDEF, .dev = 0, .chan = 18 },
+};
+
+/**
+ * @brief Number of ADC devices
+ */
+#define ADC_NUMOF           ARRAY_SIZE(adc_config)
+
+/**
+ * @brief VBAT ADC line
+ */
+#define VBAT_ADC            ADC_LINE(6)
+
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

boards/nucleo-l476rg/doc.txt

@@ -24,8 +24,8 @@ STM32L476RG microcontroller with 128KiB of RAM and 1MiB of Flash.
 | Frequency  | up to 80MHz       |
 | FPU        | yes               |
 | Timers     | 16 (2x watchdog, 1 SysTick, 6x 16-bit, 2x 32-bit [TIM2])  |
-| ADCs       | 1x 12-bit         |
-| UARTs      | 3 (two UARTs and one Low-Power UART)                 |
+| ADCs       | 3x 12-bit (up to 16 channels) |
+| UARTs      | 6 (three USARTs, two UARTs and one Low-Power UART) |
 | SPIs       | 3                 |
 | I2Cs       | 3                 |
 | RTC        | 1                 |

boards/p-nucleo-wb55/Makefile.features

@@ -3,6 +3,7 @@ CPU = stm32
 CPU_MODEL = stm32wb55rg
 
 # Put defined MCU peripherals here (in alphabetical order)
+FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_lpuart
 FEATURES_PROVIDED += periph_pwm