Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master' into F1-USART---buffered-interrupt-based-TX-(static-TX-buffer)

Author: edogaldo

STM32F1/cores/maple/HardwareSerial.cpp

@@ -159,10 +159,11 @@ void HardwareSerial::end(void) {
  */
 
 int HardwareSerial::read(void) {
-    // Block until a byte becomes available, to save user confusion.
-    while (!this->available())
-        ;
-    return usart_getc(this->usart_device);
+	if(usart_data_available(usart_device) > 0) {
+		return usart_getc(usart_device);
+	} else {
+		return -1;
+	}
 }
 
 int HardwareSerial::available(void) {

STM32F3/cores/maple/wirish/HardwareSerial.cpp

@@ -118,11 +118,12 @@ void HardwareSerial::end(void) {
  * I/O
  */
 
-uint8 HardwareSerial::read(void) {
-    // Block until a byte becomes available, to save user confusion.
-    while (!this->available())
-        ;
-    return usart_getc(this->usart_device);
+int HardwareSerial::read(void) {
+	if(usart_data_available(usart_device) > 0) {
+		return usart_getc(usart_device);
+	} else {
+		return -1;
+	}
 }
 
 uint32 HardwareSerial::available(void) {

STM32F3/cores/maple/wirish/HardwareSerial.h

@@ -62,7 +62,7 @@ class HardwareSerial : public Print {
 
     /* I/O */
     uint32 available(void);
-    uint8 read(void);
+    int read(void);
     void flush(void);
     virtual void write(unsigned char);
     using Print::write;

tools/linux/stlink_upload

@@ -1,4 +1,8 @@
 #!/bin/bash
+$(dirname $0)/stlink/st-flash write "$4" 0x8000000
+exit 0
+
+## Remove the lines 2 and 3 (above) if you want this script to wait until the Serial device has been enumerated and loaded before the script exits
 
 # Check for leaf device.
 function leaf_status()