From 2a2be7770714fa60dd287454d800b521dd6d1258 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Wed, 29 Oct 2008 08:36:12 +0000 Subject: [PATCH] implemented getDrift method --- .../src/se/sics/cooja/mspmote/interfaces/MspClock.java | 8 ++++++-- .../sics/cooja/contikimote/interfaces/ContikiClock.java | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java index d481c9f4e..df99655f1 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspClock.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MspClock.java,v 1.3 2008/10/28 17:03:37 fros4943 Exp $ + * $Id: MspClock.java,v 1.4 2008/10/29 08:36:12 fros4943 Exp $ */ package se.sics.cooja.mspmote.interfaces; @@ -42,7 +42,7 @@ import se.sics.cooja.mspmote.MspMote; import se.sics.mspsim.core.MSP430; /** - * @author Fredrik Osterlind + * @author Fredrik Österlind */ @ClassDescription("Cycle clock") public class MspClock extends Clock { @@ -69,6 +69,10 @@ public class MspClock extends Clock { myMote.cycleDrift = MspMote.NR_CYCLES_PER_MSEC * drift; } + public int getDrift() { + return myMote.cycleDrift / MspMote.NR_CYCLES_PER_MSEC; + } + public JPanel getInterfaceVisualizer() { return null; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java index 5c76cf995..9639a9f0f 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiClock.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $ + * $Id: ContikiClock.java,v 1.6 2008/10/29 08:36:40 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -88,6 +88,10 @@ public class ContikiClock extends Clock implements ContikiMoteInterface, PolledB this.timeDrift = timeDrift; } + public int getDrift() { + return timeDrift; + } + public int getTime() { return moteMem.getIntValueOf("simCurrentTime"); }