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 08:44:34 +00:00
parent ef4881e8df
commit b749a560cc
10 changed files with 10 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBButton.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: ESBButton.java,v 1.3 2009/03/09 17:14:35 fros4943 Exp $ * $Id: ESBButton.java,v 1.4 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -77,10 +77,6 @@ public class ESBButton extends Button {
return false; return false;
} }
public double energyConsumption() {
return 0;
}
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
final JButton clickButton = new JButton("Click button"); final JButton clickButton = new JButton("Click button");

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.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: ESBLED.java,v 1.5 2009/03/09 17:14:35 fros4943 Exp $ * $Id: ESBLED.java,v 1.6 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -88,10 +88,6 @@ public class ESBLED extends LED implements PortListener {
return redOn; return redOn;
} }
public double energyConsumption() {
return 0;
}
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
final JPanel panel = new JPanel() { final JPanel panel = new JPanel() {
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {

6
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.10 2009/10/27 10:14:35 fros4943 Exp $ * $Id: MspClock.java,v 1.11 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -82,10 +82,6 @@ public class MspClock extends Clock {
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
public double energyConsumption() {
return 0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.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: MspMoteID.java,v 1.14 2009/11/25 09:17:16 fros4943 Exp $ * $Id: MspMoteID.java,v 1.15 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -253,10 +253,6 @@ public class MspMoteID extends MoteID {
this.deleteObserver(observer); this.deleteObserver(observer);
} }
public double energyConsumption() {
return 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;

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyButton.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: SkyButton.java,v 1.2 2008/10/28 17:03:37 fros4943 Exp $ * $Id: SkyButton.java,v 1.3 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -72,10 +72,6 @@ public class SkyButton extends Button {
return false; return false;
} }
public double energyConsumption() {
return 0;
}
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
final JButton clickButton = new JButton("Click button"); final JButton clickButton = new JButton("Click button");

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyCoffeeFilesystem.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: SkyCoffeeFilesystem.java,v 1.2 2009/10/08 14:41:20 fros4943 Exp $ * $Id: SkyCoffeeFilesystem.java,v 1.3 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -101,10 +101,6 @@ public class SkyCoffeeFilesystem extends MoteInterface {
adjuster.packColumns(); adjuster.packColumns();
} }
public double energyConsumption() {
return 0;
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyFlash.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: SkyFlash.java,v 1.6 2009/08/11 17:09:16 fros4943 Exp $ * $Id: SkyFlash.java,v 1.7 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -242,8 +242,4 @@ public class SkyFlash extends MoteInterface {
return fileData; return fileData;
} }
public double energyConsumption() {
return 0;
}
} }

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.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: SkyLED.java,v 1.2 2008/10/28 17:04:08 fros4943 Exp $ * $Id: SkyLED.java,v 1.3 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -97,10 +97,6 @@ public class SkyLED extends LED {
return redOn; return redOn;
} }
public double energyConsumption() {
return 0;
}
public JPanel getInterfaceVisualizer() { public JPanel getInterfaceVisualizer() {
final JPanel panel = new JPanel() { final JPanel panel = new JPanel() {
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.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: TR1001Radio.java,v 1.19 2010/02/03 19:30:32 fros4943 Exp $ * $Id: TR1001Radio.java,v 1.20 2010/02/05 08:44:57 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -435,10 +435,6 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
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/examples/project_new_interface/java/DummyInterface.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: DummyInterface.java,v 1.3 2009/05/26 14:34:43 fros4943 Exp $ * $Id: DummyInterface.java,v 1.4 2010/02/05 08:44:34 fros4943 Exp $
*/ */
import java.util.*; import java.util.*;
@ -94,10 +94,6 @@ public class DummyInterface extends MoteInterface implements ContikiMoteInterfac
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
public double energyConsumption() {
return 0; /* My total energy consumption is always zero */
}
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
return null; return null;
} }