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

using events to write serial data to mote

Browse source
This commit is contained in:
fros4943 2008-10-29 08:51:09 +00:00
parent d23978318f
commit 5d7ed0eab2
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
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.3 2008/10/03 10:39:29 fros4943 Exp $ * $Id: SkySerial.java,v 1.4 2008/10/29 08:51:09 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -40,19 +40,20 @@ import org.apache.log4j.Logger;
import org.jdom.Element; import org.jdom.Element;
import se.sics.cooja.*; import se.sics.cooja.*;
import se.sics.cooja.TimeEvent;
import se.sics.mspsim.core.*; import se.sics.mspsim.core.*;
import se.sics.cooja.interfaces.Log; import se.sics.cooja.interfaces.Log;
import se.sics.cooja.interfaces.SerialPort; import se.sics.cooja.interfaces.SerialPort;
import se.sics.cooja.mspmote.SkyMote; import se.sics.cooja.mspmote.SkyMote;
/** /**
* @author Fredrik Osterlind * @author Fredrik Österlind
*/ */
@ClassDescription("Serial port") @ClassDescription("Serial port")
public class SkySerial extends Log implements SerialPort, USARTListener { public class SkySerial extends Log implements SerialPort, USARTListener {
private static Logger logger = Logger.getLogger(SkySerial.class); private static Logger logger = Logger.getLogger(SkySerial.class);
private Mote myMote; private Mote mote;
private String lastLogMessage = ""; private String lastLogMessage = "";
private String newMessage = ""; private String newMessage = "";
@ -71,7 +72,7 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
private Vector<Byte> incomingData = new Vector<Byte>(); private Vector<Byte> incomingData = new Vector<Byte>();
public SkySerial(SkyMote mote) { public SkySerial(SkyMote mote) {
myMote = mote; this.mote = mote;
/* Listen to port writes */ /* Listen to port writes */
IOUnit ioUnit = mote.getCPU().getIOUnit("USART 1"); IOUnit ioUnit = mote.getCPU().getIOUnit("USART 1");
@ -83,6 +84,7 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
public void writeByte(byte b) { public void writeByte(byte b) {
incomingData.add(b); incomingData.add(b);
mote.getSimulation().scheduleEvent(writeDataEvent, mote.getSimulation().getSimulationTime());
} }
public void writeString(String s) { public void writeString(String s) {
@ -113,18 +115,21 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
return lastSerialData; return lastSerialData;
} }
public void doActionsBeforeTick() { private TimeEvent writeDataEvent = new TimeEvent(0) {
/* Send bytes */ public void execute(int t) {
if (!incomingData.isEmpty()) { /* TODO Implement MSPSim callback - better timing */
if (usart.isReceiveFlagCleared()) {
byte b = incomingData.remove(0); /* Write another byte to serial port */
usart.byteReceived(b); if (!incomingData.isEmpty()) {
if (usart.isReceiveFlagCleared()) {
byte b = incomingData.remove(0);
usart.byteReceived(b);
}
mote.getSimulation().scheduleEvent(this, t+1);
} }
} }
} };
public void doActionsAfterTick() {
}
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
@ -187,8 +192,8 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return 0.0; return 0;
} }
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
@ -204,7 +209,7 @@ public class SkySerial extends Log implements SerialPort, USARTListener {
lastLogMessage = newMessage; lastLogMessage = newMessage;
newMessage = ""; newMessage = "";
this.setChanged(); this.setChanged();
this.notifyObservers(myMote); this.notifyObservers(mote);
} }
lastSerialData = (byte) data; lastSerialData = (byte) data;