From 160bf890e0cc96a7be4166eca7b9753d64635339 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Wed, 24 Aug 2011 17:12:28 -0400
Subject: changed auto-reset method for upload: now triggered by opening port
 at 1200 bps

---
 cores/arduino/CDC.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cores/arduino/CDC.cpp')

diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index b0e5e89..7d9d682 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -94,15 +94,15 @@ bool WEAK CDC_Setup(Setup& setup)
 		if (CDC_SET_LINE_CODING == r)
 		{
 			USB_RecvControl((void*)&_usbLineInfo,7);
+			if (1200 == _usbLineInfo.dwDTERate)		// auto-reset is triggered when avrdude opens the port at 1200 bps
+				Reboot();							
+
 			return true;
 		}
 
 		if (CDC_SET_CONTROL_LINE_STATE == r)
 		{
 			_usbLineInfo.lineState = setup.wValueL;
-//			if (_usbLineInfo.dwDTERate == 115200 && _usbLineInfo.lineState == 0)	// Emulate DTR reset hack
-			if (_usbLineInfo.lineState == 0)
-				Reboot();
 			return true;
 		}
 	}
-- 
cgit v1.2.3-18-g5258