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

Corrected leds placement on WiSMote platform

This commit is contained in:
Niclas Finne 2012-12-06 18:59:29 +01:00
parent 0ac2bdbb76
commit 7f35e627fd
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
se/sics/mspsim/chip/Leds.java
View File

@ -93,15 +93,15 @@ public class Leds extends Chip {
return ledColors.length;
}
public int getModeMax() {
@Override public int getModeMax() {
return 0;
}
public String info() {
@Override public String info() {
return "Leds: " + (ledColors.length <= 8 ? Utils.binary8(leds) : Utils.binary16(leds));
}
public int getConfiguration(int parameter) {
@Override public int getConfiguration(int parameter) {
return 0;
}

8
se/sics/mspsim/platform/wismote/WismoteGui.java
View File

@ -45,9 +45,9 @@ import se.sics.mspsim.platform.AbstractNodeGUI;
public class WismoteGui extends AbstractNodeGUI {
private static final long serialVersionUID = -8713047619139235630L;
private static final int RED1_X = 192;
private static final int RED1_X = 172;
private static final int GREEN_X = 182;
private static final int RED2_X = 172;
private static final int RED2_X = 192;
private static final int LED_Y = 40;
private static final int LED_HEIGHT = 11;
private static final int LED_WIDTH = 7;
@ -60,8 +60,8 @@ public class WismoteGui extends AbstractNodeGUI {
private static final Color BUTTON_C = new Color(0x60ffffff);
private static final Rectangle LEDS_BOUNDS = new Rectangle(RED2_X - 2,
LED_Y - 1, RED1_X - RED2_X + LED_HEIGHT, LED_WIDTH);
private static final Rectangle LEDS_BOUNDS = new Rectangle(RED1_X - 2,
LED_Y - 1, RED2_X - RED1_X + LED_HEIGHT, LED_WIDTH);
private final WismoteNode node;
private final StateChangeListener ledsListener = new StateChangeListener() {

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

@ -76,14 +76,14 @@ public class WismoteNode extends GenericNode implements PortListener, USARTListe
public static final int BUTTON_PIN = 7;
/* P8.6 - Red (left) led */
private static final int LEDS_CONF_RED2 = 1 << 6;
private static final int LEDS_RED2 = 1 << 2;
private static final int LEDS_CONF_RED1 = 1 << 6;
private static final int LEDS_RED1 = 1 << 0;
/* P5.2 - Green (middle) led */
private static final int LEDS_CONF_GREEN = 1 << 2;
private static final int LEDS_CONF_GREEN = 1 << 4;
private static final int LEDS_GREEN = 1 << 1;
/* P2.4 - Red (right) led */
private static final int LEDS_CONF_RED1 = 1 << 4;
private static final int LEDS_RED1 = 1 << 0;
private static final int LEDS_CONF_RED2 = 1 << 2;
private static final int LEDS_RED2 = 1 << 2;
private static final int[] LEDS = { 0xff2020, 0x20ff20, 0xff2020 };
@ -131,8 +131,7 @@ public class WismoteNode extends GenericNode implements PortListener, USARTListe
ds2411.dataPin((data & DS2411_DATA) != 0);
break;
case 2:
//System.out.println("LEDS RED1 = " + ((data & LEDS_CONF_RED1) > 0));
leds.setLeds(LEDS_RED1, (data & LEDS_CONF_RED1) == 0 && (source.getDirection() & LEDS_CONF_RED1) != 0);
leds.setLeds(LEDS_GREEN, (data & LEDS_CONF_GREEN) == 0 && (source.getDirection() & LEDS_CONF_GREEN) != 0);
break;
case 3:
// Chip select = active low...
@ -144,12 +143,10 @@ public class WismoteNode extends GenericNode implements PortListener, USARTListe
radio.setVRegOn((data & CC2520_VREG) != 0);
break;
case 5:
//System.out.println("LEDS GREEN = " + ((data & LEDS_CONF_GREEN) > 0));
leds.setLeds(LEDS_GREEN, (data & LEDS_CONF_GREEN) == 0 && (source.getDirection() & LEDS_CONF_GREEN) != 0);
leds.setLeds(LEDS_RED2, (data & LEDS_CONF_RED2) == 0 && (source.getDirection() & LEDS_CONF_RED2) != 0);
break;
case 8:
//System.out.println("LEDS RED2 = " + ((data & LEDS_CONF_RED2) > 0));
leds.setLeds(LEDS_RED2, (data & LEDS_CONF_RED2) == 0 && (source.getDirection() & LEDS_CONF_RED2) != 0);
leds.setLeds(LEDS_RED1, (data & LEDS_CONF_RED1) == 0 && (source.getDirection() & LEDS_CONF_RED1) != 0);
break;
}
}