arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-20 21:01:25 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Federico Fissore
2013-10-14 12:42:42 +02:00
parent 65708b68a9 21ef50beb4
commit bef7b94ea7
2 changed files with 4 additions and 3 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++; count++;
if (count > MAX_TIME_COUNT) if (count > MAX_TIME_COUNT)
app_start(); app_start();
}
return UDR0;
} }
return UDR0;
}
else if(bootuart == 2) { else if(bootuart == 2) {
while(!(UCSR1A & _BV(RXC1))) { while(!(UCSR1A & _BV(RXC1))) {
/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/ /* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/

1
libraries/SD/src/File.cpp
View File

@ -44,6 +44,7 @@ File::File(void) {
} }
File::~File(void) { File::~File(void) {
close();
// Serial.print("Deleted file object"); // Serial.print("Deleted file object");
} }