Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-08-08 02:28:59 +00:00
Code Issues Projects Releases Wiki Activity

updated to latest version of MSPSim with improved support for Dwarf

Browse Source
This commit is contained in:
Niclas Finne 2011-06-09 01:24:00 +02:00
parent d6db9e4e86
commit 4bac5ac7b9
4 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspSerial.java
View File

@ -46,6 +46,7 @@ import se.sics.cooja.mspmote.MspMoteTimeEvent;
import se.sics.mspsim.core.IOUnit; import se.sics.mspsim.core.IOUnit;
import se.sics.mspsim.core.USART; import se.sics.mspsim.core.USART;
import se.sics.mspsim.core.USARTListener; import se.sics.mspsim.core.USARTListener;
import se.sics.mspsim.core.USARTSource;
/** /**
* @author Fredrik Osterlind * @author Fredrik Osterlind
@ -73,13 +74,9 @@ public class MspSerial extends SerialUI implements SerialPort {
if (ioUnit instanceof USART) { if (ioUnit instanceof USART) {
usart = (USART) ioUnit; usart = (USART) ioUnit;
usart.setUSARTListener(new USARTListener() { usart.setUSARTListener(new USARTListener() {
public void dataReceived(USART arg0, int arg1) { @Override
MspSerial.this.dataReceived(arg1); public void dataReceived(USARTSource source, int data) {
} MspSerial.this.dataReceived(data);
public void stateChanged(int state) {
if (state == USARTListener.RXFLAG_CLEARED) {
/*tryWriteNextByte();*/
}
} }
}); });
} }

16
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
View File

@ -31,18 +31,8 @@
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.Collection; import java.util.Collection;
import java.util.Observable;
import java.util.Observer;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jdom.Element; import org.jdom.Element;
@ -62,6 +52,7 @@ import se.sics.cooja.mspmote.MspMoteTimeEvent;
import se.sics.mspsim.core.IOUnit; import se.sics.mspsim.core.IOUnit;
import se.sics.mspsim.core.USART; import se.sics.mspsim.core.USART;
import se.sics.mspsim.core.USARTListener; import se.sics.mspsim.core.USARTListener;
import se.sics.mspsim.core.USARTSource;
/** /**
* TR1001 radio interface on ESB platform. * TR1001 radio interface on ESB platform.
@ -200,7 +191,7 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
} }
/* USART listener support */ /* USART listener support */
public void dataReceived(USART source, int data) { public void dataReceived(USARTSource source, int data) {
if (!isTransmitting()) { if (!isTransmitting()) {
/* New transmission discovered */ /* New transmission discovered */
/*logger.info("----- NEW TR1001 TRANSMISSION DETECTED -----");*/ /*logger.info("----- NEW TR1001 TRANSMISSION DETECTED -----");*/
@ -253,9 +244,6 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
} }
} }
public void stateChanged(int state) {
}
/* General radio support */ /* General radio support */
public boolean isTransmitting() { public boolean isTransmitting() {
return isTransmitting; return isTransmitting;

BIN
tools/mspsim/mspsim.jar
View File

Binary file not shown.

7
tools/mspsim/scripts/autorun.sc
View File

@ -8,7 +8,8 @@
# contikichecker # contikichecker
#start the nodegui service #start the nodegui service
service controlgui start service -f controlgui start
service nodegui start service -f nodegui start
#service stackchart start service -f serialgui start
#service -f stackchart start
start start