From 92f82e332907d43b0824e9d100b16d4d9ea634ec Mon Sep 17 00:00:00 2001
From: Grzegorz Biesiadecki <gbiesiadecki@gmail.com>
Date: Thu, 11 Jun 2015 10:56:06 -0700
Subject: [PATCH] Add support for picocom as a monitor

---
 Arduino.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Arduino.mk b/Arduino.mk
index 936645a..34cb822 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1488,14 +1488,16 @@ show_boards:
 		@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
 
 monitor:
-ifneq ($(MONITOR_CMD), 'putty')
-	$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
+ifeq ($(MONITOR_CMD), 'putty')
+	ifneq ($(strip $(MONITOR_PARMS)),)
+	$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARMS) $(call get_monitor_port)
+	else
+	$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
+	endif
+else ifeq ($(MONITOR_CMD), picocom)
+		$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
 else
-    ifneq ($(strip $(MONITOR_PARMS)),)
-		$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARMS) $(call get_monitor_port)
-    else
-		$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
-    endif
+		$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
 endif
 
 disasm: $(OBJDIR)/$(TARGET).lss