From 1623575129ff0e100499ae0f3cdc252da4df9378 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 5 Dec 2018 10:44:51 +0100
Subject: [PATCH] Fixes

---
 esphomeyaml/components/ethernet.py | 70 ------------------------------
 tests/test1.yaml                   |  5 +--
 tests/test2.yaml                   |  5 +--
 3 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 esphomeyaml/components/ethernet.py

diff --git a/esphomeyaml/components/ethernet.py b/esphomeyaml/components/ethernet.py
deleted file mode 100644
index 52481fd174..0000000000
--- a/esphomeyaml/components/ethernet.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import voluptuous as vol
-
-from esphomeyaml import pins
-from esphomeyaml.components import wifi
-import esphomeyaml.config_validation as cv
-from esphomeyaml.const import CONF_DOMAIN, CONF_HOSTNAME, CONF_ID, CONF_MANUAL_IP, CONF_TYPE, \
-    ESP_PLATFORM_ESP32
-from esphomeyaml.cpp_generator import Pvariable, add
-from esphomeyaml.cpp_helpers import gpio_output_pin_expression
-from esphomeyaml.cpp_types import App, Component, esphomelib_ns, global_ns
-
-CONFLICTS_WITH = ['wifi']
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-
-CONF_PHY_ADDR = 'phy_addr'
-CONF_MDC_PIN = 'mdc_pin'
-CONF_MDIO_PIN = 'mdio_pin'
-CONF_CLK_MODE = 'clk_mode'
-CONF_POWER_PIN = 'power_pin'
-
-EthernetType = esphomelib_ns.enum('EthernetType')
-ETHERNET_TYPES = {
-    'LAN8720': EthernetType.ETHERNET_TYPE_LAN8720,
-    'TLK110': EthernetType.ETHERNET_TYPE_TLK110,
-}
-
-eth_clock_mode_t = global_ns.enum('eth_clock_mode_t')
-CLK_MODES = {
-    'GPIO0_IN': eth_clock_mode_t.ETH_CLOCK_GPIO0_IN,
-    'GPIO0_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO0_OUT,
-    'GPIO16_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO16_OUT,
-    'GPIO17_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO17_OUT,
-}
-
-EthernetComponent = esphomelib_ns.class_('EthernetComponent', Component)
-
-CONFIG_SCHEMA = vol.Schema({
-    cv.GenerateID(): cv.declare_variable_id(EthernetComponent),
-    vol.Required(CONF_TYPE): cv.one_of(*ETHERNET_TYPES, upper=True),
-    vol.Required(CONF_MDC_PIN): pins.output_pin,
-    vol.Required(CONF_MDIO_PIN): pins.input_output_pin,
-    vol.Optional(CONF_CLK_MODE, default='GPIO0_IN'): cv.one_of(*CLK_MODES, upper=True),
-    vol.Optional(CONF_PHY_ADDR, default=0): vol.All(cv.int_, vol.Range(min=0, max=31)),
-    vol.Optional(CONF_POWER_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_MANUAL_IP): wifi.STA_MANUAL_IP_SCHEMA,
-    vol.Optional(CONF_HOSTNAME): cv.hostname,
-    vol.Optional(CONF_DOMAIN, default='.local'): cv.domain_name,
-})
-
-
-def to_code(config):
-    rhs = App.init_ethernet()
-    eth = Pvariable(config[CONF_ID], rhs)
-
-    add(eth.set_phy_addr(config[CONF_PHY_ADDR]))
-    add(eth.set_mdc_pin(config[CONF_MDC_PIN]))
-    add(eth.set_mdio_pin(config[CONF_MDIO_PIN]))
-    add(eth.set_type(ETHERNET_TYPES[config[CONF_TYPE]]))
-    add(eth.set_clk_mode(CLK_MODES[config[CONF_CLK_MODE]]))
-
-    if CONF_POWER_PIN in config:
-        for pin in gpio_output_pin_expression(config[CONF_POWER_PIN]):
-            yield
-        add(eth.set_power_pin(pin))
-
-    if CONF_HOSTNAME in config:
-        add(eth.set_hostname(config[CONF_HOSTNAME]))
-
-    if CONF_MANUAL_IP in config:
-        add(eth.set_manual_ip(wifi.manual_ip(config[CONF_MANUAL_IP])))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index e05d2892e4..5891e10dd9 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2,9 +2,6 @@ esphomeyaml:
   name: test1
   platform: ESP32
   board: nodemcu-32s
-  # Use latest upstream esphomelib git version.
-  esphomelib_version:
-    branch: custom-sensor-platform
   # Use this for testing while developing:
   # esphomelib_version:
   #   local: ~/path/to/esphomelib
@@ -181,7 +178,7 @@ sensor:
       - lambda: return x * (9.0/5.0) + 32.0;
     on_value:
       then:
-        - lambda: >-
+        - lambda: |-
             ESP_LOGD("main", "Got value %f", x);
             id(my_sensor).publish_state(42.0);
             ESP_LOGI("main", "Value of my sensor: %f", id(my_sensor).state);
diff --git a/tests/test2.yaml b/tests/test2.yaml
index a7e7b325de..cee34a8cab 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -2,9 +2,6 @@ esphomeyaml:
   name: $devicename
   platform: ESP32
   board: nodemcu-32s
-  # Use latest upstream esphomelib git version.
-  esphomelib_version:
-    branch: custom-sensor-platform
   # Use this for testing while developing:
   # esphomelib_version:
   #   local: ~/path/to/esphomelib
@@ -154,7 +151,7 @@ text_sensor:
     icon: mdi:icon
     id: version_sensor
     on_value:
-      - lambda: |-
+      - lambda: !lambda |-
           ESP_LOGD("main", "The state is %s=%s", x.c_str(), id(version_sensor).state.c_str());
       - script.execute: my_script
   - platform: mqtt_subscribe