From e399c6b3631d0b0807989689d2da0f06cc99721e Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 15 May 2018 14:05:29 -0700
Subject: [PATCH] Fix issue with `monitor_speed` option

---
 platformio/commands/device.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio/commands/device.py b/platformio/commands/device.py
index 877b62e6..8b6dbd89 100644
--- a/platformio/commands/device.py
+++ b/platformio/commands/device.py
@@ -166,7 +166,7 @@ def device_monitor(**kwargs):  # pylint: disable=too-many-branches
         monitor_options = {k: v for k, v in project_options or []}
         if monitor_options:
             for k in ("port", "baud", "rts", "dtr"):
-                k2 = "monitor_%s" % k
+                k2 = "monitor_%s" % ("speed" if k == "baud" else k)
                 if kwargs[k] is None and k2 in monitor_options:
                     kwargs[k] = monitor_options[k2]
                     if k != "port":