Skip to content

Commit 7d3a48b

Browse files
committed
fix variant folders spellings
adapt to the new changes in cmakelists that uses the BOARD variable that expands to the small case of the board in use. Signed-off-by: Dhruva Gole <[email protected]>
1 parent 08b2a3b commit 7d3a48b

File tree

2 files changed

+7
-87
lines changed

2 files changed

+7
-87
lines changed

variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h

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

1417
#define LED_BUILTIN 13
1518

@@ -82,5 +85,8 @@ enum digitalPins {
8285
D20,
8386
D21
8487
};
88+
<<<<<<< HEAD
8589

86-
const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));
90+
const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));
91+
=======
92+
>>>>>>> 3630ff9 (fix variant folders spellings)

variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)