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

bugfix: using MspMoteTimeEvent:s to ensure that MSPSim's internal clock is correct when button is clicked

Browse source
This commit is contained in:
fros4943 2010-03-29 10:18:14 +00:00
parent 4d0147dd18
commit d84f84de52
1 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
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.3 2010/02/05 08:44:57 fros4943 Exp $ * $Id: SkyButton.java,v 1.4 2010/03/29 10:18:14 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -34,41 +34,73 @@ package se.sics.cooja.mspmote.interfaces;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Collection; import java.util.Collection;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JPanel; import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element; import org.jdom.Element;
import se.sics.cooja.ClassDescription; import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote; import se.sics.cooja.Mote;
import se.sics.cooja.Simulation;
import se.sics.cooja.interfaces.Button; import se.sics.cooja.interfaces.Button;
import se.sics.cooja.mspmote.MspMoteTimeEvent;
import se.sics.cooja.mspmote.SkyMote; import se.sics.cooja.mspmote.SkyMote;
@ClassDescription("Button") @ClassDescription("Button")
public class SkyButton extends Button { public class SkyButton extends Button {
private static Logger logger = Logger.getLogger(SkyButton.class);
private SkyMote skyMote; private SkyMote skyMote;
private Simulation sim;
private MspMoteTimeEvent pressButtonEvent;
private MspMoteTimeEvent releaseButtonEvent;
public SkyButton(Mote mote) { public SkyButton(Mote mote) {
skyMote = (SkyMote) mote; skyMote = (SkyMote) mote;
sim = mote.getSimulation();
pressButtonEvent = new MspMoteTimeEvent((SkyMote)mote, 0) {
public void execute(long t) {
skyMote.skyNode.setButton(true);
}
};
releaseButtonEvent = new MspMoteTimeEvent((SkyMote)mote, 0) {
public void execute(long t) {
skyMote.skyNode.setButton(false);
}
};
} }
public void clickButton() { public void clickButton() {
pressButton(); sim.invokeSimulationThread(new Runnable() {
releaseButton(); public void run() {
} sim.scheduleEvent(pressButtonEvent, sim.getSimulationTime());
sim.scheduleEvent(releaseButtonEvent, sim.getSimulationTime() + Simulation.MILLISECOND);
public void releaseButton() { }
skyMote.skyNode.setButton(false); });
setChanged();
notifyObservers();
} }
public void pressButton() { public void pressButton() {
skyMote.skyNode.setButton(true); sim.invokeSimulationThread(new Runnable() {
setChanged(); public void run() {
notifyObservers(); sim.scheduleEvent(pressButtonEvent, sim.getSimulationTime());
}
});
}
public void releaseButton() {
sim.invokeSimulationThread(new Runnable() {
public void run() {
sim.scheduleEvent(releaseButtonEvent, sim.getSimulationTime());
}
});
} }
public boolean isPressed() { public boolean isPressed() {
logger.warn("Not implemented");
return false; return false;
} }