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

Autoreset 1200 bps fix.

Browse Source
This commit is contained in:
Cristian Maglie 2012-02-27 17:41:38 +01:00
parent 5d309dbb46
commit 5eef4ca79c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,13 +101,26 @@ bool WEAK CDC_Setup(Setup& setup)
if (CDC_SET_CONTROL_LINE_STATE == r) if (CDC_SET_CONTROL_LINE_STATE == r)
{ {
_usbLineInfo.lineState = setup.wValueL; _usbLineInfo.lineState = setup.wValueL;
// auto-reset into the bootloader is triggered when the port, already // auto-reset into the bootloader is triggered when the port, already
// open at 1200 bps, is closed. this is the signal to start the watchdog // open at 1200 bps, is closed. this is the signal to start the watchdog
// with a relatively long period so it can finish housekeeping tasks // with a relatively long period so it can finish housekeeping tasks
// like servicing endpoints before the sketch ends // like servicing endpoints before the sketch ends
if (0 != _usbLineInfo.lineState && 1200 == _usbLineInfo.dwDTERate) {
// We check DTR state to determine if host port is open (bit 0 of lineState).
// Serial1.print(">"); Serial1.println(_usbLineInfo.lineState, HEX);
if ((_usbLineInfo.lineState & 0x01) == 0 && _usbLineInfo.dwDTERate == 1200) {
*(uint16_t *)0x0A00 = 0x7777; *(uint16_t *)0x0A00 = 0x7777;
wdt_enable(WDTO_250MS); wdt_enable(WDTO_250MS);
} else {
// Most OSs do some intermediate steps when configuring ports and DTR can
// twiggle more than once before stabilizing.
// To avoid spurious resets we set the watchdog to 250ms and eventually
// cancel if DTR goes back high.
wdt_disable();
wdt_reset();
*(uint16_t *)0x0A00 = 0x0;
} }
return true; return true;
} }
@ -202,4 +215,4 @@ size_t Serial_::write(uint8_t c)
Serial_ Serial; Serial_ Serial;
#endif #endif
#endif /* if defined(USBCON) */ #endif /* if defined(USBCON) */