From c54735d7b2a1208a72eda64cf9d63b153546507a Mon Sep 17 00:00:00 2001 From: Lukas Wehrstein Date: Wed, 9 Mar 2022 19:10:21 +0100 Subject: [PATCH] updated sleep configuration --- .../components/MultiStateEnergyComponent.java | 15 ++++++++++++++- .../microcontroller/GenericMicrocontroller.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java b/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java index 94a66de5..66443d76 100644 --- a/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java +++ b/src/de/tud/kom/p2psim/impl/energy/components/MultiStateEnergyComponent.java @@ -128,7 +128,20 @@ public class MultiStateEnergyComponent implements EnergyComponent{ */ public EnergyState getSleepState() { for(EnergyState es : states) { - if(es.getName().contains("sleep")) { + if(es.getName().toUpperCase().contains("SLEEP")) { + return es; + } + } + return null; + } + + /** + * Returns the first state with the string active in its name + * @return the active state + */ + public EnergyState getActiveState() { + for(EnergyState es : states) { + if(es.getName().toUpperCase().contains("ACTIVE")) { return es; } } diff --git a/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java b/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java index 2c128d6b..97e77768 100644 --- a/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java +++ b/src/de/tud/kom/p2psim/impl/wsn/microcontroller/GenericMicrocontroller.java @@ -79,7 +79,7 @@ public class GenericMicrocontroller implements EnergyAwareHostComponent { this.active = true; EnergyState stateActive = new DefaultEnergyState("active", energyConsumptionActive); - EnergyState stateSleep = new DefaultEnergyState("active", energyConsumptionSleep); + EnergyState stateSleep = new DefaultEnergyState("sleep", energyConsumptionSleep); List states = new LinkedList<>(); states.add(stateActive); -- GitLab