From 9ce45ac452733e6679fccb8c882a8d08750459d0 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Wed, 22 Sep 2010 22:14:03 +0000
Subject: [PATCH] Send only link estimate, not rtmetric + link estimate, for
 best neighbor

---
 examples/sky-shell/sky-shell.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/sky-shell/sky-shell.c b/examples/sky-shell/sky-shell.c
index 98108bde7..5e6617050 100644
--- a/examples/sky-shell/sky-shell.c
+++ b/examples/sky-shell/sky-shell.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sky-shell.c,v 1.22 2010/09/13 14:34:51 adamdunkels Exp $
+ * $Id: sky-shell.c,v 1.23 2010/09/22 22:14:03 adamdunkels Exp $
  */
 
 /**
@@ -224,7 +224,7 @@ PROCESS_THREAD(shell_sky_alldata_process, ev, data)
   n = collect_neighbor_list_best(&shell_collect_conn.neighbor_list);
   if(n != NULL) {
     rimeaddr_copy(&msg.best_neighbor, &n->addr);
-    msg.best_neighbor_etx = collect_neighbor_rtmetric(n) - n->rtmetric;
+    msg.best_neighbor_etx = collect_neighbor_rtmetric_link_estimate(n) - n->rtmetric;
     msg.best_neighbor_rtmetric = n->rtmetric;
   }
   msg.battery_voltage = battery_sensor.value(0);
@@ -253,8 +253,8 @@ PROCESS_THREAD(sky_shell_process, ev, data)
 
   /*  ctimer_set(&c, 20 * CLOCK_SECOND, periodic_debug, &c);*/
   
-  /*  powertrace_start(10 * CLOCK_SECOND);
-      powertrace_sniff(POWERTRACE_ON);*/
+  /*  powertrace_start(10 * CLOCK_SECOND);*/
+  /*  powertrace_sniff(POWERTRACE_ON);*/
   
   serial_shell_init();
   shell_blink_init();