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

added sky led interface (+ updated esb+contiki mote led interfaces)

Browse source
This commit is contained in:
fros4943 2008-02-11 15:53:28 +00:00
parent 71b2afe79f
commit 04c10bcee7
3 changed files with 250 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.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: ESBLED.java,v 1.1 2008/02/07 14:54:16 fros4943 Exp $ * $Id: ESBLED.java,v 1.2 2008/02/11 15:53:28 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -103,28 +103,42 @@ public class ESBLED extends LED implements PortListener {
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
super.paintComponent(g); super.paintComponent(g);
int x = 20;
int y = 25;
int d = 25;
if (isGreenOn()) { if (isGreenOn()) {
g.setColor(GREEN); g.setColor(GREEN);
g.fillOval(20, 20, 20, 20); g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else { } else {
g.setColor(DARK_GREEN); g.setColor(DARK_GREEN);
g.fillOval(20, 20, 20, 20); g.fillOval(x + 5, y + 5, d-10, d-10);
} }
if (isYellowOn()) { x += 40;
g.setColor(YELLOW);
g.fillOval(60, 20, 20, 20);
} else {
g.setColor(DARK_YELLOW);
g.fillOval(60, 20, 20, 20);
}
if (isRedOn()) { if (isRedOn()) {
g.setColor(RED); g.setColor(RED);
g.fillOval(100, 20, 20, 20); g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else { } else {
g.setColor(DARK_RED); g.setColor(DARK_RED);
g.fillOval(100, 20, 20, 20); g.fillOval(x + 5, y + 5, d-10, d-10);
}
x += 40;
if (isYellowOn()) {
g.setColor(YELLOW);
g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else {
g.setColor(DARK_YELLOW);
g.fillOval(x + 5, y + 5, d-10, d-10);
} }
} }
}; };

189
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java Normal file
View file

@ -0,0 +1,189 @@
/*
* Copyright (c) 2007, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: SkyLED.java,v 1.1 2008/02/11 15:53:28 fros4943 Exp $
*/
package se.sics.cooja.mspmote.interfaces;
import java.awt.*;
import java.util.*;
import javax.swing.*;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.interfaces.LED;
import se.sics.cooja.mspmote.SkyMote;
import se.sics.mspsim.core.IOPort;
import se.sics.mspsim.core.IOUnit;
import se.sics.mspsim.core.PortListener;
import se.sics.mspsim.platform.sky.SkyNode;
/**
* @author Fredrik Osterlind
*/
@ClassDescription("Sky LED")
public class SkyLED extends LED {
private static Logger logger = Logger.getLogger(SkyLED.class);
private SkyMote mspMote;
private boolean blueOn = false;
private boolean greenOn = false;
private boolean redOn = false;
private static final Color DARK_BLUE = new Color(0, 0, 100);
private static final Color DARK_GREEN = new Color(0, 100, 0);
private static final Color DARK_RED = new Color(100, 0, 0);
private static final Color BLUE = new Color(0, 0, 255);
private static final Color GREEN = new Color(0, 255, 0);
private static final Color RED = new Color(255, 0, 0);
public SkyLED(Mote mote) {
mspMote = (SkyMote) mote;
IOUnit unit = mspMote.getCPU().getIOUnit("Port 5");
if (unit instanceof IOPort) {
((IOPort) unit).setPortListener(new PortListener() {
public void portWrite(IOPort source, int data) {
blueOn = (data & SkyNode.BLUE_LED) == 0;
greenOn = (data & SkyNode.GREEN_LED) == 0;
redOn = (data & SkyNode.RED_LED) == 0;
setChanged();
notifyObservers();
}
});
}
}
public boolean isAnyOn() {
return blueOn || greenOn || redOn;
}
public boolean isGreenOn() {
return greenOn;
}
public boolean isYellowOn() {
return blueOn; /* Returning blue */
}
public boolean isRedOn() {
return redOn;
}
public void doActionsBeforeTick() {
}
public void doActionsAfterTick() {
}
public double energyConsumptionPerTick() {
return 0.0;
}
public JPanel getInterfaceVisualizer() {
final JPanel panel = new JPanel() {
public void paintComponent(Graphics g) {
super.paintComponent(g);
int x = 20;
int y = 25;
int d = 25;
if (isGreenOn()) {
g.setColor(GREEN);
g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else {
g.setColor(DARK_GREEN);
g.fillOval(x + 5, y + 5, d-10, d-10);
}
x += 40;
if (isRedOn()) {
g.setColor(RED);
g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else {
g.setColor(DARK_RED);
g.fillOval(x + 5, y + 5, d-10, d-10);
}
x += 40;
if (isYellowOn()) {
g.setColor(BLUE);
g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else {
g.setColor(DARK_BLUE);
g.fillOval(x + 5, y + 5, d-10, d-10);
}
}
};
Observer observer;
this.addObserver(observer = new Observer() {
public void update(Observable obs, Object obj) {
panel.repaint();
}
});
// Saving observer reference for releaseInterfaceVisualizer
panel.putClientProperty("intf_obs", observer);
panel.setMinimumSize(new Dimension(140, 60));
panel.setPreferredSize(new Dimension(140, 60));
return panel;
}
public void releaseInterfaceVisualizer(JPanel panel) {
Observer observer = (Observer) panel.getClientProperty("intf_obs");
if (observer == null) {
logger.fatal("Error when releasing panel, observer is null");
return;
}
this.deleteObserver(observer);
}
public Collection<Element> getConfigXML() {
return null;
}
public void setConfigXML(Collection<Element> configXML, boolean visAvailable) {
}
}

53
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.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: ContikiLED.java,v 1.3 2007/01/29 14:29:39 fros4943 Exp $ * $Id: ContikiLED.java,v 1.4 2008/02/11 15:53:28 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote.interfaces; package se.sics.cooja.contikimote.interfaces;
@ -43,7 +43,7 @@ import se.sics.cooja.interfaces.LED;
/** /**
* This class represents three mote LEDs. * This class represents three mote LEDs.
* *
* It needs read access to the following core variables: * It needs read access to the following core variables:
* <ul> * <ul>
* <li>char simLedsValue * <li>char simLedsValue
@ -56,7 +56,7 @@ import se.sics.cooja.interfaces.LED;
* <p> * <p>
* This observable is changed and notifies observers whenever any led has * This observable is changed and notifies observers whenever any led has
* changed. * changed.
* *
* @author Fredrik Osterlind * @author Fredrik Osterlind
*/ */
public class ContikiLED extends LED implements ContikiMoteInterface { public class ContikiLED extends LED implements ContikiMoteInterface {
@ -108,7 +108,7 @@ public class ContikiLED extends LED implements ContikiMoteInterface {
/** /**
* Creates an interface to the led at mote. * Creates an interface to the led at mote.
* *
* @param mote * @param mote
* Led's mote. * Led's mote.
* @see Mote * @see Mote
@ -178,12 +178,15 @@ public class ContikiLED extends LED implements ContikiMoteInterface {
} }
myEnergyConsumption = 0.0; myEnergyConsumption = 0.0;
if ((newLedsValue & LEDS_GREEN) > 0) if ((newLedsValue & LEDS_GREEN) > 0) {
myEnergyConsumption += energyOfGreenLedPerTick; myEnergyConsumption += energyOfGreenLedPerTick;
if ((newLedsValue & LEDS_YELLOW) > 0) }
if ((newLedsValue & LEDS_YELLOW) > 0) {
myEnergyConsumption += energyOfYellowLedPerTick; myEnergyConsumption += energyOfYellowLedPerTick;
if ((newLedsValue & LEDS_RED) > 0) }
if ((newLedsValue & LEDS_RED) > 0) {
myEnergyConsumption += energyOfRedLedPerTick; myEnergyConsumption += energyOfRedLedPerTick;
}
oldLedValue = newLedsValue; oldLedValue = newLedsValue;
return ledChanged; return ledChanged;
@ -194,28 +197,42 @@ public class ContikiLED extends LED implements ContikiMoteInterface {
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
super.paintComponent(g); super.paintComponent(g);
int x = 20;
int y = 25;
int d = 25;
if (isGreenOn()) { if (isGreenOn()) {
g.setColor(GREEN); g.setColor(GREEN);
g.fillOval(20, 20, 20, 20); g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else { } else {
g.setColor(DARK_GREEN); g.setColor(DARK_GREEN);
g.fillOval(20, 20, 20, 20); g.fillOval(x + 5, y + 5, d-10, d-10);
} }
if (isYellowOn()) { x += 40;
g.setColor(YELLOW);
g.fillOval(60, 20, 20, 20);
} else {
g.setColor(DARK_YELLOW);
g.fillOval(60, 20, 20, 20);
}
if (isRedOn()) { if (isRedOn()) {
g.setColor(RED); g.setColor(RED);
g.fillOval(100, 20, 20, 20); g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else { } else {
g.setColor(DARK_RED); g.setColor(DARK_RED);
g.fillOval(100, 20, 20, 20); g.fillOval(x + 5, y + 5, d-10, d-10);
}
x += 40;
if (isYellowOn()) {
g.setColor(YELLOW);
g.fillOval(x, y, d, d);
g.setColor(Color.BLACK);
g.drawOval(x, y, d, d);
} else {
g.setColor(DARK_YELLOW);
g.fillOval(x + 5, y + 5, d-10, d-10);
} }
} }
}; };