Merge pull request #1009 from meshtastic/nimble-lib-swap

Nimble lib swap
1.2-legacy
Jm Casler 2021-12-18 16:30:27 -05:00 zatwierdzone przez GitHub
commit 34908a8f79
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
6 zmienionych plików z 7 dodań i 6 usunięć

Wyświetl plik

@ -50,7 +50,8 @@
"cassert": "cpp", "cassert": "cpp",
"iterator": "cpp", "iterator": "cpp",
"shared_mutex": "cpp", "shared_mutex": "cpp",
"iostream": "cpp" "iostream": "cpp",
"esp_nimble_hci.h": "c"
}, },
"cSpell.words": [ "cSpell.words": [
"Blox", "Blox",

Wyświetl plik

@ -113,9 +113,13 @@ lib_deps =
adafruit/Adafruit Unified Sensor@^1.1.4 adafruit/Adafruit Unified Sensor@^1.1.4
paulstoffregen/OneWire@^2.3.5 paulstoffregen/OneWire@^2.3.5
robtillaart/DS18B20@^0.1.11 robtillaart/DS18B20@^0.1.11
h2zero/NimBLE-Arduino@1.3.1
# Hmm - this doesn't work yet # Hmm - this doesn't work yet
# board_build.ldscript = linker/esp32.extram.bss.ld # board_build.ldscript = linker/esp32.extram.bss.ld
lib_ignore = segger_rtt lib_ignore =
segger_rtt
ESP32 BLE Arduino
platform_packages = platform_packages =
framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276 framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276

Wyświetl plik

@ -11,7 +11,6 @@
#include "services/gap/ble_svc_gap.h" #include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h" #include "services/gatt/ble_svc_gatt.h"
#include "sleep.h" #include "sleep.h"
#include <Arduino.h>
#include <WiFi.h> #include <WiFi.h>
#ifndef NO_ESP32 #ifndef NO_ESP32

Wyświetl plik

@ -1,6 +1,5 @@
#pragma once #pragma once
#include <Arduino.h>
#include <functional> #include <functional>
/// We only allow one BLE connection at a time /// We only allow one BLE connection at a time

Wyświetl plik

@ -3,7 +3,6 @@
#include "configuration.h" #include "configuration.h"
#include "nimble/BluetoothUtil.h" #include "nimble/BluetoothUtil.h"
#include "nimble/NimbleDefs.h" #include "nimble/NimbleDefs.h"
#include <Arduino.h>
// This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in // This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in
// proccess at once // proccess at once

Wyświetl plik

@ -11,7 +11,6 @@
#include "host/ble_uuid.h" #include "host/ble_uuid.h"
#include "nimble/nimble_port.h" #include "nimble/nimble_port.h"
#include "nimble/nimble_port_freertos.h" #include "nimble/nimble_port_freertos.h"
#include <Arduino.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {