demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-02-05 05:24:12 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Moyoung: Support syncing historical HR measurements

Browse Source
This commit is contained in:
Arjan Schrijver 2024-08-30 21:37:33 +02:00
parent 6a790c8b2c
commit ba41e16420
2 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/FetchDataOperation.java
View File

@ -64,6 +64,7 @@ public class FetchDataOperation extends AbstractBTLEOperation<MoyoungDeviceSuppo
getSupport().sendPacket(builder, MoyoungPacketOut.buildPacket(getSupport().getMtu(), MoyoungConstants.CMD_SYNC_PAST_SLEEP_AND_STEP, new byte[] { MoyoungConstants.ARG_SYNC_DAY_BEFORE_YESTERDAY_STEPS })); getSupport().sendPacket(builder, MoyoungPacketOut.buildPacket(getSupport().getMtu(), MoyoungConstants.CMD_SYNC_PAST_SLEEP_AND_STEP, new byte[] { MoyoungConstants.ARG_SYNC_DAY_BEFORE_YESTERDAY_STEPS }));
builder.read(getCharacteristic(MoyoungConstants.UUID_CHARACTERISTIC_STEPS)); builder.read(getCharacteristic(MoyoungConstants.UUID_CHARACTERISTIC_STEPS));
getSupport().sendPacket(builder, MoyoungPacketOut.buildPacket(getSupport().getMtu(), MoyoungConstants.CMD_QUERY_MOVEMENT_HEART_RATE, new byte[] { })); getSupport().sendPacket(builder, MoyoungPacketOut.buildPacket(getSupport().getMtu(), MoyoungConstants.CMD_QUERY_MOVEMENT_HEART_RATE, new byte[] { }));
getSupport().sendPacket(builder, MoyoungPacketOut.buildPacket(getSupport().getMtu(), MoyoungConstants.CMD_QUERY_PAST_HEART_RATE_1, new byte[] { 0x00 }));
builder.queue(getQueue()); builder.queue(getQueue());
updateProgressAndCheckFinish(); updateProgressAndCheckFinish();

60
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/MoyoungDeviceSupport.java
View File

@ -49,6 +49,7 @@ import de.greenrobot.dao.query.QueryBuilder;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.Logging; import nodomain.freeyourgadget.gadgetbridge.Logging;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.HeartRateUtils;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
@ -334,6 +335,12 @@ public class MoyoungDeviceSupport extends AbstractBTLEDeviceSupport {
} }
} }
if (packetType == MoyoungConstants.CMD_QUERY_PAST_HEART_RATE_1)
{
handleHeartRateHistory(payload);
return true;
}
if (packetType == MoyoungConstants.CMD_NOTIFY_PHONE_OPERATION) if (packetType == MoyoungConstants.CMD_NOTIFY_PHONE_OPERATION)
{ {
byte operation = payload[0]; byte operation = payload[0];
@ -709,8 +716,57 @@ public class MoyoungDeviceSupport extends AbstractBTLEDeviceSupport {
} }
} }
public void handleStepsHistory(int daysAgo, byte[] data, boolean isRealtime) private void handleHeartRateHistory(byte[] data) {
{ final int packetIndex = data[0];
final int daysAgo = Math.floorDiv(packetIndex, 4);
final int startHour = (packetIndex % 4) * 6; // There are 6 hours of data in every packet
final ArrayList<MoyoungHeartRateSample> hrSamples = new ArrayList<>();
final Calendar cal = Calendar.getInstance();
cal.add(Calendar.DAY_OF_MONTH, -daysAgo);
cal.set(Calendar.SECOND, 0);
int index = 1;
for (int hour=startHour; hour<startHour+6; hour++) {
cal.set(Calendar.HOUR_OF_DAY, hour);
for (int minute=0; minute<60; minute+=5) {
cal.set(Calendar.MINUTE, minute);
int hr = data[index] & 0xff;
if (HeartRateUtils.getInstance().isValidHeartRateValue(hr)) {
MoyoungHeartRateSample sample = new MoyoungHeartRateSample();
sample.setTimestamp(cal.getTimeInMillis());
sample.setHeartRate(hr);
hrSamples.add(sample);
LOG.info("Parsed HR sample: {}", sample);
}
index++;
}
}
try (DBHandler dbHandler = GBApplication.acquireDB()) {
MoyoungHeartRateSampleProvider sampleProvider = new MoyoungHeartRateSampleProvider(getDevice(), dbHandler.getDaoSession());
Long userId = DBHelper.getUser(dbHandler.getDaoSession()).getId();
Long deviceId = DBHelper.getDevice(getDevice(), dbHandler.getDaoSession()).getId();
for (MoyoungHeartRateSample sample : hrSamples) {
sample.setDeviceId(deviceId);
sample.setUserId(userId);
}
sampleProvider.addSamples(hrSamples);
} catch (Exception e) {
LOG.error("Error acquiring database for recording heart rate samples", e);
}
// Request next batch
if (packetIndex >= 7) return; // 8 packets = 2 days, the maximum
try {
TransactionBuilder builder = performInitialized("FetchHROperation");
sendPacket(builder, MoyoungPacketOut.buildPacket(getMtu(), MoyoungConstants.CMD_QUERY_PAST_HEART_RATE_1, new byte[]{(byte) (packetIndex+1)}));
builder.queue(getQueue());
} catch (IOException e) {
LOG.error("Failed sending HR history request packet: ", e);
}
}
public void handleStepsHistory(int daysAgo, byte[] data, boolean isRealtime) {
if (data.length != 9) if (data.length != 9)
throw new IllegalArgumentException(); throw new IllegalArgumentException();