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

removing obsolete method previously used for estimating contiki's energy consumption.

Browse source
This commit is contained in:
fros4943 2010-02-05 09:07:58 +00:00
parent cdb1b93dc6
commit 4d7fe46561
7 changed files with 497 additions and 522 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cooja/java/se/sics/cooja/dialogs/SerialUI.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: SerialUI.java,v 1.2 2009/06/02 09:34:12 fros4943 Exp $ * $Id: SerialUI.java,v 1.3 2010/02/05 09:07:58 fros4943 Exp $
*/ */
package se.sics.cooja.dialogs; package se.sics.cooja.dialogs;
@ -263,10 +263,6 @@ public abstract class SerialUI extends Log implements SerialPort {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumption() {
return 0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }

4
tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154.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: Radio802154.java,v 1.1 2009/11/10 12:54:39 joxe Exp $ * $Id: Radio802154.java,v 1.2 2010/02/05 09:07:58 fros4943 Exp $
*/ */
package se.sics.cooja.emulatedmote; package se.sics.cooja.emulatedmote;
@ -193,8 +193,6 @@ public abstract class Radio802154 extends Radio implements CustomDataRadio {
public abstract void setCurrentSignalStrength(double signalStrength); public abstract void setCurrentSignalStrength(double signalStrength);
public abstract double energyConsumption();
/* need to add a few more methods later??? */ /* need to add a few more methods later??? */
public void signalReceptionStart() { public void signalReceptionStart() {
isReceiving = true; isReceiving = true;

4
tools/cooja/java/se/sics/cooja/interfaces/ApplicationLED.java
View file

@ -137,10 +137,6 @@ public class ApplicationLED extends LED {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumption() {
return 0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }

6
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.11 2010/01/24 23:16:17 joxe Exp $ * $Id: ApplicationRadio.java,v 1.12 2010/02/05 09:07:58 fros4943 Exp $
*/ */
package se.sics.cooja.interfaces; package se.sics.cooja.interfaces;
@ -335,10 +335,6 @@ private int interfered;
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumption() {
return 0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }

6
tools/cooja/java/se/sics/cooja/interfaces/Mote2MoteRelations.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: Mote2MoteRelations.java,v 1.3 2010/01/12 09:36:10 fros4943 Exp $ * $Id: Mote2MoteRelations.java,v 1.4 2010/02/05 09:07:58 fros4943 Exp $
*/ */
package se.sics.cooja.interfaces; package se.sics.cooja.interfaces;
@ -225,10 +225,6 @@ public class Mote2MoteRelations extends MoteInterface {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumption() {
return 0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }

6
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.5 2009/03/09 14:08:54 fros4943 Exp $ * $Id: Position.java,v 1.6 2010/02/05 09:07:58 fros4943 Exp $
*/ */
package se.sics.cooja.interfaces; package se.sics.cooja.interfaces;
@ -168,10 +168,6 @@ public class Position extends MoteInterface {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumption() {
return 0.0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
Vector<Element> config = new Vector<Element>(); Vector<Element> config = new Vector<Element>();
Element element; Element element;

5
tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: AbstractApplicationMoteType.java,v 1.8 2010/02/03 15:11:48 fros4943 Exp $ * $Id: AbstractApplicationMoteType.java,v 1.9 2010/02/05 09:08:07 fros4943 Exp $
*/ */
package se.sics.cooja.motes; package se.sics.cooja.motes;
@ -245,9 +245,6 @@ public abstract class AbstractApplicationMoteType implements MoteType {
public void setMoteID(int newID) { public void setMoteID(int newID) {
this.id = newID; this.id = newID;
} }
public double energyConsumption() {
return 0;
}
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
return null; return null;
} }