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

bug fix: schedule button events from simulation thread

Browse source
This commit is contained in:
fros4943 2009-11-14 11:09:41 +00:00
parent d71fe1d25f
commit c869104e83
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.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: ContikiButton.java,v 1.14 2009/10/27 10:11:17 fros4943 Exp $ * $Id: ContikiButton.java,v 1.15 2009/11/14 11:09:41 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote.interfaces; package se.sics.cooja.contikimote.interfaces;
@ -108,17 +108,29 @@ public class ContikiButton extends Button implements ContikiMoteInterface {
* Clicks button: Presses and immediately releases button. * Clicks button: Presses and immediately releases button.
*/ */
public void clickButton() { public void clickButton() {
mote.getSimulation().invokeSimulationThread(new Runnable() {
public void run() {
mote.getSimulation().scheduleEvent(pressButtonEvent, mote.getSimulation().getSimulationTime()); mote.getSimulation().scheduleEvent(pressButtonEvent, mote.getSimulation().getSimulationTime());
mote.getSimulation().scheduleEvent(releaseButtonEvent, mote.getSimulation().getSimulationTime() + Simulation.MILLISECOND); mote.getSimulation().scheduleEvent(releaseButtonEvent, mote.getSimulation().getSimulationTime() + Simulation.MILLISECOND);
} }
});
}
public void pressButton() { public void pressButton() {
mote.getSimulation().invokeSimulationThread(new Runnable() {
public void run() {
mote.getSimulation().scheduleEvent(pressButtonEvent, mote.getSimulation().getSimulationTime()); mote.getSimulation().scheduleEvent(pressButtonEvent, mote.getSimulation().getSimulationTime());
} }
});
}
public void releaseButton() { public void releaseButton() {
mote.getSimulation().invokeSimulationThread(new Runnable() {
public void run() {
mote.getSimulation().scheduleEvent(releaseButtonEvent, mote.getSimulation().getSimulationTime()); mote.getSimulation().scheduleEvent(releaseButtonEvent, mote.getSimulation().getSimulationTime());
} }
});
}
private void doReleaseButton() { private void doReleaseButton() {
moteMem.setByteValueOf("simButtonIsDown", (byte) 0); moteMem.setByteValueOf("simButtonIsDown", (byte) 0);