Replaced the sky-alldata command with the new collect-view-data command. Also added an explicit killall command before sending a new collect command.

This commit is contained in:
adamdunkels 2010-10-12 11:39:59 +00:00
parent a5d34a4fab
commit cc33fa0249

View File

@ -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());