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

new energy method, not fully implemented yet

Browse source
This commit is contained in:
fros4943 2008-10-28 12:55:20 +00:00
parent bbeed74eda
commit 41a74cd9a9
14 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -162,7 +162,7 @@ public class ContikiBeeper extends Beeper implements ContikiMoteInterface, Polle
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -161,7 +161,7 @@ public class ContikiButton extends Button implements ContikiMoteInterface {
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return 0.0; return 0.0;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -229,7 +229,7 @@ public class ContikiCFS extends MoteInterface implements ContikiMoteInterface, P
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -108,7 +108,7 @@ public class ContikiClock extends Clock implements ContikiMoteInterface, PolledB
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return 0.0; return 0.0;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -149,7 +149,7 @@ public class ContikiIPAddress extends IPAddress implements ContikiMoteInterface
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
// Virtual interface, does not require any energy // Virtual interface, does not require any energy
return 0.0; return 0.0;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -255,7 +255,7 @@ public class ContikiLED extends LED implements ContikiMoteInterface, PolledAfter
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -155,7 +155,7 @@ public class ContikiLog extends Log implements ContikiMoteInterface, PolledAfter
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
// Does not require energy // Does not require energy
return 0.0; return 0.0;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -126,7 +126,7 @@ public class ContikiMoteID extends MoteID implements ContikiMoteInterface {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return 0.0; return 0.0;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -132,7 +132,7 @@ public class ContikiPIR extends PIR implements ContikiMoteInterface {
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -245,7 +245,7 @@ public class ContikiRS232 extends MoteInterface implements ContikiMoteInterface,
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -483,7 +483,7 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface, PolledA
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.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: 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; package se.sics.cooja.contikimote.interfaces;
@ -132,7 +132,7 @@ public class ContikiVib extends MoteInterface implements ContikiMoteInterface {
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return myEnergyConsumption; return myEnergyConsumption;
} }

4
tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.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: 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; package se.sics.cooja.interfaces;
@ -306,7 +306,7 @@ public class ApplicationRadio extends Radio implements PolledBeforeActiveTicks {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return 0; return 0;
} }

4
tools/cooja/java/se/sics/cooja/interfaces/Position.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: 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; package se.sics.cooja.interfaces;
@ -168,7 +168,7 @@ public class Position extends MoteInterface {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumptionPerTick() { public double energyConsumption() {
return 0.0; return 0.0;
} }