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

compile method signature update

Browse source
This commit is contained in:
fros4943 2009-03-11 08:42:07 +00:00
parent 5d27841807
commit 8ec6bbd32b
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.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: ESBMoteType.java,v 1.6 2009/03/09 16:03:58 fros4943 Exp $ * $Id: ESBMoteType.java,v 1.7 2009/03/11 08:42:07 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -148,7 +148,8 @@ public class ESBMoteType extends MspMoteType {
try { try {
CompileContiki.compile( CompileContiki.compile(
cmd, cmd,
null /* No output file */, null,
null /* Do not observe output firmware file */,
getContikiSourceFile().getParentFile(), getContikiSourceFile().getParentFile(),
null, null,
null, null,

6
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.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: MspMoteType.java,v 1.26 2009/03/09 17:12:27 fros4943 Exp $ * $Id: MspMoteType.java,v 1.27 2009/03/11 08:42:07 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -217,7 +217,7 @@ public abstract class MspMoteType implements MoteType {
fileSource = GUI.stripAbsoluteContikiPath(fileSource); fileSource = GUI.stripAbsoluteContikiPath(fileSource);
element.setText(fileSource.getPath().replaceAll("\\\\", "/")); element.setText(fileSource.getPath().replaceAll("\\\\", "/"));
config.add(element); config.add(element);
element = new Element("command"); element = new Element("commands");
element.setText(compileCommands); element.setText(compileCommands);
config.add(element); config.add(element);
} }
@ -251,7 +251,7 @@ public abstract class MspMoteType implements MoteType {
description = element.getText(); description = element.getText();
} else if (name.equals("source")) { } else if (name.equals("source")) {
fileSource = new File(element.getText()); fileSource = new File(element.getText());
} else if (name.equals("command")) { } else if (name.equals("commands")) {
compileCommands = element.getText(); compileCommands = element.getText();
} else if (name.equals("firmware")) { } else if (name.equals("firmware")) {
fileFirmware = new File(element.getText()); fileFirmware = new File(element.getText());

5
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.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: SkyMoteType.java,v 1.5 2009/03/09 16:03:58 fros4943 Exp $ * $Id: SkyMoteType.java,v 1.6 2009/03/11 08:42:07 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -148,7 +148,8 @@ public class SkyMoteType extends MspMoteType {
try { try {
CompileContiki.compile( CompileContiki.compile(
cmd, cmd,
null /* No output file */, null,
null /* Do not observe output firmware file */,
getContikiSourceFile().getParentFile(), getContikiSourceFile().getParentFile(),
null, null,
null, null,