Menu
▾
▴
mspsim-commit
|
From: <ni...@us...> - 2007-12-06 17:10:44
|
Revision: 43
http://mspsim.svn.sourceforge.net/mspsim/?rev=43&view=rev
Author: nifi
Date: 2007-12-06 09:10:41 -0800 (Thu, 06 Dec 2007)
Log Message:
-----------
setup higlight source viewer
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2007-12-06 17:10:11 UTC (rev 42)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2007-12-06 17:10:41 UTC (rev 43)
@@ -44,6 +44,7 @@
import se.sics.mspsim.chip.CC2420;
import se.sics.mspsim.core.*;
+import se.sics.mspsim.extutil.highlight.HighlightSourceViewer;
import se.sics.mspsim.util.*;
/**
@@ -188,6 +189,8 @@
SkyNode node = new SkyNode(cpu);
node.gui = new SkyGui(node);
ControlUI control = new ControlUI(cpu, elf);
+ HighlightSourceViewer sourceViewer = new HighlightSourceViewer();
+ control.setSourceViewer(sourceViewer);
if (args.length > 1) {
MapTable map = new MapTable(args[1]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2007-12-07 10:16:35
|
Revision: 68
http://mspsim.svn.sourceforge.net/mspsim/?rev=68&view=rev
Author: joxe
Date: 2007-12-07 02:16:32 -0800 (Fri, 07 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2007-12-07 10:15:39 UTC (rev 67)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2007-12-07 10:16:32 UTC (rev 68)
@@ -191,7 +191,6 @@
node.gui = new SkyGui(node);
ControlUI control = new ControlUI(cpu, elf);
HighlightSourceViewer sourceViewer = new HighlightSourceViewer();
- sourceViewer.addSearchPath(new File("e:/work/contiki-2.x/examples/sky/"));
control.setSourceViewer(sourceViewer);
if (args.length > 1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-01-14 15:02:43
|
Revision: 75
http://mspsim.svn.sourceforge.net/mspsim/?rev=75&view=rev
Author: joxe
Date: 2008-01-14 05:41:29 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
minor cleanup
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2007-12-10 15:34:32 UTC (rev 74)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-01-14 13:41:29 UTC (rev 75)
@@ -43,10 +43,17 @@
import java.io.IOException;
import se.sics.mspsim.chip.CC2420;
-import se.sics.mspsim.core.*;
+import se.sics.mspsim.core.IOPort;
+import se.sics.mspsim.core.IOUnit;
+import se.sics.mspsim.core.MSP430;
+import se.sics.mspsim.core.PortListener;
+import se.sics.mspsim.core.USART;
+import se.sics.mspsim.core.USARTListener;
import se.sics.mspsim.extutil.highlight.HighlightSourceViewer;
-import se.sics.mspsim.util.*;
-import java.io.File;
+import se.sics.mspsim.util.ControlUI;
+import se.sics.mspsim.util.ELF;
+import se.sics.mspsim.util.IHexReader;
+import se.sics.mspsim.util.MapTable;
/**
* Emulation of Sky Mote
@@ -129,16 +136,15 @@
public boolean getDebug() {
return cpu.getDebug();
}
+
public void setDebug(boolean debug) {
cpu.setDebug(debug);
}
-
public MSP430 getCPU() {
return cpu;
}
-
public void portWrite(IOPort source, int data) {
if (source == port5) {
redLed = (data & RED_LED) == 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-03-31 18:11:27
|
Revision: 215
http://mspsim.svn.sourceforge.net/mspsim/?rev=215&view=rev
Author: joxe
Date: 2008-03-31 11:11:13 -0700 (Mon, 31 Mar 2008)
Log Message:
-----------
added simple connection between mspsim nodes - not yet working.
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-03-25 13:32:34 UTC (rev 214)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-03-31 18:11:13 UTC (rev 215)
@@ -55,8 +55,10 @@
import se.sics.mspsim.extutil.jfreechart.DataChart;
import se.sics.mspsim.extutil.jfreechart.DataSourceSampler;
import se.sics.mspsim.platform.GenericNode;
+//import se.sics.mspsim.util.ArgumentManager;
import se.sics.mspsim.util.ArgumentManager;
import se.sics.mspsim.util.ELF;
+import se.sics.mspsim.util.NetworkConnection;
import se.sics.mspsim.util.OperatingModeStatistics;
/**
@@ -92,6 +94,9 @@
private IOPort port5;
public CC2420 radio;
+ public NetworkConnection network;
+
+
private M25P80 flash;
private String flashFile;
@@ -234,10 +239,20 @@
// }
// }, 1000000);
+
+ network = new NetworkConnection();
+ network.addPacketListener(new PacketListener() {
+ public void transmissionEnded(int[] receivedData) {
+ radio.setIncomingPacket(receivedData);
+ }
+ public void transmissionStarted() {
+ }
+ });
// TODO: remove this test...
radio.setPacketListener(new PacketListener() {
public void transmissionEnded(int[] receivedData) {
System.out.println(getName() + " got packet from radio " + SkyNode.this.cpu.getTimeMillis());
+ network.dataSent(receivedData);
}
public void transmissionStarted() {
System.out.println(getName() + " got indication on transmission from radio " + SkyNode.this.cpu.getTimeMillis());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fro...@us...> - 2008-04-01 08:19:50
|
Revision: 220
http://mspsim.svn.sourceforge.net/mspsim/?rev=220&view=rev
Author: fros4943
Date: 2008-04-01 01:19:47 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
separated m24p80 from external files
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-04-01 08:18:31 UTC (rev 219)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-04-01 08:19:47 UTC (rev 220)
@@ -44,12 +44,12 @@
import se.sics.mspsim.chip.CC2420;
import se.sics.mspsim.chip.M25P80;
+import se.sics.mspsim.chip.FileM25P80;
import se.sics.mspsim.chip.PacketListener;
import se.sics.mspsim.core.IOPort;
import se.sics.mspsim.core.IOUnit;
import se.sics.mspsim.core.MSP430;
import se.sics.mspsim.core.PortListener;
-import se.sics.mspsim.core.TimeEvent;
import se.sics.mspsim.core.USART;
import se.sics.mspsim.core.USARTListener;
import se.sics.mspsim.extutil.jfreechart.DataChart;
@@ -129,6 +129,14 @@
return elf;
}
+ public M25P80 getFlash() {
+ return flash;
+ }
+
+ public void setFlash(M25P80 flash) {
+ this.flash = flash;
+ }
+
public void setDebug(boolean debug) {
cpu.setDebug(debug);
}
@@ -202,7 +210,7 @@
radio.setCCAPort(port1, CC2420_CCA);
radio.setFIFOPPort(port1, CC2420_FIFOP);
radio.setFIFOPort(port1, CC2420_FIFO);
- flash = new M25P80(cpu, flashFile);
+ flash = new FileM25P80(cpu, flashFile);
((USART) usart0).setUSARTListener(this);
port4 = (IOPort) cpu.getIOUnit("Port 4");
if (port4 != null && port4 instanceof IOPort) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ni...@us...> - 2008-01-28 11:03:34
|
Revision: 88
http://mspsim.svn.sourceforge.net/mspsim/?rev=88&view=rev
Author: nifi
Date: 2008-01-28 03:03:14 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
added warning if no firmware is specifed as argument
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-01-26 00:27:25 UTC (rev 87)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-01-28 11:03:14 UTC (rev 88)
@@ -197,6 +197,11 @@
}
public static void main(String[] args) throws IOException {
+ if (args.length == 0) {
+ System.out.println("Usage: mspsim.platform.sky.SkyNode <firmware>");
+ System.exit(1);
+ }
+
final MSP430 cpu = new MSP430(0);
// Monitor execution
cpu.setMonitorExec(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ni...@us...> - 2008-01-28 13:22:16
|
Revision: 98
http://mspsim.svn.sourceforge.net/mspsim/?rev=98&view=rev
Author: nifi
Date: 2008-01-28 05:22:13 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
use cpu time
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-01-28 13:21:39 UTC (rev 97)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-01-28 13:22:13 UTC (rev 98)
@@ -236,7 +236,7 @@
// A HACK!!!
DataChart dataChart = new DataChart("Duty Cycle", "Duty Cycle");
- dataChart.setupChipFrame(node.stats);
+ dataChart.setupChipFrame(node.stats, cpu);
cpu.cpuloop();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-02-11 15:55:25
|
Revision: 119
http://mspsim.svn.sourceforge.net/mspsim/?rev=119&view=rev
Author: joxe
Date: 2008-02-11 07:55:02 -0800 (Mon, 11 Feb 2008)
Log Message:
-----------
minor fixes for new APIs (plugins, etc)
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-02-11 13:35:46 UTC (rev 118)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-02-11 15:55:02 UTC (rev 119)
@@ -55,6 +55,9 @@
import se.sics.mspsim.extutil.highlight.HighlightSourceViewer;
import se.sics.mspsim.extutil.jfreechart.DataChart;
import se.sics.mspsim.ui.ControlUI;
+import se.sics.mspsim.util.CommandHandler;
+import se.sics.mspsim.util.ComponentRegistry;
+import se.sics.mspsim.util.DebugCommands;
import se.sics.mspsim.util.ELF;
import se.sics.mspsim.util.IHexReader;
import se.sics.mspsim.util.MapTable;
@@ -200,13 +203,28 @@
radio.setIncomingPacket(data);
}
+ public int getModeMax() {
+ return MODE_MAX;
+ }
+
+ public String getName() {
+ return "Tmote Sky";
+ }
+
+
public static void main(String[] args) throws IOException {
if (args.length == 0) {
System.out.println("Usage: mspsim.platform.sky.SkyNode <firmware>");
System.exit(1);
}
+ ComponentRegistry registry = new ComponentRegistry();
final MSP430 cpu = new MSP430(0);
+ CommandHandler ch = new CommandHandler();
+ registry.registerComponent("cpu", cpu);
+ registry.registerComponent("commandHandler", ch);
+ registry.registerComponent("debugcmd", new DebugCommands());
+
// Monitor execution
cpu.setMonitorExec(true);
//cpu.setDebug(true);
@@ -223,6 +241,7 @@
MapTable map = elf.getMap();
cpu.getDisAsm().setMap(map);
cpu.setMap(map);
+ registry.registerComponent("mapTable", map);
}
// create a filename for the flash file
@@ -246,6 +265,7 @@
if (args.length > 1) {
MapTable map = new MapTable(args[1]);
cpu.getDisAsm().setMap(map);
+ registry.registerComponent("mapTable", map);
}
@@ -253,14 +273,7 @@
DataChart dataChart = new DataChart("Duty Cycle", "Duty Cycle");
dataChart.setupChipFrame(node.stats, cpu);
+ registry.start();
cpu.cpuloop();
}
-
- public int getModeMax() {
- return MODE_MAX;
- }
-
- public String getName() {
- return "Tmote Sky";
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ni...@us...> - 2008-02-13 19:08:24
|
Revision: 129
http://mspsim.svn.sourceforge.net/mspsim/?rev=129&view=rev
Author: nifi
Date: 2008-02-13 11:08:02 -0800 (Wed, 13 Feb 2008)
Log Message:
-----------
removed unused import
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-02-13 18:10:00 UTC (rev 128)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-02-13 19:08:02 UTC (rev 129)
@@ -43,8 +43,6 @@
import java.io.File;
import java.io.IOException;
-import com.sun.org.apache.bcel.internal.generic.BREAKPOINT;
-
import se.sics.mspsim.chip.CC2420;
import se.sics.mspsim.chip.M25P80;
import se.sics.mspsim.chip.PacketListener;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-02-13 19:24:42
|
Revision: 130
http://mspsim.svn.sourceforge.net/mspsim/?rev=130&view=rev
Author: joxe
Date: 2008-02-13 11:24:38 -0800 (Wed, 13 Feb 2008)
Log Message:
-----------
added elf access.
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-02-13 19:08:02 UTC (rev 129)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-02-13 19:24:38 UTC (rev 130)
@@ -193,6 +193,10 @@
public boolean getDebug() {
return cpu.getDebug();
}
+
+ public ELF getElfInfo() {
+ return elf;
+ }
public void setDebug(boolean debug) {
cpu.setDebug(debug);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-03-03 12:36:14
|
Revision: 155
http://mspsim.svn.sourceforge.net/mspsim/?rev=155&view=rev
Author: joxe
Date: 2008-03-03 04:35:58 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
removed some debugprintouts and tests
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-03-02 18:52:28 UTC (rev 154)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-03-03 12:35:58 UTC (rev 155)
@@ -231,12 +231,12 @@
stats.addMonitor(radio);
stats.addMonitor(cpu);
- cpu.scheduleTimeEventMillis(new TimeEvent(0) {
- public void execute(long t) {
- System.out.println("SkyNode: a second elapsed (wall time): " + t + " millis: " + SkyNode.this.cpu.getTimeMillis());
- SkyNode.this.cpu.scheduleTimeEventMillis(this, 1000.0);
- }
- }, 1000.0);
+// cpu.scheduleTimeEventMillis(new TimeEvent(0) {
+// public void execute(long t) {
+// System.out.println("SkyNode: a second elapsed (wall time): " + t + " millis: " + SkyNode.this.cpu.getTimeMillis());
+// SkyNode.this.cpu.scheduleTimeEventMillis(this, 1000.0);
+// }
+// }, 1000.0);
// TODO: remove this test...
radio.setPacketListener(new PacketListener() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2008-04-01 22:27:59
|
Revision: 223
http://mspsim.svn.sourceforge.net/mspsim/?rev=223&view=rev
Author: joxe
Date: 2008-04-01 15:27:48 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
added configuration for flashfile
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-04-01 22:27:08 UTC (rev 222)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-04-01 22:27:48 UTC (rev 223)
@@ -222,12 +222,15 @@
public void setupNode() {
// create a filename for the flash file
// This should be possible to take from a config file later!
- String fileName = firmwareFile;
- int ix = fileName.lastIndexOf('.');
- if (ix > 0) {
- fileName = fileName.substring(0, ix);
+ String fileName = config.getProperty("flashfile");
+ if (fileName == null) {
+ fileName = firmwareFile;
+ int ix = fileName.lastIndexOf('.');
+ if (ix > 0) {
+ fileName = fileName.substring(0, ix);
+ }
+ fileName = fileName + ".flash";
}
- fileName = fileName + ".flash";
System.out.println("Using flash file: " + fileName);
this.flashFile = fileName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fro...@us...> - 2008-04-03 15:51:35
|
Revision: 226
http://mspsim.svn.sourceforge.net/mspsim/?rev=226&view=rev
Author: fros4943
Date: 2008-04-03 08:48:42 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
load flash file from disk optional
Modified Paths:
--------------
mspsim/se/sics/mspsim/platform/sky/SkyNode.java
Modified: mspsim/se/sics/mspsim/platform/sky/SkyNode.java
===================================================================
--- mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-04-03 14:43:45 UTC (rev 225)
+++ mspsim/se/sics/mspsim/platform/sky/SkyNode.java 2008-04-03 15:48:42 UTC (rev 226)
@@ -187,7 +187,7 @@
return "Tmote Sky";
}
- public void setupNodePorts() {
+ public void setupNodePorts(boolean loadFlash) {
IOUnit unit = cpu.getIOUnit("Port 5");
if (unit instanceof IOPort) {
port5 = (IOPort) unit;
@@ -210,7 +210,9 @@
radio.setCCAPort(port1, CC2420_CCA);
radio.setFIFOPPort(port1, CC2420_FIFOP);
radio.setFIFOPort(port1, CC2420_FIFO);
- flash = new FileM25P80(cpu, flashFile);
+ if (loadFlash) {
+ flash = new FileM25P80(cpu, flashFile);
+ }
((USART) usart0).setUSARTListener(this);
port4 = (IOPort) cpu.getIOUnit("Port 4");
if (port4 != null && port4 instanceof IOPort) {
@@ -235,7 +237,7 @@
this.flashFile = fileName;
- setupNodePorts();
+ setupNodePorts(true);
stats.addMonitor(this);
stats.addMonitor(radio);
@@ -250,7 +252,7 @@
// }
// }, 1000000);
-
+
network = new NetworkConnection();
network.addPacketListener(new PacketListener() {
public void transmissionEnded(int[] receivedData) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X