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:24:57 +00:00
parent 2d40c75efe
commit ef4881e8df
4 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.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: MicaClock.java,v 1.6 2009/10/30 09:42:50 fros4943 Exp $ * $Id: MicaClock.java,v 1.7 2010/02/05 08:24:57 fros4943 Exp $
*/ */
package se.sics.cooja.avrmote.interfaces; package se.sics.cooja.avrmote.interfaces;
@ -84,10 +84,6 @@ public class MicaClock 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/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.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: MicaZID.java,v 1.3 2009/11/17 14:30:26 joxe Exp $ * $Id: MicaZID.java,v 1.4 2010/02/05 08:24:57 fros4943 Exp $
*/ */
package se.sics.cooja.avrmote.interfaces; package se.sics.cooja.avrmote.interfaces;
@ -152,10 +152,6 @@ public class MicaZID extends MoteID {
public void releaseInterfaceVisualizer(JPanel panel) { public void releaseInterfaceVisualizer(JPanel panel) {
} }
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/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.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: MicaZLED.java,v 1.4 2009/09/17 10:45:13 fros4943 Exp $ * $Id: MicaZLED.java,v 1.5 2010/02/05 08:24:57 fros4943 Exp $
*/ */
package se.sics.cooja.avrmote.interfaces; package se.sics.cooja.avrmote.interfaces;
@ -119,10 +119,6 @@ public class MicaZLED 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/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.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: MicaZRadio.java,v 1.6 2009/11/10 12:56:20 joxe Exp $ * $Id: MicaZRadio.java,v 1.7 2010/02/05 08:24:57 fros4943 Exp $
*/ */
package se.sics.cooja.avrmote.interfaces; package se.sics.cooja.avrmote.interfaces;
@ -144,10 +144,6 @@ public class MicaZRadio extends Radio802154 {
//cc2420.setRSSI((int) signalStrength); //cc2420.setRSSI((int) signalStrength);
} }
public double energyConsumption() {
return 1.0;
}
protected void handleEndOfReception() { protected void handleEndOfReception() {
/* tell the receiver that the packet is ended */ /* tell the receiver that the packet is ended */
recv.nextByte(false, (byte)0); recv.nextByte(false, (byte)0);