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

updated interface visualizer and changed default output power to 0 dBm

Browse source
This commit is contained in:
fros4943 2008-03-18 16:20:16 +00:00
parent 618f2907ec
commit 5337ad2b60
1 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
View file

@ -26,13 +26,15 @@
* 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: ContikiRadio.java,v 1.19 2008/03/18 12:52:01 fros4943 Exp $ * $Id: ContikiRadio.java,v 1.20 2008/03/18 16:20:16 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote.interfaces; package se.sics.cooja.contikimote.interfaces;
import java.util.*; import java.util.*;
import javax.swing.*; import javax.swing.*;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.*; import java.awt.event.*;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jdom.Element; import org.jdom.Element;
@ -251,8 +253,8 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface {
public double getCurrentOutputPower() { public double getCurrentOutputPower() {
// TODO Implement method // TODO Implement method
logger.warn("Not implemeted, always returning 1.5 dBm"); logger.warn("Not implemeted, always returning 0 dBm");
return 1.5; return 0;
} }
public int getOutputPowerIndicatorMax() { public int getOutputPowerIndicatorMax() {
@ -402,23 +404,39 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface {
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
// Location // Location
JPanel panel = new JPanel(); JPanel wrapperPanel = new JPanel(new BorderLayout());
panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); JPanel panel = new JPanel(new GridLayout(5, 2));
final JLabel statusLabel = new JLabel(""); final JLabel statusLabel = new JLabel("");
final JLabel lastEventLabel = new JLabel(""); final JLabel lastEventLabel = new JLabel("");
final JLabel channelLabel = new JLabel("");
final JLabel powerLabel = new JLabel("");
final JLabel ssLabel = new JLabel(""); final JLabel ssLabel = new JLabel("");
final JButton updateButton = new JButton("Update SS"); final JButton updateButton = new JButton("Update");
panel.add(new JLabel("STATE:"));
panel.add(statusLabel); panel.add(statusLabel);
panel.add(new JLabel("LAST EVENT:"));
panel.add(lastEventLabel); panel.add(lastEventLabel);
panel.add(ssLabel);
panel.add(updateButton); panel.add(new JLabel("CHANNEL:"));
panel.add(channelLabel);
panel.add(new JLabel("OUTPUT POWER:"));
panel.add(powerLabel);
panel.add(new JLabel("SIGNAL STRENGTH:"));
JPanel smallPanel = new JPanel(new GridLayout(1, 2));
smallPanel.add(ssLabel);
smallPanel.add(updateButton);
panel.add(smallPanel);
updateButton.addActionListener(new ActionListener() { updateButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ssLabel.setText("Signal strength (not auto-updated): " channelLabel.setText("" + getChannel());
+ getCurrentSignalStrength() + " dBm"); powerLabel.setText(getCurrentOutputPower() + " dBm (indicator=" + getCurrentOutputPowerIndicator() + "/" + getOutputPowerIndicatorMax() + ")");
ssLabel.setText(getCurrentSignalStrength() + " dBm");
} }
}); });
@ -426,19 +444,20 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface {
this.addObserver(observer = new Observer() { this.addObserver(observer = new Observer() {
public void update(Observable obs, Object obj) { public void update(Observable obs, Object obj) {
if (isTransmitting()) { if (isTransmitting()) {
statusLabel.setText("Transmitting packet now!"); statusLabel.setText("transmitting");
} else if (isReceiving()) { } else if (isReceiving()) {
statusLabel.setText("Receiving packet now!"); statusLabel.setText("receiving");
} else if (radioOn) { } else if (radioOn) {
statusLabel.setText("Listening..."); statusLabel.setText("listening for traffic");
} else { } else {
statusLabel.setText("HW turned off"); statusLabel.setText("HW off");
} }
lastEventLabel.setText("Last event (time=" + lastEventTime + "): " lastEventLabel.setText(lastEvent + " @ time=" + lastEventTime);
+ lastEvent);
ssLabel.setText("Signal strength (not auto-updated): " channelLabel.setText("" + getChannel());
+ getCurrentSignalStrength() + " dBm"); powerLabel.setText(getCurrentOutputPower() + " dBm (indicator=" + getCurrentOutputPowerIndicator() + "/" + getOutputPowerIndicatorMax() + ")");
ssLabel.setText(getCurrentSignalStrength() + " dBm");
} }
}); });
@ -447,7 +466,8 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface {
// Saving observer reference for releaseInterfaceVisualizer // Saving observer reference for releaseInterfaceVisualizer
panel.putClientProperty("intf_obs", observer); panel.putClientProperty("intf_obs", observer);
return panel; wrapperPanel.add(BorderLayout.NORTH, panel);
return wrapperPanel;
} }
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {