michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: migrate includes to contain <zephyr/...> prefix

Browse source 
In order to bring consistency in-tree, migrate all samples to the use
the new prefix <zephyr/...>. Note that the conversion has been scripted:

```python
from pathlib import Path
import re

EXTENSIONS = ("c", "h", "cpp", "rst")

for p in Path(".").glob("samples/**/*"):
    if not p.is_file() or p.suffix and p.suffix[1:] not in EXTENSIONS:
        continue

    content = ""
    with open(p) as f:
        for line in f:
            m = re.match(r"^(.*)#include <(.*)>(.*)$", line)
            if (m and
                not m.group(2).startswith("zephyr/") and
                (Path(".") / "include" / "zephyr" / m.group(2)).exists()):
                content += (
                    m.group(1) +
                    "#include <zephyr/" + m.group(2) +">" +
                    m.group(3) + "\n"
                )
            else:
                content += line

    with open(p, "w") as f:
        f.write(content)
```

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-05-05 16:03:03 +02:00 • committed by Carles Cufí
commit c7b5b3c419
484 changed files with 2021 additions and 2021 deletions
Download patch file Download diff file Expand all files Collapse all files

10
samples/boards/stm32/power_mgmt/blinky/src/main.c
View file

@ -4,11 +4,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <device.h>
#include <devicetree.h>
#include <drivers/gpio.h>
#include <sys/printk.h>
#include <zephyr/zephyr.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/printk.h>
#define SLEEP_TIME_MS 2000

12
samples/boards/stm32/power_mgmt/stm32wb_ble/src/main.c
View file

@ -8,14 +8,14 @@
*/
#include <zephyr/types.h>
#include <device.h>
#include <zephyr/device.h>
#include <stddef.h>
#include <sys/printk.h>
#include <sys/util.h>
#include <pm/pm.h>
#include <zephyr/sys/printk.h>
#include <zephyr/sys/util.h>
#include <zephyr/pm/pm.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
#include <zephyr/bluetooth/bluetooth.h>
#include <zephyr/bluetooth/hci.h>
#define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)