From 783b179af7e316d9b366b9b255b0ff7cbc28b4ac Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sat, 19 Oct 2019 16:16:49 +0200 Subject: [PATCH] Fix TinyGPSPlus having name conflict --- esphome/components/gps/__init__.py | 2 +- platformio.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esphome/components/gps/__init__.py b/esphome/components/gps/__init__.py index ec94ebdad4..ddbd29d5f8 100644 --- a/esphome/components/gps/__init__.py +++ b/esphome/components/gps/__init__.py @@ -22,4 +22,4 @@ def to_code(config): yield uart.register_uart_device(var, config) # https://platformio.org/lib/show/1655/TinyGPSPlus - cg.add_library('TinyGPSPlus', '1.0.2') + cg.add_library('1655', '1.0.2') # TinyGPSPlus, has name conflict diff --git a/platformio.ini b/platformio.ini index e98aa347e9..a3bb27a897 100644 --- a/platformio.ini +++ b/platformio.ini @@ -17,7 +17,7 @@ lib_deps = FastLED@3.2.9 NeoPixelBus-esphome@2.5.2 ESPAsyncTCP-esphome@1.2.2 - TinyGPSPlus@1.0.2 + 1655@1.0.2 ; TinyGPSPlus (has name conflict) build_flags = -Wno-reorder -DUSE_WEB_SERVER