mirror of
https://github.com/markqvist/RNode_Firmware.git
synced 2024-12-25 23:49:41 -05:00
Cleanup
This commit is contained in:
parent
a9a68d164e
commit
304cdd2968
@ -1,3 +1,7 @@
|
|||||||
|
#include "Boards.h"
|
||||||
|
|
||||||
|
#if HAS_BLE
|
||||||
|
|
||||||
#include "BLESerial.h"
|
#include "BLESerial.h"
|
||||||
|
|
||||||
uint32_t bt_passkey_callback();
|
uint32_t bt_passkey_callback();
|
||||||
@ -127,3 +131,5 @@ void BLESerial::SetupSerialService() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
BLESerial::BLESerial() { }
|
BLESerial::BLESerial() { }
|
||||||
|
|
||||||
|
#endif
|
@ -1,4 +1,7 @@
|
|||||||
#pragma once
|
#include "Boards.h"
|
||||||
|
|
||||||
|
#if HAS_BLE
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
|
||||||
#include <BLEDevice.h>
|
#include <BLEDevice.h>
|
||||||
@ -109,3 +112,5 @@ private:
|
|||||||
|
|
||||||
bool started = false;
|
bool started = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif
|
@ -14,7 +14,6 @@
|
|||||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#if MCU_VARIANT == MCU_ESP32
|
#if MCU_VARIANT == MCU_ESP32
|
||||||
|
|
||||||
|
|
||||||
#elif MCU_VARIANT == MCU_NRF52
|
#elif MCU_VARIANT == MCU_NRF52
|
||||||
#endif
|
#endif
|
||||||
|
4
Boards.h
4
Boards.h
@ -149,7 +149,6 @@
|
|||||||
#define HAS_DISPLAY true
|
#define HAS_DISPLAY true
|
||||||
#define HAS_PMU true
|
#define HAS_PMU true
|
||||||
#define HAS_BLUETOOTH true
|
#define HAS_BLUETOOTH true
|
||||||
#define HAS_BLE true
|
|
||||||
#define HAS_CONSOLE true
|
#define HAS_CONSOLE true
|
||||||
#define HAS_SD false
|
#define HAS_SD false
|
||||||
#define HAS_EEPROM true
|
#define HAS_EEPROM true
|
||||||
@ -185,7 +184,6 @@
|
|||||||
#elif BOARD_MODEL == BOARD_LORA32_V1_0
|
#elif BOARD_MODEL == BOARD_LORA32_V1_0
|
||||||
#define HAS_DISPLAY true
|
#define HAS_DISPLAY true
|
||||||
#define HAS_BLUETOOTH true
|
#define HAS_BLUETOOTH true
|
||||||
#define HAS_BLE true
|
|
||||||
#define HAS_CONSOLE true
|
#define HAS_CONSOLE true
|
||||||
#define HAS_EEPROM true
|
#define HAS_EEPROM true
|
||||||
const int pin_cs = 18;
|
const int pin_cs = 18;
|
||||||
@ -202,7 +200,6 @@
|
|||||||
#elif BOARD_MODEL == BOARD_LORA32_V2_0
|
#elif BOARD_MODEL == BOARD_LORA32_V2_0
|
||||||
#define HAS_DISPLAY true
|
#define HAS_DISPLAY true
|
||||||
#define HAS_BLUETOOTH true
|
#define HAS_BLUETOOTH true
|
||||||
#define HAS_BLE true
|
|
||||||
#define HAS_CONSOLE true
|
#define HAS_CONSOLE true
|
||||||
#define HAS_EEPROM true
|
#define HAS_EEPROM true
|
||||||
const int pin_cs = 18;
|
const int pin_cs = 18;
|
||||||
@ -219,7 +216,6 @@
|
|||||||
#elif BOARD_MODEL == BOARD_LORA32_V2_1
|
#elif BOARD_MODEL == BOARD_LORA32_V2_1
|
||||||
#define HAS_DISPLAY true
|
#define HAS_DISPLAY true
|
||||||
#define HAS_BLUETOOTH true
|
#define HAS_BLUETOOTH true
|
||||||
#define HAS_BLE true
|
|
||||||
#define HAS_PMU true
|
#define HAS_PMU true
|
||||||
#define HAS_CONSOLE true
|
#define HAS_CONSOLE true
|
||||||
#define HAS_EEPROM true
|
#define HAS_EEPROM true
|
||||||
|
@ -224,8 +224,10 @@ inline void kiss_write_packet() {
|
|||||||
#if MCU_VARIANT == MCU_ESP32 || MCU_VARIANT == MCU_NRF52
|
#if MCU_VARIANT == MCU_ESP32 || MCU_VARIANT == MCU_NRF52
|
||||||
packet_ready = false;
|
packet_ready = false;
|
||||||
#endif
|
#endif
|
||||||
#if MCU_VARIANT == MCU_ESP32 && HAS_BLE
|
#if MCU_VARIANT == MCU_ESP32
|
||||||
bt_flush();
|
#if HAS_BLE
|
||||||
|
bt_flush();
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user