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

Enabled the Collect-View plugin by default in COOJA

Browse source
This commit is contained in:
nifi 2010-11-12 16:50:38 +00:00
parent 42cc61dd91
commit 36b0f22f2b
9 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/cooja/apps/collect-view/build.xml
View file

@ -2,6 +2,7 @@
<project name="COOJA: CollectView" default="jar" basedir="."> <project name="COOJA: CollectView" default="jar" basedir=".">
<property name="cooja" value="../../dist/cooja.jar"/> <property name="cooja" value="../../dist/cooja.jar"/>
<property name="archive" value="cooja-collect-view.jar"/>
<target name="init"> <target name="init">
<tstamp/> <tstamp/>
@ -17,12 +18,13 @@
</target> </target>
<target name="clean" depends="init"> <target name="clean" depends="init">
<delete dir="build" file="collect-view.jar"/> <delete dir="build" file="${archive}"/>
</target> </target>
<target name="jar" depends="clean, init, compile"> <target name="jar" depends="compile">
<jar destfile="collect-view.jar" basedir="build" /> <jar destfile="${archive}" basedir="build" />
<ant antfile="build.xml" dir="../../../../tools/collect-view" target="dist" inheritAll="false"/> <ant antfile="build.xml" dir="../../../../tools/collect-view" target="jar"
inheritAll="false"/>
</target> </target>
</project> </project>

2
tools/cooja/apps/collect-view/cooja.config
View file

@ -1,2 +1,2 @@
se.sics.cooja.GUI.PLUGINS = + se.sics.cooja.plugins.collectview.CollectView se.sics.cooja.GUI.PLUGINS = + se.sics.cooja.plugins.collectview.CollectView
se.sics.cooja.GUI.JARFILES = + collect-view.jar se.sics.cooja.GUI.JARFILES = + cooja-collect-view.jar

4
tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.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: CollectView.java,v 1.3 2010/11/10 20:46:57 adamdunkels Exp $ * $Id: CollectView.java,v 1.4 2010/11/12 16:50:38 nifi Exp $
*/ */
package se.sics.cooja.plugins.collectview; package se.sics.cooja.plugins.collectview;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@ -116,7 +116,7 @@ public class CollectView extends VisPlugin implements MotePlugin, HasQuickHelp {
} }
String contikiPath = GUI.getExternalToolsSetting("PATH_CONTIKI", "../../.."); String contikiPath = GUI.getExternalToolsSetting("PATH_CONTIKI", "../../..");
String jarFile = contikiPath + "/tools/collect-view/dist/collect-demo.jar"; String jarFile = contikiPath + "/tools/collect-view/dist/collect-view.jar";
if (!new File(jarFile).canRead()) { if (!new File(jarFile).canRead()) {
logger.fatal("Could not find the CollectView application:" + jarFile); logger.fatal("Could not find the CollectView application:" + jarFile);
if (GUI.isVisualized()) { if (GUI.isVisualized()) {

2
tools/cooja/build.xml
View file

@ -91,6 +91,7 @@ The COOJA Simulator
<ant antfile="build.xml" dir="apps/mspsim" target="clean" inheritAll="false"/> <ant antfile="build.xml" dir="apps/mspsim" target="clean" inheritAll="false"/>
<ant antfile="build.xml" dir="apps/avrora" target="clean" inheritAll="false"/> <ant antfile="build.xml" dir="apps/avrora" target="clean" inheritAll="false"/>
<ant antfile="build.xml" dir="apps/serial_socket" target="clean" inheritAll="false"/> <ant antfile="build.xml" dir="apps/serial_socket" target="clean" inheritAll="false"/>
<ant antfile="build.xml" dir="apps/collect-view" target="clean" inheritAll="false"/>
</target> </target>
<target name="run" depends="init, compile, jar, copy configs"> <target name="run" depends="init, compile, jar, copy configs">
@ -163,6 +164,7 @@ The COOJA Simulator
<ant antfile="build.xml" dir="apps/mspsim" target="jar" inheritAll="false"/> <ant antfile="build.xml" dir="apps/mspsim" target="jar" inheritAll="false"/>
<ant antfile="build.xml" dir="apps/avrora" target="jar" inheritAll="false"/> <ant antfile="build.xml" dir="apps/avrora" target="jar" inheritAll="false"/>
<ant antfile="build.xml" dir="apps/serial_socket" target="jar" inheritAll="false"/> <ant antfile="build.xml" dir="apps/serial_socket" target="jar" inheritAll="false"/>
<ant antfile="build.xml" dir="apps/collect-view" target="jar" inheritAll="false"/>
</target> </target>
<target name="run_nogui" depends="init, compile, jar, copy configs"> <target name="run_nogui" depends="init, compile, jar, copy configs">

2
tools/cooja/config/external_tools_freebsd.config
View file

@ -21,7 +21,7 @@ AR_COMMAND_2 =
CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
CORECOMM_TEMPLATE_FILENAME = corecomm_template.java CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
PATH_JAVAC = javac PATH_JAVAC = javac
DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
PARSE_WITH_COMMAND=false PARSE_WITH_COMMAND=false
PARSE_COMMAND=nm -a $(LIBFILE) PARSE_COMMAND=nm -a $(LIBFILE)

2
tools/cooja/config/external_tools_linux.config
View file

@ -21,7 +21,7 @@ AR_COMMAND_2 =
CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
CORECOMM_TEMPLATE_FILENAME = corecomm_template.java CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
PATH_JAVAC = javac PATH_JAVAC = javac
DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
PARSE_WITH_COMMAND=false PARSE_WITH_COMMAND=false
PARSE_COMMAND=nm -a $(LIBFILE) PARSE_COMMAND=nm -a $(LIBFILE)

2
tools/cooja/config/external_tools_linux_64.config
View file

@ -21,7 +21,7 @@ AR_COMMAND_2 =
CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
CORECOMM_TEMPLATE_FILENAME = corecomm_template.java CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
PATH_JAVAC = javac PATH_JAVAC = javac
DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
PARSE_WITH_COMMAND=false PARSE_WITH_COMMAND=false
PARSE_COMMAND=nm -a $(LIBFILE) PARSE_COMMAND=nm -a $(LIBFILE)

2
tools/cooja/config/external_tools_macosx.config
View file

@ -21,7 +21,7 @@ AR_COMMAND_2 =
CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
CORECOMM_TEMPLATE_FILENAME = corecomm_template.java CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
PATH_JAVAC = javac PATH_JAVAC = javac
DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
PARSE_WITH_COMMAND = true PARSE_WITH_COMMAND = true
PARSE_COMMAND = /opt/contiki-2.x/tools/cooja/examples/jni_test/mac_users/nmandsize $(LIBFILE) PARSE_COMMAND = /opt/contiki-2.x/tools/cooja/examples/jni_test/mac_users/nmandsize $(LIBFILE)

2
tools/cooja/config/external_tools_win32.config
View file

@ -21,7 +21,7 @@ AR_COMMAND_2 =
CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
CORECOMM_TEMPLATE_FILENAME = corecomm_template.java CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
PATH_JAVAC = javac PATH_JAVAC = javac
DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
PARSE_WITH_COMMAND = true PARSE_WITH_COMMAND = true
PARSE_COMMAND=nm -C $(LIBFILE) PARSE_COMMAND=nm -C $(LIBFILE)