Fix Bluetooth Serial

me-no-dev · me-no-dev · commit 25dff4f04415 · 2018-04-03T11:09:29.000+03:00
diff --git a/libraries/BluetoothSerial/src/BluetoothSerial.cpp b/libraries/BluetoothSerial/src/BluetoothSerial.cpp
@@ -27,6 +27,11 @@
 #include "esp_gap_bt_api.h"
 #include "esp_bt_device.h"
 #include "esp_spp_api.h"
+#include <esp_log.h>
+
+#ifdef ARDUINO_ARCH_ESP32
+#include "esp32-hal-log.h"
+#endif
 
 #define SPP_SERVER_NAME "ESP32_SPP_SERVER"
 #define SPP_TAG "BluetoothSerial"
@@ -208,8 +213,8 @@ int BluetoothSerial::read(void)
         if (xQueueReceive(SerialQueueBT, &c, 0)){
             return c;
         }
-        return 0;
     }
+    return 0;
 }
 
 size_t BluetoothSerial::write(uint8_t c)

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@`
`27`	`27`	`#include "esp_gap_bt_api.h"`
`28`	`28`	`#include "esp_bt_device.h"`
`29`	`29`	`#include "esp_spp_api.h"`
	`30`	`+#include <esp_log.h>`
	`31`	`+`
	`32`	`+#ifdef ARDUINO_ARCH_ESP32`
	`33`	`+#include "esp32-hal-log.h"`
	`34`	`+#endif`
`30`	`35`
`31`	`36`	`#define SPP_SERVER_NAME "ESP32_SPP_SERVER"`
`32`	`37`	`#define SPP_TAG "BluetoothSerial"`
`@@ -208,8 +213,8 @@ int BluetoothSerial::read(void)`
`208`	`213`	`if (xQueueReceive(SerialQueueBT, &c, 0)){`
`209`	`214`	`return c;`
`210`	`215`	`}`
`211`		`- return 0;`
`212`	`216`	`}`
	`217`	`+ return 0;`
`213`	`218`	`}`
`214`	`219`
`215`	`220`	`size_t BluetoothSerial::write(uint8_t c)`