Skip to content

Commit 8e3cdf0

Browse files
committed
more merge error fixes
1 parent c95f289 commit 8e3cdf0

File tree

30 files changed

+10
-748
lines changed

30 files changed

+10
-748
lines changed
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
# NimBLE_extended_client example using h2zero Arduino NimBLE stack
2-
3-
BLE 5 client example, using the great [h2zero NimBLE](https://github.com/h2zero/NimBLE-Arduino) implementation.
4-
5-
Thx @h2zero for the great BLE library.
1+
# NimBLE Sample Scan example

examples/arduino-NimBLE-ext_client/platformio.ini

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@
1212
platform = espressif32
1313
framework = arduino
1414
monitor_speed = 115200
15-
build_flags =
16-
'-DCONFIG_BT_NIMBLE_EXT_ADV=1'
17-
lib_deps =
18-
https://github.com/h2zero/NimBLE-Arduino
19-
lib_ignore =
20-
BLE
21-
BluetoothSerial
22-
SimpleBLE
23-
WiFiProv
2415
custom_component_remove =
2516
espressif/esp_hosted
2617
espressif/esp_wifi_remote
@@ -40,8 +31,8 @@ custom_component_remove =
4031
[env:esp32s3]
4132
board = esp32-s3-devkitc-1
4233

43-
[env:esp32c2]
44-
board = esp32-c2-devkitm-1
34+
;[env:esp32c2]
35+
;board = esp32-c2-devkitm-1
4536

4637
[env:esp32c3]
4738
board = esp32-c3-devkitm-1

examples/arduino-NimBLE-ext_client/src/NimBLE_extended_client.ino

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

examples/arduino-blink/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/arduino-matter-light/src/.gitignore

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

examples/arduino-rmt-blink/platformio.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ lib_ignore = wifi
2828
build_flags = -DBUILTIN_RGBLED_PIN=8
2929
-DNR_OF_LEDS=1
3030

31+
[env:esp32-c5]
32+
platform = espressif32
33+
framework = arduino
34+
board = esp32-c5-devkitc-1
35+
build_flags = -DBUILTIN_RGBLED_PIN=27
36+
-DNR_OF_LEDS=1
37+
3138
[env:esp32-c6]
3239
platform = espressif32
3340
framework = arduino

examples/arduino-usb-keyboard/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/arduino-wifiscan/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/espidf-arduino-C6-ULP-blink/.gitignore

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

examples/espidf-arduino-blink/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)