From b5c2a8cb629df4aa24083a6633e987309f78bb96 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sun, 13 Jan 2019 19:03:36 +0100 Subject: [PATCH] Fix ble tracker compile error (#390) * Fix BLE tracker compile error for newer esp-idf versions * Fix compile error * Pin platform versions --- platformio.ini | 25 +++++++++++++------------ src/esphomelib/esp32_ble_tracker.cpp | 2 -- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/platformio.ini b/platformio.ini index 9e0a1400..8a7f04e5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,11 +12,12 @@ lib_deps = ESP Async WebServer@1.1.1 FastLED@3.2.0 NeoPixelBus@2.4.1 + AsyncTCP@1.0.1 build_flags = -Wno-reorder src_filter = + [env:livingroom] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -24,7 +25,7 @@ build_flags = ${common.build_flags} -DUSE_NEW_OTA -DUSE_ETHERNET src_filter = ${common.src_filter} + [env:dht-dallas-sensors] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -32,7 +33,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:switch-binarysensor] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -40,7 +41,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:fan-example] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -48,7 +49,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:lights] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -56,7 +57,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:livingroom8266] -platform = espressif8266 +platform = espressif8266@1.8.0 board = nodemcuv2 framework = arduino lib_deps = ${common.lib_deps} @@ -64,7 +65,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:custombmp180] -platform = espressif8266 +platform = espressif8266@1.8.0 board = nodemcuv2 framework = arduino lib_deps = @@ -74,7 +75,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:i2c-sensors] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -82,7 +83,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:pcf8574] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -90,7 +91,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:fastled] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} @@ -98,7 +99,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:sonoff-b1] -platform = espressif8266 +platform = espressif8266@1.8.0 board = esp01_1m board_build.flash_mode = dout framework = arduino @@ -107,7 +108,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:neopixelbus] -platform = espressif32 +platform = espressif32@1.5.0 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} diff --git a/src/esphomelib/esp32_ble_tracker.cpp b/src/esphomelib/esp32_ble_tracker.cpp index 5de56634..2766424d 100644 --- a/src/esphomelib/esp32_ble_tracker.cpp +++ b/src/esphomelib/esp32_ble_tracker.cpp @@ -9,8 +9,6 @@ #include #include #include -#include -#include #include #include "esphomelib/log.h"