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

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Browse source
This commit is contained in:
Fredrik Osterlind 2012-06-04 17:38:19 +02:00
parent 9f42e1e261 c330d8ca84
commit 322669df63
9 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java
View file

@ -71,7 +71,7 @@ import se.sics.cooja.interfaces.Position;
* *
* @author Joakim Eriksson, Fredrik Osterlind * @author Joakim Eriksson, Fredrik Osterlind
*/ */
@ClassDescription("MicaZ Mote Type") @ClassDescription("MicaZ mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class MicaZMoteType implements MoteType { public class MicaZMoteType implements MoteType {
private static Logger logger = Logger.getLogger(MicaZMoteType.class); private static Logger logger = Logger.getLogger(MicaZMoteType.class);

2
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
View file

@ -53,7 +53,7 @@ import se.sics.cooja.mspmote.interfaces.MspMoteID;
import se.sics.cooja.mspmote.interfaces.MspSerial; import se.sics.cooja.mspmote.interfaces.MspSerial;
import se.sics.cooja.mspmote.interfaces.TR1001Radio; import se.sics.cooja.mspmote.interfaces.TR1001Radio;
@ClassDescription("ESB Mote Type") @ClassDescription("ESB mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class ESBMoteType extends MspMoteType { public class ESBMoteType extends MspMoteType {
private static Logger logger = Logger.getLogger(ESBMoteType.class); private static Logger logger = Logger.getLogger(ESBMoteType.class);

2
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java
View file

@ -62,7 +62,7 @@ import se.sics.cooja.mspmote.interfaces.MspMoteID;
import se.sics.cooja.mspmote.interfaces.Msp802154Radio; import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
import se.sics.cooja.mspmote.interfaces.UsciA1Serial; import se.sics.cooja.mspmote.interfaces.UsciA1Serial;
@ClassDescription("TI MSP-EXP430F5438") @ClassDescription("EXP430F5438 mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class Exp5438MoteType extends MspMoteType { public class Exp5438MoteType extends MspMoteType {
private static Logger logger = Logger.getLogger(Exp5438MoteType.class); private static Logger logger = Logger.getLogger(Exp5438MoteType.class);

2
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
View file

@ -69,7 +69,7 @@ import se.sics.cooja.mspmote.interfaces.SkyLED;
import se.sics.cooja.mspmote.interfaces.MspSerial; import se.sics.cooja.mspmote.interfaces.MspSerial;
import se.sics.cooja.mspmote.interfaces.SkyTemperature; import se.sics.cooja.mspmote.interfaces.SkyTemperature;
@ClassDescription("Sky Mote Type") @ClassDescription("Sky mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class SkyMoteType extends MspMoteType { public class SkyMoteType extends MspMoteType {
private static Logger logger = Logger.getLogger(SkyMoteType.class); private static Logger logger = Logger.getLogger(SkyMoteType.class);

2
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java
View file

@ -62,7 +62,7 @@ import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
import se.sics.cooja.mspmote.interfaces.TyndallLED; import se.sics.cooja.mspmote.interfaces.TyndallLED;
import se.sics.cooja.mspmote.interfaces.UsciA0Serial; import se.sics.cooja.mspmote.interfaces.UsciA0Serial;
@ClassDescription("Tyndall") @ClassDescription("Tyndall mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class TyndallMoteType extends MspMoteType { public class TyndallMoteType extends MspMoteType {
private static Logger logger = Logger.getLogger(TyndallMoteType.class); private static Logger logger = Logger.getLogger(TyndallMoteType.class);

2
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java
View file

@ -45,7 +45,7 @@ import se.sics.cooja.mspmote.interfaces.MspDefaultSerial;
import se.sics.cooja.mspmote.interfaces.MspLED; import se.sics.cooja.mspmote.interfaces.MspLED;
import se.sics.cooja.mspmote.interfaces.MspMoteID; import se.sics.cooja.mspmote.interfaces.MspMoteID;
@ClassDescription("Wismote Mote Type") @ClassDescription("Wismote mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class WismoteMoteType extends AbstractMspMoteType { public class WismoteMoteType extends AbstractMspMoteType {

2
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java
View file

@ -45,7 +45,7 @@ import se.sics.cooja.mspmote.interfaces.MspDefaultSerial;
import se.sics.cooja.mspmote.interfaces.MspLED; import se.sics.cooja.mspmote.interfaces.MspLED;
import se.sics.cooja.mspmote.interfaces.MspMoteID; import se.sics.cooja.mspmote.interfaces.MspMoteID;
@ClassDescription("Z1 Mote Type") @ClassDescription("Z1 mote...")
@AbstractionLevelDescription("Emulated level") @AbstractionLevelDescription("Emulated level")
public class Z1MoteType extends AbstractMspMoteType { public class Z1MoteType extends AbstractMspMoteType {

2
tools/cooja/apps/powertracker/java/PowerTracker.java
View file

@ -69,7 +69,7 @@ import se.sics.cooja.interfaces.Radio;
* *
* @author Fredrik Osterlind, Adam Dunkels * @author Fredrik Osterlind, Adam Dunkels
*/ */
@ClassDescription("PowerTracker") @ClassDescription("Mote radio duty cycle...")
@PluginType(PluginType.SIM_PLUGIN) @PluginType(PluginType.SIM_PLUGIN)
public class PowerTracker extends VisPlugin { public class PowerTracker extends VisPlugin {
private static Logger logger = Logger.getLogger(PowerTracker.class); private static Logger logger = Logger.getLogger(PowerTracker.class);

5
tools/cooja/java/se/sics/cooja/plugins/Visualizer.java
View file

@ -68,7 +68,6 @@ import java.util.Observable;
import java.util.Observer; import java.util.Observer;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem; import javax.swing.JCheckBoxMenuItem;
import javax.swing.JMenu; import javax.swing.JMenu;
@ -88,16 +87,16 @@ import org.jdom.Element;
import se.sics.cooja.ClassDescription; import se.sics.cooja.ClassDescription;
import se.sics.cooja.GUI; import se.sics.cooja.GUI;
import se.sics.cooja.GUI.MoteRelation;
import se.sics.cooja.HasQuickHelp; import se.sics.cooja.HasQuickHelp;
import se.sics.cooja.Mote; import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface; import se.sics.cooja.MoteInterface;
import se.sics.cooja.PluginType; import se.sics.cooja.PluginType;
import se.sics.cooja.RadioMedium; import se.sics.cooja.RadioMedium;
import se.sics.cooja.SimEventCentral.MoteCountListener;
import se.sics.cooja.Simulation; import se.sics.cooja.Simulation;
import se.sics.cooja.SupportedArguments; import se.sics.cooja.SupportedArguments;
import se.sics.cooja.VisPlugin; import se.sics.cooja.VisPlugin;
import se.sics.cooja.GUI.MoteRelation;
import se.sics.cooja.SimEventCentral.MoteCountListener;
import se.sics.cooja.interfaces.LED; import se.sics.cooja.interfaces.LED;
import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.Position;
import se.sics.cooja.interfaces.SerialPort; import se.sics.cooja.interfaces.SerialPort;