Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-10 11:29:38 +00:00
Code Issues Projects Releases Wiki Activity

fixed TOS detect on usart output

Browse Source
This commit is contained in:
joxe 2009-02-03 14:08:24 +00:00
parent 5789bf5596
commit cf197a3496
1 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
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.10 2009/01/15 13:13:47 fros4943 Exp $ * $Id: SkySerial.java,v 1.11 2009/02/03 14:08:24 joxe Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -328,17 +328,61 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
public void setConfigXML(Collection<Element> configXML, boolean visAvailable) { public void setConfigXML(Collection<Element> configXML, boolean visAvailable) {
} }
private int tosChars = 0;
boolean tosMode = false;
private int[] tosData = new int[255];
private int tosPos = 0;
private int tosLen = 0;
public void dataReceived(USART source, int data) { public void dataReceived(USART source, int data) {
if (data == '\n') { if (tosMode) {
lastLogMessage = newMessage.toString(); /* needs to add checks to CRC */
newMessage.setLength(0); // System.out.println("Received: " + Integer.toString(data, 16) + " = " + (char) data + " tosPos: " + tosPos);
this.setChanged(); if (data == 0x7e) {
this.notifyObservers(mote); if (tosPos > 6) {
lastLogMessage = newMessage.toString();
newMessage.setLength(0);
this.setChanged();
this.notifyObservers(mote);
// System.out.println("*** Printing TOS String: " + lastLogMessage);
tosPos = 0;
tosLen = 0;
} else {
/* start of new message! */
tosPos = 0;
tosLen = 0;
}
}
if (tosPos == 7) {
tosLen = data;
// System.out.println("TOS Payload len: " + tosLen);
}
if (tosPos > 7 && tosPos < 7 + tosLen) {
if (data < 32) data = 32;
newMessage.append((char) data);
}
tosData[tosPos++] = data;
} else { } else {
newMessage.append((char) data); if (data == 0x7e) {
tosChars++;
if (tosChars == 2) {
tosMode = true;
/* already read one char here */
tosPos = 1;
}
} else {
tosChars = 0;
}
if (data == '\n') {
lastLogMessage = newMessage.toString();
newMessage.setLength(0);
this.setChanged();
this.notifyObservers(mote);
} else {
newMessage.append((char) data);
}
lastSerialData = (byte) data;
serialDataObservable.notifyNewData();
} }
lastSerialData = (byte) data;
serialDataObservable.notifyNewData();
} }
public void close() { public void close() {