Fix some stuff

esphomeyaml/components/logger.py

@@ -6,7 +6,7 @@ from esphomeyaml.automation import ACTION_REGISTRY, LambdaAction
 import esphomeyaml.config_validation as cv
 from esphomeyaml.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_ID, CONF_LEVEL, \
     CONF_LOGS, CONF_TAG, CONF_TX_BUFFER_SIZE
-from esphomeyaml.core import EsphomeyamlError, Lambda
+from esphomeyaml.core import EsphomeyamlError, Lambda, CORE
 from esphomeyaml.cpp_generator import Pvariable, RawExpression, add, process_lambda, statement
 from esphomeyaml.cpp_types import App, Component, esphomelib_ns, global_ns
 
@@ -69,9 +69,15 @@ def to_code(config):
 
 
 def required_build_flags(config):
+    flags = []
     if CONF_LEVEL in config:
-        return u'-DESPHOMELIB_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]]))
-    return None
+        flags.append(u'-DESPHOMELIB_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]])))
+        this_severity = LOG_LEVEL_SEVERITY.index(config[CONF_LEVEL])
+        verbose_severity = LOG_LEVEL_SEVERITY.index('VERBOSE')
+        if CORE.is_esp8266 and config.get(CONF_BAUD_RATE) != 0 and \
+                this_severity >= verbose_severity:
+            flags.append(u"-DDEBUG_ESP_PORT=Serial")
+    return flags
 
 
 def maybe_simple_message(schema):

esphomeyaml/components/sensor/__init__.py

@@ -46,13 +46,13 @@ FILTERS_SCHEMA = cv.ensure_list({
     vol.Optional(CONF_FILTER_OUT): cv.float_,
     vol.Optional(CONF_FILTER_NAN): None,
     vol.Optional(CONF_SLIDING_WINDOW_MOVING_AVERAGE): vol.All(vol.Schema({
-        vol.Required(CONF_WINDOW_SIZE): cv.positive_not_null_int,
-        vol.Required(CONF_SEND_EVERY): cv.positive_not_null_int,
+        vol.Optional(CONF_WINDOW_SIZE, default=15): cv.positive_not_null_int,
+        vol.Optional(CONF_SEND_EVERY, default=15): cv.positive_not_null_int,
         vol.Optional(CONF_SEND_FIRST_AT): cv.positive_not_null_int,
     }), validate_send_first_at),
     vol.Optional(CONF_EXPONENTIAL_MOVING_AVERAGE): vol.Schema({
-        vol.Required(CONF_ALPHA): cv.positive_float,
-        vol.Required(CONF_SEND_EVERY): cv.positive_not_null_int,
+        vol.Optional(CONF_ALPHA, default=0.1): cv.positive_float,
+        vol.Optional(CONF_SEND_EVERY, default=15): cv.positive_not_null_int,
     }),
     vol.Optional(CONF_LAMBDA): cv.lambda_,
     vol.Optional(CONF_THROTTLE): cv.positive_time_period_milliseconds,

esphomeyaml/components/wifi.py

@@ -62,11 +62,10 @@ WIFI_NETWORK_BASE = vol.Schema({
 })
 
 WIFI_NETWORK_AP = WIFI_NETWORK_BASE.extend({
-    vol.Optional(CONF_MANUAL_IP): AP_MANUAL_IP_SCHEMA,
+
 })
 
 WIFI_NETWORK_STA = WIFI_NETWORK_BASE.extend({
-    vol.Optional(CONF_MANUAL_IP): STA_MANUAL_IP_SCHEMA,
     vol.Optional(CONF_BSSID): cv.mac_address,
 })
 
@@ -79,8 +78,6 @@ def validate(config):
         network = {CONF_SSID: config.pop(CONF_SSID)}
         if CONF_PASSWORD in config:
             network[CONF_PASSWORD] = config.pop(CONF_PASSWORD)
-        if CONF_MANUAL_IP in config:
-            network[CONF_MANUAL_IP] = config.pop(CONF_MANUAL_IP)
         if CONF_NETWORKS in config:
             raise vol.Invalid("You cannot use the 'ssid:' option together with 'networks:'. Please "
                               "copy your network into the 'networks:' key")
@@ -127,7 +124,7 @@ def manual_ip(config):
     )
 
 
-def wifi_network(config):
+def wifi_network(config, static_ip):
     ap = variable(config[CONF_ID], WiFiAP())
     if CONF_SSID in config:
         add(ap.set_ssid(config[CONF_SSID]))
@@ -138,21 +135,28 @@ def wifi_network(config):
         add(ap.set_bssid(ArrayInitializer(*bssid, multiline=False)))
     if CONF_CHANNEL in config:
         add(ap.set_channel(config[CONF_CHANNEL]))
-    if CONF_MANUAL_IP in config:
-        add(ap.set_manual_ip(manual_ip(config[CONF_MANUAL_IP])))
+    if static_ip is not None:
+        add(ap.set_manual_ip(manual_ip(static_ip)))
 
     return ap
 
 
+def get_upload_host(config):
+    if CONF_MANUAL_IP in config:
+        return str(config[CONF_MANUAL_IP][CONF_STATIC_IP])
+    hostname = config.get(CONF_HOSTNAME) or CORE.name
+    return hostname + config[CONF_DOMAIN]
+
+
 def to_code(config):
     rhs = App.init_wifi()
     wifi = Pvariable(config[CONF_ID], rhs)
 
     for network in config.get(CONF_NETWORKS, []):
-        add(wifi.add_sta(wifi_network(network)))
+        add(wifi.add_sta(wifi_network(network, config.get(CONF_MANUAL_IP))))
 
     if CONF_AP in config:
-        add(wifi.set_ap(wifi_network(config[CONF_AP])))
+        add(wifi.set_ap(wifi_network(config[CONF_AP], config.get(CONF_MANUAL_IP))))
 
     if CONF_HOSTNAME in config:
         add(wifi.set_hostname(config[CONF_HOSTNAME]))