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

cmaglie · cmaglie · commit f455750aad33 · 2014-05-23T21:04:47.000+02:00
Conflicts:
	build/shared/examples/01.Basics/Blink/Blink.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
	hardware/arduino/cores/arduino/HardwareSerial.cpp
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
@@ -152,7 +152,7 @@ void HardwareSerial::end()
 
 int HardwareSerial::available(void)
 {
-  return (unsigned int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE;
+  return (int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE;
 }
 
 int HardwareSerial::peek(void)
diff --git a/libraries/SoftwareSerial/SoftwareSerial.cpp b/libraries/SoftwareSerial/SoftwareSerial.cpp
@@ -355,7 +355,7 @@ SoftwareSerial::~SoftwareSerial()
 void SoftwareSerial::setTX(uint8_t tx)
 {
   pinMode(tx, OUTPUT);
-  digitalWrite(tx, HIGH);
+  digitalWrite(tx, _inverse_logic ? LOW : HIGH);
   _transmitBitMask = digitalPinToBitMask(tx);
   uint8_t port = digitalPinToPort(tx);
   _transmitPortRegister = portOutputRegister(port);

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void HardwareSerial::end()`
`152`	`152`
`153`	`153`	`int HardwareSerial::available(void)`
`154`	`154`	`{`
`155`		`- return (unsigned int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE;`
	`155`	`+ return (int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail) % SERIAL_RX_BUFFER_SIZE;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`int HardwareSerial::peek(void)`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ SoftwareSerial::~SoftwareSerial()`
`355`	`355`	`void SoftwareSerial::setTX(uint8_t tx)`
`356`	`356`	`{`
`357`	`357`	`pinMode(tx, OUTPUT);`
`358`		`- digitalWrite(tx, HIGH);`
	`358`	`+ digitalWrite(tx, _inverse_logic ? LOW : HIGH);`
`359`	`359`	`_transmitBitMask = digitalPinToBitMask(tx);`
`360`	`360`	`uint8_t port = digitalPinToPort(tx);`
`361`	`361`	`_transmitPortRegister = portOutputRegister(port);`