From e4e315f723c745dd81ceea27f018d63ce14a8fec Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Mon, 11 Feb 2019 16:50:10 +0100 Subject: [PATCH] Revert "Upgrade espressif32 package to 1.6.0 (#355)" (#422) * Revert "Upgrade espressif32 package to 1.6.0 (#355)" This reverts commit e347cb538d428c48e7661a327ddff0b1a08d6792. * Fix revert * Fix --- esphomeyaml/components/api.py | 2 +- esphomeyaml/core_config.py | 2 +- esphomeyaml/dashboard/static/favicon.ico | Bin 15086 -> 15086 bytes esphomeyaml/dashboard/templates/index.html | 10 --- esphomeyaml/pins.py | 45 ++---------- esphomeyaml/writer.py | 78 +++++++++++++-------- tests/test2.yaml | 6 ++ 7 files changed, 62 insertions(+), 81 deletions(-) diff --git a/esphomeyaml/components/api.py b/esphomeyaml/components/api.py index 5a7cfd9cfc..4775ef626a 100644 --- a/esphomeyaml/components/api.py +++ b/esphomeyaml/components/api.py @@ -42,7 +42,7 @@ BUILD_FLAGS = '-DUSE_API' def lib_deps(config): if CORE.is_esp32: - return 'AsyncTCP@1.0.3' + return 'AsyncTCP@1.0.1' if CORE.is_esp8266: return 'ESPAsyncTCP@1.1.3' raise NotImplementedError diff --git a/esphomeyaml/core_config.py b/esphomeyaml/core_config.py index 4d413407b7..1bd510a9e4 100644 --- a/esphomeyaml/core_config.py +++ b/esphomeyaml/core_config.py @@ -123,7 +123,7 @@ PLATFORMIO_ESP8266_LUT = { PLATFORMIO_ESP32_LUT = { '1.0.0': 'espressif32@1.4.0', - 'RECOMMENDED': 'espressif32@1.6.0', + 'RECOMMENDED': 'espressif32@1.5.0', 'LATEST': 'espressif32', 'DEV': ARDUINO_VERSION_ESP32_DEV, } diff --git a/esphomeyaml/dashboard/static/favicon.ico b/esphomeyaml/dashboard/static/favicon.ico index 5aaaf3fb2495fb042ffc7d2bffca926d7d6f85d2..88dcd7e2d1ad8943943707409de2a8eb8089924e 100644 GIT binary patch literal 15086 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 c2Qvf12WAF_1I!Ez7oZr#28qEiNDZ5r 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 diff --git a/esphomeyaml/dashboard/templates/index.html b/esphomeyaml/dashboard/templates/index.html index a3a330e8ae..42e6ab8162 100644 --- a/esphomeyaml/dashboard/templates/index.html +++ b/esphomeyaml/dashboard/templates/index.html @@ -295,16 +295,6 @@ - - - - - - - - - - diff --git a/esphomeyaml/pins.py b/esphomeyaml/pins.py index f16c9fed57..2a8fb7ec06 100644 --- a/esphomeyaml/pins.py +++ b/esphomeyaml/pins.py @@ -127,18 +127,9 @@ ESP32_BOARD_PINS = { 'SW2': 2, 'SW3': 0, 'POT1': 32, 'POT2': 33, 'PIEZO1': 19, 'PIEZO2': 18, 'PHOTO': 25, 'DHT_PIN': 26, 'S1': 4, 'S2': 16, 'S3': 18, 'S4': 19, 'S5': 21, 'SDA': 27, 'SCL': 14, 'SS': 19, 'MOSI': 21, 'MISO': 22, 'SCK': 23}, - 'bpi-bit': {'BUZZER': 25, 'BUTTON_A': 35, 'BUTTON_B': 27, 'RGB_LED': 4, 'LIGHT_SENSOR1': 36, - 'LIGHT_SENSOR2': 39, 'TEMPERATURE_SENSOR': 34, 'MPU9250_INT': 0, 'P0': 25, 'P1': 32, - 'P2': 33, 'P3': 13, 'P4': 15, 'P5': 35, 'P6': 12, 'P7': 14, 'P8': 16, 'P9': 17, - 'P10': 26, 'P11': 27, 'P12': 2, 'P13': 18, 'P14': 19, 'P15': 23, 'P16': 5, - 'P19': 22, 'P20': 21, 'DAC1': 26}, - 'd-duino-32': {'SDA': 5, 'SCL': 4, 'SS ': 15, 'MOSI ': 13, 'MISO ': 12, 'SCK ': 14, 'D1': 5, - 'D2': 4, 'D3': 0, 'D4': 2, 'D5': 14, 'D6': 12, 'D7': 13, 'D8': 15, 'D9': 3, - 'D10': 1}, 'esp-wrover-kit': {}, 'esp32-evb': {'BUTTON': 34, 'SDA': 13, 'SCL': 16, 'SS': 17, 'MOSI': 2, 'MISO': 15, 'SCK': 14}, 'esp32-gateway': {'LED': 33, 'BUTTON': 34, 'SCL': 16, 'SDA': 17}, - 'esp32-poe': {'BUTTON': 34, 'SDA': 13, 'SCL': 16, 'MOSI': 2, 'MISO': 15, 'SCK': 14}, 'esp320': {'LED': 5, 'SDA': 2, 'SCL': 14, 'SS': 15, 'MOSI': 13, 'MISO': 12, 'SCK': 14}, 'esp32dev': {}, 'esp32doit-devkit-v1': {'LED': 2}, @@ -151,15 +142,12 @@ ESP32_BOARD_PINS = { 'A0': 26, 'A1': 25, 'A2': 34, 'A4': 36, 'A5': 4, 'A6': 14, 'A7': 32, 'A8': 15, 'A9': 33, 'A10': 27, 'A11': 12, 'A12': 13, 'A13': 35}, 'firebeetle32': {'LED': 2}, - 'fm-devkit': {'LED': 5, 'SW1': 4, 'SW2': 18, 'SW3': 19, 'SW4': 21, 'I2S_MCLK': 2, - 'I2S_LRCLK': 25, 'I2S_SCLK': 26, 'I2S_DOUT': 22, 'D0': 34, 'D1': 35, 'D2': 32, - 'D3': 33, 'D4': 27, 'D5': 14, 'D6': 12, 'D7': 13, 'D8': 15, 'D9': 23, 'D10': 0, - 'SDA': 16, 'SCL': 17}, 'heltec_wifi_kit_32': {'LED': 25, 'BUTTON': 0, 'A1': 37, 'A2': 38}, 'heltec_wifi_lora_32': {'LED': 25, 'BUTTON': 0, 'SDA': 4, 'SCL': 15, 'SS': 18, 'MOSI': 27, - 'SCK': 5, 'A1': 37, 'A2': 38, 'OLED_SCL': 15, 'OLED_SDA': 4, - 'OLED_RST': 16, 'LORA_SCK': 5, 'LORA_MOSI': 27, 'LORA_MISO': 19, - 'LORA_CS': 18, 'LORA_RST': 14, 'LORA_IRQ': 26}, + 'SCK': 5, 'A1': 37, 'A2': 38, 'T8': 32, 'T9': 33, 'DAC1': 26, + 'DAC2': 25, 'OLED_SCL': 15, 'OLED_SDA': 4, 'OLED_RST': 16, + 'LORA_SCK': 5, 'LORA_MOSI': 27, 'LORA_MISO': 19, 'LORA_CS': 18, + 'LORA_RST': 14, 'LORA_IRQ': 26}, 'hornbill32dev': {'LED': 13, 'BUTTON': 0}, 'hornbill32minima': {'SS': 2}, 'intorobot': {'LED': 4, 'LED_RED': 27, 'LED_GREEN': 21, 'LED_BLUE': 22, @@ -171,12 +159,6 @@ ESP32_BOARD_PINS = { 'lolin_d32': {'LED': 5, 'VBAT': 35}, 'lolin_d32_pro': {'LED': 5, 'VBAT': 35, 'TF_CS': 4, 'TS_CS': 12, 'TFT_CS': 14, 'TFT_LED': 32, 'TFT_RST': 33, 'TFT_DC': 27}, - 'lopy': {'LORA_SCK': 5, 'LORA_MISO': 19, 'LORA_MOSI': 27, 'LORA_CS': 17, 'LORA_RST': 18, - 'LORA_IRQ': 23, 'LED': 0, 'ANT_SELECT': 16, 'SDA': 12, 'SCL': 13, 'SS': 17, - 'MOSI': 22, 'MISO': 37, 'SCK': 13, 'A1': 37, 'A2': 38}, - 'lopy4': {'LORA_SCK': 5, 'LORA_MISO': 19, 'LORA_MOSI': 27, 'LORA_CS': 18, 'LORA_IRQ': 23, - 'LED': 0, 'ANT_SELECT': 21, 'SDA': 12, 'SCL': 13, 'SS': 18, 'MOSI': 22, 'MISO': 37, - 'SCK': 13, 'A1': 37, 'A2': 38}, 'm5stack-core-esp32': {'TXD2': 17, 'RXD2': 16, 'G23': 23, 'G19': 19, 'G18': 18, 'G3': 3, 'G16': 16, 'G21': 21, 'G2': 2, 'G12': 12, 'G15': 15, 'G35': 35, 'G36': 36, 'G25': 25, 'G26': 26, 'G1': 1, 'G17': 17, 'G22': 22, 'G5': 5, @@ -202,27 +184,14 @@ ESP32_BOARD_PINS = { 'nodemcu-32s': {'LED': 2, 'BUTTON': 0}, 'odroid_esp32': {'LED': 2, 'SDA': 15, 'SCL': 4, 'SS': 22, 'ADC1': 35, 'ADC2': 36}, 'onehorse32dev': {'LED': 5, 'BUTTON': 0, 'A1': 37, 'A2': 38}, - 'oroca_edubot': {'LED': 13, 'TX': 17, 'RX': 16, 'SDA': 23, 'SS': 2, 'MOSI': 18, 'SCK': 5, - 'A0': 34, 'A1': 39, 'A2': 36, 'A3': 33, 'D0': 4, 'D1': 16, 'D2': 17, 'D3': 22, - 'D4': 23, 'D5': 5, 'D6': 18, 'D7': 19, 'D8': 33, 'VBAT': 35}, 'pico32': {}, 'pocket_32': {'LED': 16}, 'quantum': {}, 'ttgo-lora32-v1': {'LED': 2, 'BUTTON': 0, 'SS': 18, 'MOSI': 27, 'SCK': 5, 'A1': 37, 'A2': 38, - 'OLED_SDA': 4, 'OLED_SCL': 15, 'OLED_RST': 16, 'LORA_SCK': 5, - 'LORA_MISO': 19, 'LORA_MOSI': 27, 'LORA_CS': 18, 'LORA_RST': 14, - 'LORA_IRQ': 26}, - 'ttgo-t-beam': {'LORA_SCK': 5, 'LORA_MISO': 19, 'LORA_MOSI': 27, 'LORA_CS': 18, 'LORA_RST': 23, - 'LORA_IRQ': 26, 'LORA_IO1': 33, 'LORA_IO2': 32, 'SS': 18, 'MOSI': 27, 'SCK': 5, - 'T8': 32, 'T9': 33, 'DAC2': 25}, - 'turta_iot_node': {'LED': 13, 'TX': 10, 'RX': 9, 'SDA': 23, 'SS': 21, 'MOSI': 18, 'SCK': 5, - 'A0': 4, 'A1': 25, 'A2': 26, 'A3': 27, 'A8': 38, 'T1': 25, 'T2': 26, - 'T3': 27, 'T4': 32, 'T5': 33, 'T6': 34, 'T7': 35, 'T8': 22, 'T9': 23, - 'T10': 10, 'T11': 9, 'T12': 21, 'T13': 5, 'T14': 18, 'T15': 19, - 'T16': 37, 'T17': 14, 'T18': 2, 'T19': 38}, + 'T8': 32, 'T9': 33, 'DAC1': 26, 'DAC2': 25, 'OLED_SDA': 4, 'OLED_SCL': 15, + 'OLED_RST': 16, 'LORA_SCK': 5, 'LORA_MISO': 19, 'LORA_MOSI': 27, + 'LORA_CS': 18, 'LORA_RST': 14, 'LORA_IRQ': 26}, 'wemosbat': 'pocket_32', - 'wesp32': {'SCL': 4, 'SDA': 2, 'MISO': 32, 'ETH_PHY_ADDR': 0, 'ETH_PHY_MDC': 16, - 'ETH_PHY_MDIO': 17}, 'widora-air': {'LED': 25, 'BUTTON': 0, 'SDA': 23, 'SCL': 19, 'MOSI': 16, 'MISO': 17, 'A1': 39, 'A2': 35, 'A3': 25, 'A4': 26, 'A5': 14, 'A6': 12, 'A7': 15, 'A8': 13, 'A9': 2, 'D0': 19, 'D1': 23, 'D2': 18, 'D3': 17, 'D4': 16, 'D5': 5, 'D6': 4, 'T0': 19, diff --git a/esphomeyaml/writer.py b/esphomeyaml/writer.py index 60de4353dc..575d57db3c 100644 --- a/esphomeyaml/writer.py +++ b/esphomeyaml/writer.py @@ -8,10 +8,10 @@ import re import shutil from esphomeyaml.config import iter_components -from esphomeyaml.const import CONF_ARDUINO_VERSION, CONF_BRANCH, CONF_COMMIT, \ - CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, CONF_LOCAL, CONF_REPOSITORY, CONF_TAG, \ - CONF_USE_CUSTOM_CODE, CONF_PLATFORMIO_OPTIONS, CONF_BOARD_FLASH_MODE, \ - ARDUINO_VERSION_ESP8266_DEV +from esphomeyaml.const import ARDUINO_VERSION_ESP32_DEV, CONF_ARDUINO_VERSION, \ + CONF_BRANCH, CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, \ + CONF_LOCAL, CONF_REPOSITORY, CONF_TAG, CONF_USE_CUSTOM_CODE, CONF_PLATFORMIO_OPTIONS, \ + CONF_BOARD_FLASH_MODE, ARDUINO_VERSION_ESP8266_DEV from esphomeyaml.core import CORE, EsphomeyamlError from esphomeyaml.core_config import VERSION_REGEX, LIBRARY_URI_REPO, GITHUB_ARCHIVE_ZIP from esphomeyaml.helpers import mkdir_p, run_system_command @@ -279,9 +279,27 @@ def gather_lib_deps(): if CORE.is_esp32: lib_deps |= { 'Preferences', # Preferences helper + 'AsyncTCP@1.0.1', # Pin AsyncTCP version } + lib_deps.discard('AsyncTCP@1.0.3') + + # Manual fix for AsyncTCP + if CORE.config[CONF_ESPHOMEYAML].get(CONF_ARDUINO_VERSION) == ARDUINO_VERSION_ESP32_DEV: + lib_deps.add('AsyncTCP@1.0.3') + lib_deps.discard('AsyncTCP@1.0.1') + elif CORE.is_esp8266: + lib_deps.add('ESPAsyncTCP@1.1.3') # avoid changing build flags order - return list(sorted(x for x in lib_deps if x)) + lib_deps_l = list(lib_deps) + lib_deps_l.sort() + + # Move AsyncTCP to front, see https://github.com/platformio/platformio-core/issues/2115 + if 'AsyncTCP@1.0.3' in lib_deps_l: + lib_deps_l.insert(0, lib_deps_l.pop(lib_deps_l.index('AsyncTCP@1.0.3'))) + if 'AsyncTCP@1.0.1' in lib_deps_l: + lib_deps_l.insert(0, lib_deps_l.pop(lib_deps_l.index('AsyncTCP@1.0.1'))) + + return lib_deps_l def gather_build_flags(): @@ -344,32 +362,30 @@ def get_ini_content(): data['board_build.flash_mode'] = flash_mode if not CORE.config[CONF_ESPHOMEYAML][CONF_USE_CUSTOM_CODE]: - if CORE.is_esp8266: - # On ESP8266, we can disable LDF - data['lib_ldf_mode'] = 'off' - elif CORE.is_esp32: - # On ESP32, we need to enable LDF - # and can manually remove all libraries we don't need - data['lib_ldf_mode'] = 'chain' - REMOVABLE_LIBRARIES = [ - 'ArduinoOTA', - 'ESPmDNS', - 'Update', - 'Wire', - 'FastLED', - 'NeoPixelBus', - 'ESP Async WebServer', - 'AsyncMqttClient', - ] - ignore = [] - for x in REMOVABLE_LIBRARIES: - for o in lib_deps: - if x in o: - break - else: - ignore.append(x) - if ignore: - data['lib_ignore'] = ignore + # Ignore libraries that are not explicitly used, but may + # be added by LDF + data['lib_ldf_mode'] = 'chain' + REMOVABLE_LIBRARIES = [ + 'ArduinoOTA', + 'ESPmDNS', + 'Update', + 'Wire', + 'FastLED', + 'NeoPixelBus', + 'ESP Async WebServer', + 'AsyncMqttClient', + 'AsyncTCP', + 'ESPAsyncTCP', + ] + ignore = [] + for x in REMOVABLE_LIBRARIES: + for o in lib_deps: + if o.startswith(x): + break + else: + ignore.append(x) + if ignore: + data['lib_ignore'] = ignore data.update(CORE.config[CONF_ESPHOMEYAML].get(CONF_PLATFORMIO_OPTIONS, {})) diff --git a/tests/test2.yaml b/tests/test2.yaml index 40c00b2355..93e54fb8fb 100644 --- a/tests/test2.yaml +++ b/tests/test2.yaml @@ -47,6 +47,8 @@ ota: logger: level: DEBUG +web_server: + deep_sleep: run_duration: 20s sleep_duration: 50s @@ -161,6 +163,10 @@ binary_sensor: entity_id: binary_sensor.hello_world id: ha_hello_world_binary +remote_receiver: + pin: GPIO32 + dump: [] + esp32_ble_tracker: scan_interval: 300s