arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Merge remote-tracking branch 'origin/ide-1.5.x' into ide-1.5.x

Browse Source
This commit is contained in:
Fede85
2013-10-14 17:19:48 +02:00
parent 02550de1e9 6378c8c647
commit 034cb91737
8 changed files with 153 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168.c
View File

@ -950,10 +950,10 @@ char getch(void)
count++;
if (count > MAX_TIME_COUNT)
app_start();
}
return UDR0;
}
return UDR0;
}
else if(bootuart == 2) {
while(!(UCSR1A & _BV(RXC1))) {
/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/