natas_hw
/
mspsim
mirror of https://github.com/contiki-ng/mspsim
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected the button configuration for the WiSMote platform

This commit is contained in:
Niclas Finne 2013-03-08 17:39:05 +01:00
parent e569e6c3c3
commit 2d70ea18bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
se/sics/mspsim/chip/Button.java
View File

@ -76,6 +76,6 @@ public class Button extends Chip {
@Override
public String info() {
return id + ": " + (isPressed ? "pressed" : "released");
return " Button is " + (isPressed ? "pressed" : "not pressed");
}
}

6
se/sics/mspsim/platform/wismote/WismoteNode.java
View File

@ -67,8 +67,8 @@ public class WismoteNode extends GenericNode implements PortListener, USARTListe
/* P4.4 - Output: RESET_N to CC2520 */
public static final int CC2520_RESET = 1 << 4;
/* P2.7 - Button */
public static final int BUTTON_PIN = 7;
/* P1.4 - Button */
public static final int BUTTON_PIN = 4;
/* P8.6 - Red (left) led */
private static final int LEDS_CONF_RED2 = 1 << 6;
@ -173,7 +173,7 @@ public class WismoteNode extends GenericNode implements PortListener, USARTListe
throw new EmulationException("Could not setup wismote mote - missing USCI B0");
}
leds = new Leds(cpu, LEDS);
button = new Button("Button", cpu, port2, BUTTON_PIN, true);
button = new Button("Button", cpu, port1, BUTTON_PIN, true);
IOUnit usart = cpu.getIOUnit("USCI A1");
if (usart instanceof USARTSource) {