Storing battery level in new protobuf field.

This commit is contained in:
Dominik R?ttsches
2011-08-20 01:25:58 +03:00
parent cb5518a261
commit d9725240a6
@@ -15,11 +15,11 @@
*/ */
package com.google.android.apps.mytracks.services.sensors; package com.google.android.apps.mytracks.services.sensors;
import android.util.Log;
import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.content.Sensor; import com.google.android.apps.mytracks.content.Sensor;
import android.util.Log;
/** /**
* An implementation of a Sensor MessageParser for Zephyr. * An implementation of a Sensor MessageParser for Zephyr.
* *
@@ -42,8 +42,7 @@ public class ZephyrMessageParser implements MessageParser {
Sensor.SensorData.Builder heartrate = Sensor.SensorData.newBuilder() Sensor.SensorData.Builder heartrate = Sensor.SensorData.newBuilder()
.setValue(buffer[12] & 0xFF) .setValue(buffer[12] & 0xFF)
.setState(Sensor.SensorState.SENDING); .setState(Sensor.SensorState.SENDING);
// Changes Nico Laum (Power and Cadence) Sensor.SensorData.Builder batteryLevel = Sensor.SensorData.newBuilder()
Sensor.SensorData.Builder power = Sensor.SensorData.newBuilder()
.setValue(buffer[11]) .setValue(buffer[11])
.setState(Sensor.SensorState.SENDING); .setState(Sensor.SensorState.SENDING);
Sensor.SensorData.Builder cadence = Sensor.SensorData.newBuilder() Sensor.SensorData.Builder cadence = Sensor.SensorData.newBuilder()
@@ -53,7 +52,7 @@ public class ZephyrMessageParser implements MessageParser {
Sensor.SensorDataSet sds = Sensor.SensorDataSet sds =
Sensor.SensorDataSet.newBuilder() Sensor.SensorDataSet.newBuilder()
.setCreationTime(System.currentTimeMillis()) .setCreationTime(System.currentTimeMillis())
.setPower(power) .setBatteryLevel(batteryLevel)
.setHeartRate(heartrate) .setHeartRate(heartrate)
.setCadence(cadence) .setCadence(cadence)
.build(); .build();