mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-09 23:54:32 +00:00
Corrected ETX values
This commit is contained in:
parent
b84f771c6b
commit
ce9af386c6
@ -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: CollectServer.java,v 1.29 2010/10/14 18:13:09 nifi Exp $
|
* $Id: CollectServer.java,v 1.30 2010/10/22 20:39:13 nifi Exp $
|
||||||
*
|
*
|
||||||
* -----------------------------------------------------------------
|
* -----------------------------------------------------------------
|
||||||
*
|
*
|
||||||
@ -34,8 +34,8 @@
|
|||||||
*
|
*
|
||||||
* Authors : Joakim Eriksson, Niclas Finne
|
* Authors : Joakim Eriksson, Niclas Finne
|
||||||
* Created : 3 jul 2008
|
* Created : 3 jul 2008
|
||||||
* Updated : $Date: 2010/10/14 18:13:09 $
|
* Updated : $Date: 2010/10/22 20:39:13 $
|
||||||
* $Revision: 1.29 $
|
* $Revision: 1.30 $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.sics.contiki.collect;
|
package se.sics.contiki.collect;
|
||||||
@ -359,7 +359,7 @@ public class CollectServer implements SerialConnectionListener {
|
|||||||
axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
|
axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
|
||||||
}
|
}
|
||||||
protected double getSensorDataValue(SensorData data) {
|
protected double getSensorDataValue(SensorData data) {
|
||||||
return data.getValue(SensorData.BEST_NEIGHBOR_RTMETRIC) + data.getValue(SensorData.BEST_NEIGHBOR_ETX);
|
return data.getValue(SensorData.BEST_NEIGHBOR_RTMETRIC) + data.getBestNeighborETX();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new TimeChartPanel(this, NETWORK, "ETX (Over Time)", "ETX to Next Hop", "Time", "ETX") {
|
new TimeChartPanel(this, NETWORK, "ETX (Over Time)", "ETX to Next Hop", "Time", "ETX") {
|
||||||
@ -369,7 +369,7 @@ public class CollectServer implements SerialConnectionListener {
|
|||||||
axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
|
axis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
|
||||||
}
|
}
|
||||||
protected double getSensorDataValue(SensorData data) {
|
protected double getSensorDataValue(SensorData data) {
|
||||||
return data.getValue(SensorData.BEST_NEIGHBOR_ETX);
|
return data.getBestNeighborETX();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new AggregatedTimeChartPanel<int[]>(this, NETWORK,
|
new AggregatedTimeChartPanel<int[]>(this, NETWORK,
|
||||||
@ -1058,6 +1058,10 @@ public class CollectServer implements SerialConnectionListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void parseIncomingLine(long systemTime, String line) {
|
protected void parseIncomingLine(long systemTime, String line) {
|
||||||
|
if (line.length() == 0 || line.charAt(0) == '#') {
|
||||||
|
// Ignore empty lines, comments, and annotations.
|
||||||
|
return;
|
||||||
|
}
|
||||||
SensorData sensorData = SensorData.parseSensorData(this, line, systemTime);
|
SensorData sensorData = SensorData.parseSensorData(this, line, systemTime);
|
||||||
if (sensorData != null) {
|
if (sensorData != null) {
|
||||||
// Sensor data received
|
// Sensor data received
|
||||||
|
Loading…
Reference in New Issue
Block a user