From 4879e83403d64a3419c3e94e091141d5f48142fa Mon Sep 17 00:00:00 2001 From: joxe Date: Tue, 3 Feb 2009 14:18:12 +0000 Subject: [PATCH] minor TOS serial fix --- .../src/se/sics/cooja/mspmote/interfaces/SkySerial.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkySerial.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkySerial.java index a39973f3b..006c168d7 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkySerial.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkySerial.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SkySerial.java,v 1.11 2009/02/03 14:08:24 joxe Exp $ + * $Id: SkySerial.java,v 1.12 2009/02/03 14:18:12 joxe Exp $ */ package se.sics.cooja.mspmote.interfaces; @@ -339,7 +339,7 @@ public class SkySerial extends Log implements SerialPort, USARTListener { // System.out.println("Received: " + Integer.toString(data, 16) + " = " + (char) data + " tosPos: " + tosPos); if (data == 0x7e) { if (tosPos > 6) { - lastLogMessage = newMessage.toString(); + lastLogMessage = "TinyOS: " + newMessage.toString(); newMessage.setLength(0); this.setChanged(); this.notifyObservers(mote); @@ -356,7 +356,7 @@ public class SkySerial extends Log implements SerialPort, USARTListener { tosLen = data; // System.out.println("TOS Payload len: " + tosLen); } - if (tosPos > 7 && tosPos < 7 + tosLen) { + if (tosPos > 9 && tosPos < 10 + tosLen) { if (data < 32) data = 32; newMessage.append((char) data); }