From cc33fa0249c62a7ca1f5f20a7f889c6c0a7a88a6 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 12 Oct 2010 11:39:59 +0000
Subject: [PATCH] Replaced the sky-alldata command with the new
 collect-view-data command. Also added an explicit killall command before
 sending a new collect command.

---
 .../src/se/sics/contiki/collect/gui/NodeControl.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java b/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java
index d54d0ec7c..6a7a03336 100644
--- a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java
+++ b/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: NodeControl.java,v 1.4 2010/10/07 21:13:00 nifi Exp $
+ * $Id: NodeControl.java,v 1.5 2010/10/12 11:39:59 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
@@ -34,8 +34,8 @@
  *
  * Authors : Niclas Finne
  * Created : 27 sep 2010
- * Updated : $Date: 2010/10/07 21:13:00 $
- *           $Revision: 1.4 $
+ * Updated : $Date: 2010/10/12 11:39:59 $
+ *           $Revision: 1.5 $
  */
 
 package se.sics.contiki.collect.gui;
@@ -98,13 +98,15 @@ public class NodeControl implements Visualizer {
         int rexmits = (Integer)rexmitsField.getValue();
 
         sendCommand("netcmd { repeat " + reports + " " + interval
-            + " { randwait " + random + " sky-alldata | blink | send " + rexmits + " } }");
+            + " { randwait " + random + " collect-view-data | blink | send " + rexmits + " } }");
       }
 
     });
 
     JButton collectButton = createCommandButton("Start Collect",
-        "mac 0", SET_TIME_COMMAND, "collect | timestamp | blink | binprint &");
+                                                "~K", "killall",
+                                                "mac 0", SET_TIME_COMMAND,
+                                                "collect | timestamp | blink | binprint &");
     JButton stopCollectButton = createCommandButton("Stop Collect", "~K", "killall");
 
     JPanel controlPanel = new JPanel(new GridBagLayout());