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

using mspsim's new window manager, not fully implemented yet

Browse source
This commit is contained in:
fros4943 2009-10-27 10:13:34 +00:00
parent 38dcc8ed93
commit 2d7e188c77
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspStackWatcher.java
View file

@ -26,31 +26,45 @@
* 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: MspStackWatcher.java,v 1.5 2008/12/04 14:03:41 joxe Exp $ * $Id: MspStackWatcher.java,v 1.6 2009/10/27 10:13:34 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.plugins; package se.sics.cooja.mspmote.plugins;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.awt.event.*; import java.awt.event.ActionEvent;
import java.util.*; import java.awt.event.ActionListener;
import javax.swing.*; import java.util.Observable;
import java.util.Observer;
import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import se.sics.cooja.*; import se.sics.cooja.ClassDescription;
import se.sics.cooja.GUI;
import se.sics.cooja.Mote;
import se.sics.cooja.PluginType;
import se.sics.cooja.Simulation;
import se.sics.cooja.VisPlugin;
import se.sics.cooja.mspmote.MspMote; import se.sics.cooja.mspmote.MspMote;
import se.sics.mspsim.core.MSP430; import se.sics.mspsim.core.MSP430;
import se.sics.mspsim.ui.StackUI; import se.sics.mspsim.ui.StackUI;
import se.sics.mspsim.ui.WindowManager;
import se.sics.mspsim.util.Utils; import se.sics.mspsim.util.Utils;
@ClassDescription("Msp Stack Watcher") @ClassDescription("Msp Stack Watcher")
@PluginType(PluginType.MOTE_PLUGIN) @PluginType(PluginType.MOTE_PLUGIN)
public class MspStackWatcher extends VisPlugin { public class MspStackWatcher extends VisPlugin {
private static Logger logger = Logger.getLogger(MspStackWatcher.class); private static Logger logger = Logger.getLogger(MspStackWatcher.class);
private MspMote mspMote; private MspMote mspMote;
private MSP430 cpu; private MSP430 cpu;
private StackUI stackUI;
private Simulation simulation; private Simulation simulation;
private Observer stackObserver = null; private Observer stackObserver = null;
private JButton startButton; private JButton startButton;
@ -103,8 +117,10 @@ public class MspStackWatcher extends VisPlugin {
}); });
// Create nfi's stack viewer // Create nfi's stack viewer
final StackUI stackUI = new StackUI(cpu, (int)MspMote.NR_CYCLES_PER_MSEC); stackUI = new StackUI(cpu);
stackUI.init("MSPSim stack", mspMote.registry);
stackUI.start();
// Register as log listener // Register as log listener
/*if (logObserver == null && mspMote.getInterfaces().getLog() != null) { /*if (logObserver == null && mspMote.getInterfaces().getLog() != null) {
mspMote.getInterfaces().getLog().addObserver(logObserver = new Observer() { mspMote.getInterfaces().getLog().addObserver(logObserver = new Observer() {
@ -133,7 +149,7 @@ public class MspStackWatcher extends VisPlugin {
public void closePlugin() { public void closePlugin() {
mspMote.getStackOverflowObservable().deleteObserver(stackObserver); mspMote.getStackOverflowObservable().deleteObserver(stackObserver);
stackUI.stop();
} }
} }