mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-04-20 22:13:47 +00:00
Save file with proper formatting
This commit is contained in:
parent
d697d8a790
commit
7f48cb0485
1 changed files with 26 additions and 28 deletions
|
|
@ -1,16 +1,16 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
#include <BLE2902.h>
|
||||||
#include <BLEDevice.h>
|
#include <BLEDevice.h>
|
||||||
#include <BLEServer.h>
|
#include <BLEServer.h>
|
||||||
#include <BLEUtils.h>
|
#include <BLEUtils.h>
|
||||||
#include <BLE2902.h>
|
|
||||||
|
|
||||||
// Nordic UART Service UUIDs (standard, recognised by nRF Connect and bleak)
|
// Nordic UART Service UUIDs (standard, recognised by nRF Connect and bleak)
|
||||||
#define NUS_SERVICE_UUID "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"
|
#define NUS_SERVICE_UUID "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"
|
||||||
#define NUS_TX_UUID "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
|
#define NUS_TX_UUID "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
|
||||||
|
|
||||||
#define BLE_LOG_ADVERT_RESTART_DELAY_MS 1000
|
#define BLE_LOG_ADVERT_RESTART_DELAY_MS 1000
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unsecured BLE UART (Nordic UART Service) logger for ESP32 platforms.
|
* Unsecured BLE UART (Nordic UART Service) logger for ESP32 platforms.
|
||||||
|
|
@ -22,12 +22,12 @@
|
||||||
* Call loop() from the Arduino loop() to handle advertising restart on disconnect.
|
* Call loop() from the Arduino loop() to handle advertising restart on disconnect.
|
||||||
*/
|
*/
|
||||||
class BLELogInterface : public Print, BLEServerCallbacks {
|
class BLELogInterface : public Print, BLEServerCallbacks {
|
||||||
BLEServer* _server;
|
BLEServer *_server;
|
||||||
BLECharacteristic* _tx_char;
|
BLECharacteristic *_tx_char;
|
||||||
bool _connected;
|
bool _connected;
|
||||||
unsigned long _adv_restart_time;
|
unsigned long _adv_restart_time;
|
||||||
char _line_buf[256];
|
char _line_buf[256];
|
||||||
int _line_len;
|
int _line_len;
|
||||||
|
|
||||||
void flushLine() {
|
void flushLine() {
|
||||||
if (_line_len == 0 || !_connected) {
|
if (_line_len == 0 || !_connected) {
|
||||||
|
|
@ -42,58 +42,55 @@ class BLELogInterface : public Print, BLEServerCallbacks {
|
||||||
while (offset < _line_len) {
|
while (offset < _line_len) {
|
||||||
int n = _line_len - offset;
|
int n = _line_len - offset;
|
||||||
if (n > CHUNK) n = CHUNK;
|
if (n > CHUNK) n = CHUNK;
|
||||||
_tx_char->setValue((uint8_t*)_line_buf + offset, n);
|
_tx_char->setValue((uint8_t *)_line_buf + offset, n);
|
||||||
_tx_char->notify();
|
_tx_char->notify();
|
||||||
offset += n;
|
offset += n;
|
||||||
}
|
}
|
||||||
_line_len = 0;
|
_line_len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void onConnect(BLEServer* pServer) override {
|
void onConnect(BLEServer *pServer) override { _connected = true; }
|
||||||
_connected = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void onDisconnect(BLEServer* pServer) override {
|
void onDisconnect(BLEServer *pServer) override {
|
||||||
_connected = false;
|
_connected = false;
|
||||||
_line_len = 0; // discard partial line
|
_line_len = 0; // discard partial line
|
||||||
_adv_restart_time = millis() + BLE_LOG_ADVERT_RESTART_DELAY_MS;
|
_adv_restart_time = millis() + BLE_LOG_ADVERT_RESTART_DELAY_MS;
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
BLELogInterface()
|
BLELogInterface()
|
||||||
: _server(nullptr), _tx_char(nullptr),
|
: _server(nullptr), _tx_char(nullptr), _connected(false), _adv_restart_time(0), _line_len(0) {}
|
||||||
_connected(false), _adv_restart_time(0), _line_len(0) {}
|
|
||||||
|
|
||||||
void begin(const char* device_name) {
|
void begin(const char *device_name) {
|
||||||
BLEDevice::init(device_name);
|
BLEDevice::init(device_name);
|
||||||
BLEDevice::setMTU(256); // default 23-byte MTU caps notifications at 20 bytes; request more
|
BLEDevice::setMTU(256); // default 23-byte MTU caps notifications at 20 bytes; request more
|
||||||
|
|
||||||
// Explicitly disable bonding so the ESP32 does not send security requests.
|
// Explicitly disable bonding so the ESP32 does not send security requests.
|
||||||
// Without this the BLE stack initiates Just Works pairing by default, which
|
// Without this the BLE stack initiates Just Works pairing by default, which
|
||||||
// fails with AUTH FAILED when no security callbacks are registered.
|
// fails with AUTH FAILED when no security callbacks are registered.
|
||||||
BLESecurity* pSecurity = new BLESecurity();
|
BLESecurity *pSecurity = new BLESecurity();
|
||||||
pSecurity->setAuthenticationMode(ESP_LE_AUTH_NO_BOND);
|
pSecurity->setAuthenticationMode(ESP_LE_AUTH_NO_BOND);
|
||||||
pSecurity->setCapability(ESP_IO_CAP_NONE);
|
pSecurity->setCapability(ESP_IO_CAP_NONE);
|
||||||
|
|
||||||
_server = BLEDevice::createServer();
|
_server = BLEDevice::createServer();
|
||||||
_server->setCallbacks(this);
|
_server->setCallbacks(this);
|
||||||
|
|
||||||
BLEService* service = _server->createService(NUS_SERVICE_UUID);
|
BLEService *service = _server->createService(NUS_SERVICE_UUID);
|
||||||
_tx_char = service->createCharacteristic(NUS_TX_UUID, BLECharacteristic::PROPERTY_NOTIFY);
|
_tx_char = service->createCharacteristic(NUS_TX_UUID, BLECharacteristic::PROPERTY_NOTIFY);
|
||||||
_tx_char->addDescriptor(new BLE2902());
|
_tx_char->addDescriptor(new BLE2902());
|
||||||
|
|
||||||
// Characteristic Presentation Format (0x2904): declare value as UTF-8 string
|
// Characteristic Presentation Format (0x2904): declare value as UTF-8 string
|
||||||
// Format: format(1) exponent(1) unit(2) namespace(1) description(2)
|
// Format: format(1) exponent(1) unit(2) namespace(1) description(2)
|
||||||
static const uint8_t utf8_format[] = { 0x19, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00 };
|
static const uint8_t utf8_format[] = { 0x19, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00 };
|
||||||
BLEDescriptor* pFormat = new BLEDescriptor((uint16_t)0x2904);
|
BLEDescriptor *pFormat = new BLEDescriptor((uint16_t)0x2904);
|
||||||
pFormat->setValue(const_cast<uint8_t*>(utf8_format), sizeof(utf8_format));
|
pFormat->setValue(const_cast<uint8_t *>(utf8_format), sizeof(utf8_format));
|
||||||
_tx_char->addDescriptor(pFormat);
|
_tx_char->addDescriptor(pFormat);
|
||||||
service->start();
|
service->start();
|
||||||
|
|
||||||
BLEAdvertising* adv = BLEDevice::getAdvertising();
|
BLEAdvertising *adv = BLEDevice::getAdvertising();
|
||||||
adv->addServiceUUID(NUS_SERVICE_UUID);
|
adv->addServiceUUID(NUS_SERVICE_UUID);
|
||||||
adv->setScanResponse(true);
|
adv->setScanResponse(true);
|
||||||
adv->setMinPreferred(0x06); // helps iOS find and stay connected to the device
|
adv->setMinPreferred(0x06); // helps iOS find and stay connected to the device
|
||||||
adv->setMinPreferred(0x12);
|
adv->setMinPreferred(0x12);
|
||||||
BLEDevice::startAdvertising();
|
BLEDevice::startAdvertising();
|
||||||
}
|
}
|
||||||
|
|
@ -116,8 +113,9 @@ public:
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t write(const uint8_t* buf, size_t size) override {
|
size_t write(const uint8_t *buf, size_t size) override {
|
||||||
for (size_t i = 0; i < size; i++) write(buf[i]);
|
for (size_t i = 0; i < size; i++)
|
||||||
|
write(buf[i]);
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue