[gnoduino: 118/237] Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino: 118/237] Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
- Date: Sat, 31 Mar 2012 20:24:45 +0000 (UTC)
commit f8b2aaaa4fc22f5bb116f67b76b4a8970e7eb621
Merge: 29d8830 7b9b062
Author: Zach Eveland <zeveland blacklabel-development com>
Date: Thu Sep 8 20:26:47 2011 -0400
Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
Conflicts:
build/linux/dist/tools/avrdude.conf
arduino/cores/arduino/Client.h | 1 -
arduino/cores/arduino/HardwareSerial.cpp | 37 +++--------------------------
arduino/cores/arduino/HardwareSerial.h | 2 +-
arduino/cores/arduino/Print.cpp | 10 --------
arduino/cores/arduino/Print.h | 2 +-
arduino/cores/arduino/Server.h | 2 +-
arduino/cores/arduino/Udp.h | 2 -
arduino/cores/arduino/main.cpp | 2 +-
8 files changed, 8 insertions(+), 50 deletions(-)
---
diff --cc arduino/cores/arduino/HardwareSerial.cpp
index 613f252,49a3796..b5992ad
--- a/arduino/cores/arduino/HardwareSerial.cpp
+++ b/arduino/cores/arduino/HardwareSerial.cpp
@@@ -117,10 -109,8 +116,9 @@@ inline void store_char(unsigned char c
#error UDR not defined
#endif
store_char(c, &rx_buffer);
- serialEvent_flag = 1;
}
#endif
+#endif
#if defined(USART1_RX_vect)
void serialEvent1() __attribute__((weak));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]