deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor TOS serial fix

Browse source
This commit is contained in:
joxe 2009-02-03 14:18:12 +00:00
parent cf197a3496
commit 4879e83403
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkySerial.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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; 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); // System.out.println("Received: " + Integer.toString(data, 16) + " = " + (char) data + " tosPos: " + tosPos);
if (data == 0x7e) { if (data == 0x7e) {
if (tosPos > 6) { if (tosPos > 6) {
lastLogMessage = newMessage.toString(); lastLogMessage = "TinyOS: " + newMessage.toString();
newMessage.setLength(0); newMessage.setLength(0);
this.setChanged(); this.setChanged();
this.notifyObservers(mote); this.notifyObservers(mote);
@ -356,7 +356,7 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
tosLen = data; tosLen = data;
// System.out.println("TOS Payload len: " + tosLen); // System.out.println("TOS Payload len: " + tosLen);
} }
if (tosPos > 7 && tosPos < 7 + tosLen) { if (tosPos > 9 && tosPos < 10 + tosLen) {
if (data < 32) data = 32; if (data < 32) data = 32;
newMessage.append((char) data); newMessage.append((char) data);
} }