Skip to content

Commit 08d6989

Browse files
committed
Revert "fix variant folders spellings"
This reverts commit 0182afa.
1 parent 39fd2e1 commit 08d6989

File tree

2 files changed

+87
-7
lines changed

2 files changed

+87
-7
lines changed

variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
#pragma once
99
#include <zephyr/drivers/gpio.h>
1010
#include <zephyr/zephyr.h>
11-
<<<<<<< HEAD
1211
#include <zephyr/drivers/i2c.h>
1312
#include <zephyr/device.h>
14-
=======
15-
>>>>>>> 3630ff9 (fix variant folders spellings)
1613

1714
#define LED_BUILTIN 13
1815

@@ -85,8 +82,5 @@ enum digitalPins {
8582
D20,
8683
D21
8784
};
88-
<<<<<<< HEAD
8985

90-
const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));
91-
=======
92-
>>>>>>> 3630ff9 (fix variant folders spellings)
86+
const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Copyright (c) 2022 Dhruva Gole
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
8+
#pragma once
9+
#include <zephyr/drivers/gpio.h>
10+
#include <zephyr/zephyr.h>
11+
#include <zephyr/drivers/i2c.h>
12+
#include <zephyr/device.h>
13+
14+
#define LED_BUILTIN 13
15+
16+
static struct gpio_dt_spec d0 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d0_gpios);
17+
static struct gpio_dt_spec d1 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d1_gpios);
18+
static struct gpio_dt_spec d2 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d2_gpios);
19+
static struct gpio_dt_spec d3 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d3_gpios);
20+
static struct gpio_dt_spec d4 =
21+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d4_gpios);
22+
static struct gpio_dt_spec d5 =
23+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d5_gpios);
24+
static struct gpio_dt_spec d6 =
25+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d6_gpios);
26+
static struct gpio_dt_spec d7 =
27+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d7_gpios);
28+
static struct gpio_dt_spec d8 =
29+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d8_gpios);
30+
static struct gpio_dt_spec d9 =
31+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d9_gpios);
32+
static struct gpio_dt_spec d10 =
33+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d10_gpios);
34+
static struct gpio_dt_spec d11 =
35+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d11_gpios);
36+
static struct gpio_dt_spec d12 =
37+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d12_gpios);
38+
static struct gpio_dt_spec d13 =
39+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d13_gpios);
40+
static struct gpio_dt_spec d14 =
41+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d13_gpios);
42+
static struct gpio_dt_spec d15 =
43+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d15_gpios);
44+
static struct gpio_dt_spec d16 =
45+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d16_gpios);
46+
static struct gpio_dt_spec d17 =
47+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d17_gpios);
48+
static struct gpio_dt_spec d18 =
49+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d18_gpios);
50+
static struct gpio_dt_spec d19 =
51+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d19_gpios);
52+
static struct gpio_dt_spec d20 =
53+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d20_gpios);
54+
static struct gpio_dt_spec d21 =
55+
GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), d21_gpios);
56+
57+
static struct gpio_dt_spec *arduino_pins[22] = {
58+
&d0, &d1, &d2, &d3, &d4, &d5, &d6, &d7, &d8, &d9, &d10,
59+
&d11, &d12, &d13, &d14, &d15, &d16, &d17, &d18, &d19, &d20, &d21};
60+
61+
enum digitalPins {
62+
D0,
63+
D1,
64+
D2,
65+
D3,
66+
D4,
67+
D5,
68+
D6,
69+
D7,
70+
D8,
71+
D9,
72+
D10,
73+
D11,
74+
D12,
75+
D13,
76+
D14,
77+
D15,
78+
D16,
79+
D17,
80+
D18,
81+
D19,
82+
D20,
83+
D21
84+
};
85+
86+
const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));

0 commit comments

Comments
 (0)