mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 14:57:41 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
28 lines
540 B
C++
28 lines
540 B
C++
#pragma once
|
|
#include "BluetoothCommon.h"
|
|
|
|
class NimbleBluetooth : BluetoothApi
|
|
{
|
|
public:
|
|
void setup();
|
|
void shutdown();
|
|
void deinit();
|
|
void clearBonds();
|
|
bool isActive();
|
|
bool isConnected();
|
|
int getRssi();
|
|
void sendLog(const uint8_t *logMessage, size_t length);
|
|
#if defined(NIMBLE_TWO)
|
|
void startAdvertising();
|
|
#endif
|
|
bool isDeInit = false;
|
|
|
|
private:
|
|
void setupService();
|
|
#if !defined(NIMBLE_TWO)
|
|
void startAdvertising();
|
|
#endif
|
|
};
|
|
|
|
void setBluetoothEnable(bool enable);
|
|
void clearNVS(); |