rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-01 23:29:28 +01:00
Code Issues Releases Activity

changed auto-reset method for upload: now triggered by opening port at 1200 bps

Browse Source
This commit is contained in:
Zach Eveland 2011-08-24 17:12:28 -04:00
parent dd539bacf8
commit ff5fe87864
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/boards.txt
View File

@ -3,7 +3,7 @@
leonardo.name=Arduino Leonardo leonardo.name=Arduino Leonardo
leonardo.upload.protocol=stk500 leonardo.upload.protocol=stk500
leonardo.upload.maximum_size=30720 leonardo.upload.maximum_size=30720
leonardo.upload.speed=115200 leonardo.upload.speed=1200
leonardo.bootloader.low_fuses=0xde leonardo.bootloader.low_fuses=0xde
leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.high_fuses=0xd8
leonardo.bootloader.extended_fuses=0xf3 leonardo.bootloader.extended_fuses=0xf3

6
hardware/arduino/cores/arduino/CDC.cpp
View File

@ -94,15 +94,15 @@ bool WEAK CDC_Setup(Setup& setup)
if (CDC_SET_LINE_CODING == r) if (CDC_SET_LINE_CODING == r)
{ {
USB_RecvControl((void*)&_usbLineInfo,7); USB_RecvControl((void*)&_usbLineInfo,7);
if (1200 == _usbLineInfo.dwDTERate) // auto-reset is triggered when avrdude opens the port at 1200 bps
Reboot();
return true; return true;
} }
if (CDC_SET_CONTROL_LINE_STATE == r) if (CDC_SET_CONTROL_LINE_STATE == r)
{ {
_usbLineInfo.lineState = setup.wValueL; _usbLineInfo.lineState = setup.wValueL;
// if (_usbLineInfo.dwDTERate == 115200 && _usbLineInfo.lineState == 0) // Emulate DTR reset hack
if (_usbLineInfo.lineState == 0)
Reboot();
return true; return true;
} }
} }