Cleanup

BLESerial.cpp

@@ -1,3 +1,7 @@
+#include "Boards.h"
+
+#if HAS_BLE
+
 #include "BLESerial.h"
 
 uint32_t bt_passkey_callback();
@@ -127,3 +131,5 @@ void BLESerial::SetupSerialService() {
 }
 
 BLESerial::BLESerial() { }
+
+#endif

BLESerial.h

@@ -1,4 +1,7 @@
-#pragma once
+#include "Boards.h"
+
+#if HAS_BLE
+
 #include <Arduino.h>
 
 #include <BLEDevice.h>
@@ -109,3 +112,5 @@ private:
 
   bool started = false;
 };
+
+#endif

Bluetooth.h

@@ -15,7 +15,6 @@
 
 #if MCU_VARIANT == MCU_ESP32
 
-
 #elif MCU_VARIANT == MCU_NRF52
 #endif
 

Boards.h

@@ -149,7 +149,6 @@
       #define HAS_DISPLAY true
       #define HAS_PMU true
       #define HAS_BLUETOOTH true
-      #define HAS_BLE true
       #define HAS_CONSOLE true
       #define HAS_SD false
       #define HAS_EEPROM true
@@ -185,7 +184,6 @@
     #elif BOARD_MODEL == BOARD_LORA32_V1_0
       #define HAS_DISPLAY true
       #define HAS_BLUETOOTH true
-      #define HAS_BLE true
       #define HAS_CONSOLE true
       #define HAS_EEPROM true
       const int pin_cs = 18;
@@ -202,7 +200,6 @@
     #elif BOARD_MODEL == BOARD_LORA32_V2_0
       #define HAS_DISPLAY true
       #define HAS_BLUETOOTH true
-      #define HAS_BLE true
       #define HAS_CONSOLE true
       #define HAS_EEPROM true
       const int pin_cs = 18;
@@ -219,7 +216,6 @@
     #elif BOARD_MODEL == BOARD_LORA32_V2_1
       #define HAS_DISPLAY true
       #define HAS_BLUETOOTH true
-      #define HAS_BLE true
       #define HAS_PMU true
       #define HAS_CONSOLE true
       #define HAS_EEPROM true

RNode_Firmware.ino

@@ -224,9 +224,11 @@ inline void kiss_write_packet() {
   #if MCU_VARIANT == MCU_ESP32 || MCU_VARIANT == MCU_NRF52
     packet_ready = false;
   #endif
-  #if MCU_VARIANT == MCU_ESP32 && HAS_BLE
+  #if MCU_VARIANT == MCU_ESP32
+    #if HAS_BLE
       bt_flush();
     #endif
+  #endif
 }
 
 inline void getPacketData(uint16_t len) {