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

removed obsolete tick method

Browse source
This commit is contained in:
fros4943 2010-02-03 16:04:44 +00:00
parent 182805a65d
commit 0286e4115f
6 changed files with 4 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: MicaZMote.java,v 1.13 2009/11/27 15:53:10 fros4943 Exp $
* $Id: MicaZMote.java,v 1.14 2010/02/03 16:04:44 fros4943 Exp $
*/
package se.sics.cooja.avrmote;
@ -192,10 +192,6 @@ public class MicaZMote extends AbstractEmulatedMote implements Mote {
myMoteInterfaceHandler = moteInterfaceHandler;
}
public boolean tick(long simTime) {
throw new RuntimeException("Obsolete method");
}
private long cyclesExecuted = 0;
private long cyclesUntil = 0;
public void execute(long t) {

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: MspMote.java,v 1.39 2010/02/03 11:06:23 fros4943 Exp $
* $Id: MspMote.java,v 1.40 2010/02/03 16:04:44 fros4943 Exp $
*/
package se.sics.cooja.mspmote;
@ -308,10 +308,6 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
*/
protected abstract boolean initEmulator(File ELFFile);
public boolean tick(long simTime) {
throw new RuntimeException("Obsolete method");
}
private long lastExecute = -1; /* Last time mote executed */
private long nextExecute;
public void execute(long t) {

5
tools/cooja/examples/appmote_rimeabc/RimeABC.java
View file

@ -129,10 +129,5 @@ public class RimeABC extends AbstractApplicationMote {
public String toString() {
return "App Rime ABC " + getID();
}
public boolean tick(long simTime) {
/* Obsolete method */
return false;
}
}

20
tools/cooja/java/se/sics/cooja/Mote.java
View file

@ -24,7 +24,7 @@
* (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: Mote.java,v 1.7 2009/09/17 11:05:09 fros4943 Exp $
* $Id: Mote.java,v 1.8 2010/02/03 16:05:49 fros4943 Exp $
*/
package se.sics.cooja;
@ -119,24 +119,6 @@ public interface Mote {
*/
public void setSimulation(Simulation simulation);
/**
* Ticks this mote and increases any internal time to given argument.
*
* Each mote implementation may handle calls to this method differently, but
* typically the simulated mote should at least handle one event.
*
* This method is responsible for updating the mote interfaces.
*
* A call to this method typically polls all interfaces, activates the memory,
* lets the underlying mote software handle one event, fetches the updated
* memory and finally polls all interfaces again.
*
* @param simTime
* New simulation time
* @return True is mote accepts another immediate tick
*/
public boolean tick(long simTime);
/**
* Returns XML elements representing the current config of this mote. This is
* fetched by the simulator for example when saving a simulation configuration

5
tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ContikiMote.java,v 1.16 2009/11/27 15:53:10 fros4943 Exp $
* $Id: ContikiMote.java,v 1.17 2010/02/03 16:06:21 fros4943 Exp $
*/
package se.sics.cooja.contikimote;
@ -229,7 +229,4 @@ public class ContikiMote extends AbstractWakeupMote implements Mote {
return "Contiki " + getID();
}
public boolean tick(long simTime) {
throw new RuntimeException("Obsolete method");
}
}

4
tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java
View file

@ -111,10 +111,6 @@ public class DisturberMoteType extends AbstractApplicationMoteType {
radio.startTransmittingPacket(radioPacket, DURATION);
}
public boolean tick(long simTime) {
throw new RuntimeException("Obsolete method");
}
public void receivedPacket(RadioPacket p) {
/* Ignore */
}