Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug in the delayed start of MSPSim motes

Browse Source
This commit is contained in:
nifi 2008-09-17 17:39:37 +00:00
parent fc85534698
commit ee56d724bf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: MspMote.java,v 1.9 2008/09/17 12:09:20 fros4943 Exp $ * $Id: MspMote.java,v 1.10 2008/09/17 17:39:37 nifi Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -53,6 +53,7 @@ public abstract class MspMote implements Mote {
/* Cycle counter */ /* Cycle counter */
public long cycleCounter = 0; public long cycleCounter = 0;
public int cycleDrift = 0;
private Simulation mySimulation = null; private Simulation mySimulation = null;
private MSP430 myCpu = null; private MSP430 myCpu = null;
@ -276,7 +277,7 @@ public abstract class MspMote implements Mote {
} }
long maxSimTimeCycles = NR_CYCLES_PER_MSEC*(simTime+1); long maxSimTimeCycles = NR_CYCLES_PER_MSEC*(simTime+1);
if (maxSimTimeCycles <= cycleCounter) { if (maxSimTimeCycles <= cycleCounter - cycleDrift) {
return false; return false;
} }

7
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.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: MspClock.java,v 1.1 2008/02/07 14:54:16 fros4943 Exp $ * $Id: MspClock.java,v 1.2 2008/09/17 17:39:37 nifi Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -61,11 +61,12 @@ public class MspClock extends Clock {
} }
public int getTime() { public int getTime() {
return (int) (cpu.cycles / MspMote.NR_CYCLES_PER_MSEC); int time = (int) ((cpu.cycles + myMote.cycleDrift) / MspMote.NR_CYCLES_PER_MSEC);
return time > 0 ? time : 0;
} }
public void setDrift(int drift) { public void setDrift(int drift) {
myMote.cycleCounter = -MspMote.NR_CYCLES_PER_MSEC * drift; myMote.cycleDrift = MspMote.NR_CYCLES_PER_MSEC * drift;
} }
public void doActionsBeforeTick() { public void doActionsBeforeTick() {