From ca90bf75cb1e256f728e879dc83d17bf3e02197b Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sat, 21 Sep 2013 23:40:38 +0200 Subject: [PATCH] Bridge: Increased timeout when receiving "lenght" field. Fixes a weird timing issue: http://forum.arduino.cc/index.php?topic=188955.0 --- build/shared/revisions.txt | 1 + libraries/Bridge/src/Bridge.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index a0ff85757..c690d35e7 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -3,6 +3,7 @@ ARDUINO 1.5.5 BETA [libraries] * avr: Fixed buffer overflow in File::doBuffer() (dreggy) +* avr: Fixed timeout in Bridge::transfer() ARDUINO 1.5.4 BETA 2013.09.10 diff --git a/libraries/Bridge/src/Bridge.cpp b/libraries/Bridge/src/Bridge.cpp index a3d911fd4..c18fe18f8 100644 --- a/libraries/Bridge/src/Bridge.cpp +++ b/libraries/Bridge/src/Bridge.cpp @@ -158,11 +158,11 @@ uint16_t BridgeClass::transfer(const uint8_t *buff1, uint16_t len1, crcUpdate(index); // Recv len - int lh = timedRead(5); + int lh = timedRead(10); if (lh < 0) continue; crcUpdate(lh); - int ll = timedRead(5); + int ll = timedRead(10); if (ll < 0) continue; crcUpdate(ll);