From 1d70d4bca04ab2e5ec456d57f86c334af3ebf4a9 Mon Sep 17 00:00:00 2001
From: Rodrigo Damazio <Rodrigo Damazio@localhost>
Date: Tue, 24 May 2011 14:18:57 -0300
Subject: [PATCH] Merging

---
 .../apps/mytracks/services/sensors/ZephyrMessageParser.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 17c4ae1b3..48fd5daa0 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
@@ -40,7 +40,7 @@ public class ZephyrMessageParser implements MessageParser {
     Log.w(Constants.TAG, "Got zephyr data: " + sb);
     // Heart Rate
     Sensor.SensorData.Builder heartrate = Sensor.SensorData.newBuilder()
-        .setValue(buffer[12])
+        .setValue(buffer[12] & 0xFF)
         .setState(Sensor.SensorState.SENDING);
     // Changes Nico Laum (Power and Cadence)
     Sensor.SensorData.Builder power = Sensor.SensorData.newBuilder()