noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
Roger Clark 2016-07-20 08:02:59 +10:00
parent bf49c2cb09 18f2233357
commit b31ce68543
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STM32F1/boards.txt
View File

@ -79,7 +79,7 @@ mapleRET6.upload.protocol=maple_dfu
mapleRET6.upload.maximum_size=262144
mapleRET6.upload.use_1200bps_touch=false
mapleRET6.upload.file_type=bin
mapleRET6.upload.ram.maximum_size=492152
mapleRET6.upload.ram.maximum_size=49152
mapleRET6.upload.flash.maximum_size=262144
mapleRET6.upload.usbID=1EAF:0003
mapleRET6.upload.altID=1
@ -354,7 +354,7 @@ genericSTM32F103V.build.error_led_pin=6
genericSTM32F103V.menu.device_variant.STM32F103VC=STM32F103VC
genericSTM32F103V.menu.device_variant.STM32F103VC.build.cpu_flags=-DMCU_STM32F103VC -DSTM32F103xE
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.maximum_size=262144
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.ram.maximum_size=492152
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.ram.maximum_size=49152
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.flash.maximum_size=262144
genericSTM32F103V.menu.device_variant.STM32F103VC.build.ldscript=ld/stm32f103vc.ld
@ -413,7 +413,7 @@ genericSTM32F103Z.upload.auto_reset=true
genericSTM32F103Z.menu.device_variant.STM32F103ZC=STM32F103ZC
genericSTM32F103Z.menu.device_variant.STM32F103ZC.build.cpu_flags=-DMCU_STM32F103ZC -DSTM32F103xE
genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.maximum_size=262144
genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.ram.maximum_size=492152
genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.ram.maximum_size=49152
genericSTM32F103Z.menu.device_variant.STM32F103ZC.upload.flash.maximum_size=262144
genericSTM32F103Z.menu.device_variant.STM32F103ZC.build.ldscript=ld/stm32f103zc.ld

9
STM32F1/cores/maple/HardwareSerial.cpp
View File

@ -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) {

11
STM32F3/cores/maple/wirish/HardwareSerial.cpp
View File

@ -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) {

2
STM32F3/cores/maple/wirish/HardwareSerial.h
View File

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