Support MSP-EXP430F5438 board and Improvment in Timer/Watchdog/Ports/Flash

Makefile

@@ -62,13 +62,15 @@ Z1FIRMWARE = firmware/z1/blink.z1
 WISMOTEFIRMWARE = firmware/wismote/blink.wismote
 TYNDALLFIRMWARE = firmware/tyndall/blink.tyndall
 EXP5438FIRMWARE = firmware/exp5438/testcase-bits.exp5438
+MSPEXP430F5438FIRMWARE = firmware/mspexp430f5438/LCDflat.out
 else
 ESBFIRMWARE = ${FIRMWAREFILE}
 SKYFIRMWARE = ${FIRMWAREFILE}
 Z1FIRMWARE = ${FIRMWAREFILE}
 WISMOTEFIRMWARE = ${FIRMWAREFILE}
 TYNDALLFIRMWARE = ${FIRMWAREFILE}
 EXP5438FIRMWARE = ${FIRMWAREFILE}
+MSPEXP430F5438FIRMWARE = ${FIRMWAREFILE}
 endif
 
 ifdef MAPFILE
@@ -81,7 +83,7 @@ TIMERTEST := tests/timertest.firmware
 SCRIPTS := ${addprefix scripts/,autorun.sc duty.sc}
 BINARY := README.txt license.txt CHANGE_LOG.txt images/*.jpg images/*.png firmware/*/*.firmware ${SCRIPTS}
 
-PACKAGES := se/sics/mspsim ${addprefix se/sics/mspsim/,core chip cli config debug platform ${addprefix platform/,esb sky jcreate sentillausb z1 tyndall ti wismote} plugin profiler emulink net ui util extutil/highlight extutil/jfreechart}
+PACKAGES := se/sics/mspsim ${addprefix se/sics/mspsim/,core chip cli config debug platform ${addprefix platform/,esb sky jcreate sentillausb z1 tyndall ti MSPEXP430F5438 wismote} plugin profiler emulink net ui util extutil/highlight extutil/jfreechart}
 
 SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))}
 
@@ -122,6 +124,10 @@ $(JARFILE):	$(OBJECTS)
 %.exp5438:	jar
 	java -jar $(JARFILE) -platform=exp5438 $@ $(ARGS)
 
+%.mspexp5438:	jar
+	java -jar $(JARFILE) -platform=exp5438 $@ $(ARGS)
+
+
 %.tyndall:	jar
 	java -jar $(JARFILE) -platform=tyndall $@ $(ARGS)
 
@@ -154,6 +160,8 @@ runwismote:	compile
 
 runexp5438:	compile
 	$(JAVA) $(JAVAARGS) se.sics.mspsim.platform.ti.Exp5438Node $(EXP5438FIRMWARE) $(MAPARGS) $(ARGS)
+runmspexp5438:	compile
+	$(JAVA) $(JAVAARGS) se.sics.mspsim.platform.MSPEXP430F5438.Exp5438Node $(MSPEXP430F5438FIRMWARE) $(MAPARGS) $(ARGS)
 
 test:	cputest
 

se/sics/mspsim/Main.java

@@ -75,6 +75,9 @@ public static String getNodeTypeByPlatform(String platform) {
       if ("exp5438".equals(platform)) {
           return "se.sics.mspsim.platform.ti.Exp5438Node";
       }
+      if ("mspexp430f5438".equals(platform)) {
+        return "se.sics.mspsim.platform.MSPEXP430F5438.Exp5438Node";
+      }      
       // Try to guess the node type.
       return "se.sics.mspsim.platform." + platform + '.'
           + Character.toUpperCase(platform.charAt(0))

se/sics/mspsim/chip/Button.java

@@ -31,51 +31,111 @@
 package se.sics.mspsim.chip;
 import se.sics.mspsim.core.Chip;
 import se.sics.mspsim.core.IOPort;
+import se.sics.mspsim.core.IOPort.PortReg;
 import se.sics.mspsim.core.MSP430Core;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 /**
  * @author Niclas Finne
  *
  */
-public class Button extends Chip {
+public class Button extends Chip implements ActionListener {
+
+	public enum Btn_Typ {
+		HighOpen, NoOpen
+	}
+
+	private final IOPort port;
+	private final int pin;
+	private final boolean polarity;
+	private boolean isPressed;
+	private Btn_Typ btnTyp = Btn_Typ.NoOpen;
+	private javax.swing.Timer waittimer;
+
+	public Button(String id, MSP430Core cpu, IOPort port, int pin, boolean polarity) {
+		super(id, cpu);
+		this.port = port;
+		this.pin = pin;
+		this.polarity = polarity;
+		this.isPressed = false;
+		if (this.polarity == false) {
+			SetState();
+		}
+	}
+
+	public Button(String id, MSP430Core cpu, IOPort port, int pin,
+			boolean polarity, Btn_Typ btnTyp) {
+		this(id,cpu,port,pin,polarity);
+		this.btnTyp = btnTyp;
+		waittimer = new javax.swing.Timer(3000, this);
+		waittimer.stop();
+		waittimer.setRepeats(false);
+	}    
+
+	public boolean isPressed() {
+		return isPressed;
+	}
+
+	public boolean isPullUp() {
+		boolean Ren = ((this.port.getRegister(PortReg.REN) & (1 << this.pin)) != 0);
+		boolean Up_Down = ((this.port.getRegister(PortReg.OUT) & (1 << this.pin)) != 0);
+		return Up_Down & Ren;
+	}
 
-    private final IOPort port;
-    private final int pin;
-    private final boolean polarity;
-    private boolean isPressed;
+	public boolean isPullDown() {
+		boolean Ren = ((this.port.getRegister(PortReg.REN) & (1 << this.pin)) != 0);
+		boolean Up_Down = ((this.port.getRegister(PortReg.OUT) & (1 << this.pin)) != 0);
+		return !Up_Down & Ren;
+	}
+
+	public void setPressed(boolean isPressed) {
+		if (this.isPressed != isPressed) {
+			this.isPressed = isPressed;
+			boolean isHigh = isPressed ^ (!polarity);
+			boolean Ren = ((this.port.getRegister(PortReg.REN) & (1 << this.pin)) != 0);
+			// if potential open, then wait 3 seconds to change
+			if (isHigh && (btnTyp == Btn_Typ.HighOpen) && !Ren) {
+				waittimer.restart();
+			} else {
+				waittimer.stop();
+				SetState();
+			}
+		}
+	}
 
-    public Button(String id, MSP430Core cpu, IOPort port, int pin, boolean polarity) {
-        super(id, cpu);
-        this.port = port;
-        this.pin = pin;
-        this.polarity = polarity;
-    }
+	public void actionPerformed(ActionEvent e) {
+		waittimer.stop();
+		SetState();
+	}
 
-    public boolean isPressed() {
-        return isPressed;
-    }
+	public void SetState() {
+		boolean isHigh = this.isPressed ^ (!this.polarity);
+		stateChanged(this.isPressed ? 1 : 0);
+		if((btnTyp==Btn_Typ.HighOpen)&isPullDown()) isHigh=false;
+		if (DEBUG)
+			log(this.isPressed ? "pressed" : "released");
+		port.setPinState(pin, isHigh ? IOPort.PinState.HI : IOPort.PinState.LOW);
+	}    
 
-    public void setPressed(boolean isPressed) {
-        if (this.isPressed != isPressed) {
-            this.isPressed = isPressed;
-            stateChanged(isPressed ? 1 : 0);
-            if (DEBUG) log(isPressed ? "pressed" : "released");
-            port.setPinState(pin, isPressed == polarity ? IOPort.PinState.HI : IOPort.PinState.LOW);
-        }
-    }
+	@Override
+	public int getConfiguration(int parameter) {
+		return 0;
+	}
 
-    @Override
-    public int getConfiguration(int parameter) {
-        return 0;
-    }
+	@Override
+	public int getModeMax() {
+		return 0;
+	}
 
-    @Override
-    public int getModeMax() {
-        return 0;
-    }
+	@Override
+	public String info() {
+		return " Button is " + (isPressed ? "pressed" : "not pressed");
+	}
 
-    @Override
-    public String info() {
-        return " Button is " + (isPressed ? "pressed" : "not pressed");
-    }
+	@Override
+	public void notifyReset() {
+		SetState();
+	}    
 }