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

The collectview tool should use the example/collect code instead of examples/sky-shell code

Browse source
This commit is contained in:
adamdunkels 2010-12-07 22:46:12 +00:00
parent eaa5d32cec
commit eccf001029
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/collect-view/build.xml
View file

@ -42,19 +42,19 @@
</copy>
</target>
<condition property="sky-shell.exists">
<available file="${dist}/sky-shell.ihex"/>
<condition property="collect-view-shell.exists">
<available file="${dist}/collect-view-shell.ihex"/>
</condition>
<target name="sky-shell.ihex" unless="sky-shell.exists" depends="init">
<exec dir="${contiki}/examples/sky-shell" executable="make">
<target name="collect-view-shell.ihex" unless="collect-view-shell.exists" depends="init">
<exec dir="${contiki}/examples/collect" executable="make">
<arg value="TARGET=sky"/>
<arg value="sky-shell.ihex"/>
<arg value="collect-view-shell.ihex"/>
</exec>
<copy todir="${dist}" file="${contiki}/examples/sky-shell/sky-shell.ihex"/>
<copy todir="${dist}" file="${contiki}/examples/collect/collect-view-shell.ihex"/>
</target>
<target name="dist" depends="jar,sky-shell.ihex">
<target name="dist" depends="jar,collect-view-shell.ihex">
<copy todir="${dist}" file="collect-init.script"/>
<mkdir dir="${dist}/tools"/>
<copy todir="${dist}/tools">

8
tools/collect-view/src/se/sics/contiki/collect/CollectServer.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: CollectServer.java,v 1.4 2010/11/12 17:52:02 nifi Exp $
* $Id: CollectServer.java,v 1.5 2010/12/07 22:46:13 adamdunkels Exp $
*
* -----------------------------------------------------------------
*
@ -34,8 +34,8 @@
*
* Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008
* Updated : $Date: 2010/11/12 17:52:02 $
* $Revision: 1.4 $
* Updated : $Date: 2010/12/07 22:46:13 $
* $Revision: 1.5 $
*/
package se.sics.contiki.collect;
@ -105,7 +105,7 @@ public class CollectServer implements SerialConnectionListener {
public static final String SENSORDATA_FILE = "sensordata.log";
public static final String CONFIG_DATA_FILE = "collect-data.conf";
public static final String INIT_SCRIPT = "collect-init.script";
public static final String FIRMWARE_FILE = "sky-shell.ihex";
public static final String FIRMWARE_FILE = "collect-view-shell.ihex";
/* Categories for the tab pane */
private static final String MAIN = "main";