mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NO.1 F1: Display settings. 

Set time format and distance units.
master
protomors 2017-09-30 18:25:32 +03:00 committed by Andreas Shimokawa
parent 6f358ff722
commit 7b78003ba1
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java
View File

@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.no1f1;
import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattCharacteristic;
import android.net.Uri; import android.net.Uri;
import android.text.format.DateFormat;
import android.widget.Toast; import android.widget.Toast;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -388,11 +389,23 @@ public class No1F1Support extends AbstractBTLEDeviceSupport {
}); });
// display settings // display settings
builder.write(ctrlCharacteristic, new byte[]{ byte[] displayBytes = new byte[]{
No1F1Constants.CMD_DISPLAY_SETTINGS, No1F1Constants.CMD_DISPLAY_SETTINGS,
0x01, // 1 - display distance in kilometers, 2 - in miles 0x00, // 1 - display distance in kilometers, 2 - in miles
0x01 // 1 - display 24-hour clock, 2 - for 12-hour with AM/PM 0x00 // 1 - display 24-hour clock, 2 - for 12-hour with AM/PM
}); };
String units = GBApplication.getPrefs().getString("measurement_system", getContext().getString(R.string.p_unit_metric));
if (units.equals(getContext().getString(R.string.p_unit_metric))) {
displayBytes[1] = 1;
} else {
displayBytes[1] = 2;
}
if (DateFormat.is24HourFormat(getContext())) {
displayBytes[2] = 1;
} else {
displayBytes[2] = 2;
}
builder.write(ctrlCharacteristic, displayBytes);
// heart rate measurement mode // heart rate measurement mode
builder.write(ctrlCharacteristic, new byte[]{ builder.write(ctrlCharacteristic, new byte[]{
@ -553,7 +566,7 @@ public class No1F1Support extends AbstractBTLEDeviceSupport {
for (int i = 0; i < samples.size(); i++) { for (int i = 0; i < samples.size(); i++) {
samples.get(i).setDeviceId(deviceId); samples.get(i).setDeviceId(deviceId);
samples.get(i).setUserId(userId); samples.get(i).setUserId(userId);
if (samples.get(i).getRawIntensity()<7) if (samples.get(i).getRawIntensity() < 7)
samples.get(i).setRawKind(ActivityKind.TYPE_DEEP_SLEEP); samples.get(i).setRawKind(ActivityKind.TYPE_DEEP_SLEEP);
else else
samples.get(i).setRawKind(ActivityKind.TYPE_LIGHT_SLEEP); samples.get(i).setRawKind(ActivityKind.TYPE_LIGHT_SLEEP);
@ -643,16 +656,15 @@ public class No1F1Support extends AbstractBTLEDeviceSupport {
} }
private void handleRealtimeHeartRateData(byte[] data) { private void handleRealtimeHeartRateData(byte[] data) {
if (data.length==2) if (data.length == 2) {
{ if (data[1] == (byte) 0x11)
if (data[1]==(byte) 0x11)
LOG.info("Heart rate measurement started."); LOG.info("Heart rate measurement started.");
else else
LOG.info("Heart rate measurement stopped."); LOG.info("Heart rate measurement stopped.");
return; return;
} }
// Check if data is valid. Otherwise ignore sample. // Check if data is valid. Otherwise ignore sample.
if (data[2]==0) { if (data[2] == 0) {
No1F1ActivitySample sample = new No1F1ActivitySample(); No1F1ActivitySample sample = new No1F1ActivitySample();
sample.setTimestamp((int) (GregorianCalendar.getInstance().getTimeInMillis() / 1000L)); sample.setTimestamp((int) (GregorianCalendar.getInstance().getTimeInMillis() / 1000L));
sample.setHeartRate(data[3] & 0xff); sample.setHeartRate(data[3] & 0xff);