From 389a45db9fa1755f6d787c6703d8c43cdd31eebf Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 20 Feb 2015 14:43:22 +0100 Subject: [PATCH] Updated USB-Serial Made it a little prettier --- examples/Projects/USB-Serial/USB-Serial.ino | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/Projects/USB-Serial/USB-Serial.ino b/examples/Projects/USB-Serial/USB-Serial.ino index 1c9e7eb..9f6d757 100644 --- a/examples/Projects/USB-Serial/USB-Serial.ino +++ b/examples/Projects/USB-Serial/USB-Serial.ino @@ -24,29 +24,29 @@ void setup() { void loop() { // USB -> Serial - for (int i = 0; i < USB_EP_SIZE; i++) { + uint8_t i; + for (i = 0; i < USB_EP_SIZE; i++) { // read maximum one EP_SIZE to not block - if (Serial.available()) - Serial1.write(Serial.read()); - else break; + int b = Serial.read(); + if (b < 0) + break; + Serial1.write(b); } // Serial -> USB - if (Serial1.available()) { - // send maximum one EP_SIZE to give the usb some time to flush the buffer - uint8_t buff[USB_EP_SIZE - 1]; - int i = 0; - for (i = 0; i < sizeof(buff); i++) { - if (Serial1.available()) - buff[i] = Serial1.read(); - else break; - } - Serial.write(buff, i); + uint8_t buff[USB_EP_SIZE]; + for (i = 0; i < sizeof(buff); i++) { + // read maximum one EP_SIZE to not block + int b = Serial1.read(); + if (b < 0) + break; + buff[i] = b; } + // send maximum one EP_SIZE to give the usb some time to flush the buffer + Serial.write(buff, i); } -void CDC_LineEncodingEvent(void) -{ +void CDC_LineEncodingEvent(void) { // start HW Serial with new baud rate Serial1.end(); Serial1.begin(Serial.baud());