From 70192222adc4efe585901d90da37e02b9f5ce738 Mon Sep 17 00:00:00 2001 From: nic Date: Fri, 13 May 2011 08:49:20 +0200 Subject: [PATCH] - comment from http://code.google.com/r/nic-sensors/source/detail?r=116bf0d1136edaa75c6bb5609b3c16e99ecb1ad8 --- .../services/sensors/ZephyrMessageParser.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java index 7d55632e3..17c4ae1b3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java @@ -27,9 +27,9 @@ import com.google.android.apps.mytracks.content.Sensor; */ public class ZephyrMessageParser implements MessageParser { - public static final int ZEPHYR_HXM_BYTE_STX = 0; - public static final int ZEPHYR_HXM_BYTE_CRC = 58; - public static final int ZEPHYR_HXM_BYTE_ETX = 59; + public static final int ZEPHYR_HXM_BYTE_STX = 0; + public static final int ZEPHYR_HXM_BYTE_CRC = 58; + public static final int ZEPHYR_HXM_BYTE_ETX = 59; @Override public Sensor.SensorDataSet parseBuffer(byte[] buffer) { @@ -63,13 +63,11 @@ public class ZephyrMessageParser implements MessageParser { @Override public boolean isValid(byte[] buffer) { - if (buffer.length > ZEPHYR_HXM_BYTE_ETX) { - // Check STX (Start of Text), ETX (End of Text) and CRC Checksum - return buffer[ZEPHYR_HXM_BYTE_STX] == 0x02 - && buffer[ZEPHYR_HXM_BYTE_ETX] == 0x03 - && SensorUtils.getCrc8(buffer, 3, 55) == buffer[ZEPHYR_HXM_BYTE_CRC]; - } else - return false; + // Check STX (Start of Text), ETX (End of Text) and CRC Checksum + return buffer.length > ZEPHYR_HXM_BYTE_ETX + && buffer[ZEPHYR_HXM_BYTE_STX] == 0x02 + && buffer[ZEPHYR_HXM_BYTE_ETX] == 0x03 + && SensorUtils.getCrc8(buffer, 3, 55) == buffer[ZEPHYR_HXM_BYTE_CRC]; } @Override