From 22aecdfc6f4e18083df176a8421bd18ab54ff341 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 18 Oct 2019 10:23:06 +0200
Subject: [PATCH] Use higher default baudrate for USB upload (#761)

See also https://github.com/espressif/esptool/issues/435
---
 esphome/__main__.py                 | 2 +-
 esphome/components/uart/__init__.py | 2 +-
 esphome/writer.py                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 9c0b7a33d9..62c15fda6b 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -166,7 +166,7 @@ def compile_program(args, config):
 def upload_using_esptool(config, port):
     path = CORE.firmware_bin
     cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
-           '--baud', str(config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get('upload_speed', 115200)),
+           '--baud', str(config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get('upload_speed', 460800)),
            '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path]
 
     if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 5c983be002..110bd64c81 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -31,7 +31,7 @@ def validate_rx_pin(value):
 
 CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.GenerateID(): cv.declare_id(UARTComponent),
-    cv.Required(CONF_BAUD_RATE): cv.int_range(min=1, max=115200),
+    cv.Required(CONF_BAUD_RATE): cv.int_range(min=1),
     cv.Optional(CONF_TX_PIN): pins.output_pin,
     cv.Optional(CONF_RX_PIN): validate_rx_pin,
 }).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_TX_PIN, CONF_RX_PIN))
diff --git a/esphome/writer.py b/esphome/writer.py
index ddf75faf6b..8fa239d608 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -191,7 +191,7 @@ def get_ini_content():
         'framework': 'arduino',
         'lib_deps': lib_deps + ['${common.lib_deps}'],
         'build_flags': build_flags + ['${common.build_flags}'],
-        'upload_speed': UPLOAD_SPEED_OVERRIDE.get(CORE.board, 115200),
+        'upload_speed': UPLOAD_SPEED_OVERRIDE.get(CORE.board, 460800),
     }
 
     if CORE.is_esp32: