From 41a74cd9a95334ee323cd7722e0428c8e261c596 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Tue, 28 Oct 2008 12:55:20 +0000 Subject: [PATCH] new energy method, not fully implemented yet --- .../se/sics/cooja/contikimote/interfaces/ContikiBeeper.java | 4 ++-- .../se/sics/cooja/contikimote/interfaces/ContikiButton.java | 4 ++-- .../java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java | 4 ++-- .../se/sics/cooja/contikimote/interfaces/ContikiClock.java | 4 ++-- .../sics/cooja/contikimote/interfaces/ContikiIPAddress.java | 4 ++-- .../java/se/sics/cooja/contikimote/interfaces/ContikiLED.java | 4 ++-- .../java/se/sics/cooja/contikimote/interfaces/ContikiLog.java | 4 ++-- .../se/sics/cooja/contikimote/interfaces/ContikiMoteID.java | 4 ++-- .../java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java | 4 ++-- .../se/sics/cooja/contikimote/interfaces/ContikiRS232.java | 4 ++-- .../se/sics/cooja/contikimote/interfaces/ContikiRadio.java | 4 ++-- .../java/se/sics/cooja/contikimote/interfaces/ContikiVib.java | 4 ++-- .../cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java | 4 ++-- tools/cooja/java/se/sics/cooja/interfaces/Position.java | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java index ecc582ff7..ef8bef35b 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiBeeper.java,v 1.5 2008/10/28 09:33:00 fros4943 Exp $ + * $Id: ContikiBeeper.java,v 1.6 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -162,7 +162,7 @@ public class ContikiBeeper extends Beeper implements ContikiMoteInterface, Polle this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java index 3616c76f6..39d13853d 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiButton.java,v 1.7 2008/10/28 09:42:26 fros4943 Exp $ + * $Id: ContikiButton.java,v 1.8 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -161,7 +161,7 @@ public class ContikiButton extends Button implements ContikiMoteInterface { public void releaseInterfaceVisualizer(JPanel panel) { } - public double energyConsumptionPerTick() { + public double energyConsumption() { return 0.0; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java index 64db8ff50..304163f7e 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiCFS.java,v 1.5 2008/10/28 09:53:23 fros4943 Exp $ + * $Id: ContikiCFS.java,v 1.6 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -229,7 +229,7 @@ public class ContikiCFS extends MoteInterface implements ContikiMoteInterface, P this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } 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 23cb803c2..5c76cf995 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.4 2008/10/28 09:57:48 fros4943 Exp $ + * $Id: ContikiClock.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -108,7 +108,7 @@ public class ContikiClock extends Clock implements ContikiMoteInterface, PolledB public void releaseInterfaceVisualizer(JPanel panel) { } - public double energyConsumptionPerTick() { + public double energyConsumption() { return 0.0; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java index f09486931..3a674071b 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiIPAddress.java,v 1.3 2008/10/28 10:12:43 fros4943 Exp $ + * $Id: ContikiIPAddress.java,v 1.4 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -149,7 +149,7 @@ public class ContikiIPAddress extends IPAddress implements ContikiMoteInterface this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { // Virtual interface, does not require any energy return 0.0; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java index 469a2f4da..7a9dee78c 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiLED.java,v 1.5 2008/10/28 10:21:37 fros4943 Exp $ + * $Id: ContikiLED.java,v 1.6 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -255,7 +255,7 @@ public class ContikiLED extends LED implements ContikiMoteInterface, PolledAfter this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java index 43ec1294a..296adf02a 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiLog.java,v 1.6 2008/10/28 10:28:38 fros4943 Exp $ + * $Id: ContikiLog.java,v 1.7 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -155,7 +155,7 @@ public class ContikiLog extends Log implements ContikiMoteInterface, PolledAfter this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { // Does not require energy return 0.0; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java index e890ab97a..3c292ae13 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiMoteID.java,v 1.4 2008/10/28 11:11:52 fros4943 Exp $ + * $Id: ContikiMoteID.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -126,7 +126,7 @@ public class ContikiMoteID extends MoteID implements ContikiMoteInterface { this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return 0.0; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java index 218faa70b..9a88d3f59 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiPIR.java,v 1.4 2008/10/28 11:16:37 fros4943 Exp $ + * $Id: ContikiPIR.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -132,7 +132,7 @@ public class ContikiPIR extends PIR implements ContikiMoteInterface { public void releaseInterfaceVisualizer(JPanel panel) { } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java index 2e2747d5d..d59920331 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiRS232.java,v 1.4 2008/10/28 11:59:23 fros4943 Exp $ + * $Id: ContikiRS232.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -245,7 +245,7 @@ public class ContikiRS232 extends MoteInterface implements ContikiMoteInterface, this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java index 0d99a13ed..923a5e4f5 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiRadio.java,v 1.21 2008/10/28 11:49:00 fros4943 Exp $ + * $Id: ContikiRadio.java,v 1.22 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -483,7 +483,7 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface, PolledA this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java index 0d6e9b070..e20f1f755 100644 --- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java +++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ContikiVib.java,v 1.4 2008/10/28 12:02:35 fros4943 Exp $ + * $Id: ContikiVib.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $ */ package se.sics.cooja.contikimote.interfaces; @@ -132,7 +132,7 @@ public class ContikiVib extends MoteInterface implements ContikiMoteInterface { public void releaseInterfaceVisualizer(JPanel panel) { } - public double energyConsumptionPerTick() { + public double energyConsumption() { return myEnergyConsumption; } diff --git a/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java b/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java index a16210f76..fc91ee3ea 100644 --- a/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java +++ b/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ApplicationRadio.java,v 1.5 2008/10/28 12:30:48 fros4943 Exp $ + * $Id: ApplicationRadio.java,v 1.6 2008/10/28 12:59:30 fros4943 Exp $ */ package se.sics.cooja.interfaces; @@ -306,7 +306,7 @@ public class ApplicationRadio extends Radio implements PolledBeforeActiveTicks { this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return 0; } diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Position.java b/tools/cooja/java/se/sics/cooja/interfaces/Position.java index 18f64ac99..9361b386d 100644 --- a/tools/cooja/java/se/sics/cooja/interfaces/Position.java +++ b/tools/cooja/java/se/sics/cooja/interfaces/Position.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Position.java,v 1.3 2008/10/28 12:30:48 fros4943 Exp $ + * $Id: Position.java,v 1.4 2008/10/28 12:59:30 fros4943 Exp $ */ package se.sics.cooja.interfaces; @@ -168,7 +168,7 @@ public class Position extends MoteInterface { this.deleteObserver(observer); } - public double energyConsumptionPerTick() { + public double energyConsumption() { return 0.0; }