MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-12 02:45:49 +01:00
Code Releases Wiki Activity

Lefun: Implement heart rate test

Browse Source
This commit is contained in:
Yukai Li 2020-10-05 03:31:30 -06:00 committed by Gitea
parent d161415046
commit 3d108d9d11
3 changed files with 96 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunConstants.java
View File

@ -75,11 +75,6 @@ public class LefunConstants {
public static final int PPG_TYPE_BLOOD_OXYGEN = 2;
public static final int PPG_TYPE_COUNT = 3;
// Extended DB types
public static final int DB_SAMPLE_TYPE_PPG = 1;
public static final int DB_SAMPLE_TYPE_SLEEP_DAY = 2;
public static final int DB_SAMPLE_TYPE_SLEEP_PERIODS = 3;
// DB activity kinds
public static final int DB_ACTIVITY_KIND_UNKNOWN = 0;
public static final int DB_ACTIVITY_KIND_ACTIVITY = 1;

59
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
View File

@ -43,11 +43,11 @@ import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.GetActivityDataCommand;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.GetPpgDataCommand;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.GetSleepDataCommand;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.PpgResultCommand;
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
import nodomain.freeyourgadget.gadgetbridge.entities.LefunActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.LefunActivitySampleDao;
import nodomain.freeyourgadget.gadgetbridge.entities.LefunBiometricSample;
import nodomain.freeyourgadget.gadgetbridge.entities.LefunBiometricSampleDao;
import nodomain.freeyourgadget.gadgetbridge.entities.LefunSleepSample;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
@ -71,6 +71,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests.GetPp
import nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests.GetSleepDataRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests.Request;
import nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests.SetTimeRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests.StartPpgRequest;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
@ -237,7 +238,17 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
@Override
public void onHeartRateTest() {
try {
TransactionBuilder builder = performInitialized(StartPpgRequest.class.getSimpleName());
StartPpgRequest request = new StartPpgRequest(this, builder);
request.setPpgType(LefunConstants.PPG_TYPE_HEART_RATE);
request.perform();
inProgressRequests.add(request);
performConnected(builder.getTransaction());
} catch (IOException e) {
GB.toast(getContext(), "Failed to start heart rate test", Toast.LENGTH_SHORT,
GB.ERROR, e);
}
}
@Override
@ -334,7 +345,7 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
}
}
if (handleAsynchronousResponse(data))
if (handleAsynchronousResponse(commandId, data))
return true;
logMessageContent(data);
@ -350,11 +361,27 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
return super.onCharacteristicChanged(gatt, characteristic);
}
private boolean handleAsynchronousResponse(byte[] data) {
private boolean handleAsynchronousResponse(byte commandId, byte[] data) {
// Assume data already checked for correct response code and length
switch (commandId) {
case LefunConstants.CMD_PPG_RESULT:
return handleAsynchronousPpgResult(data);
}
return false;
}
private boolean handleAsynchronousPpgResult(byte[] data) {
try {
PpgResultCommand cmd = new PpgResultCommand();
cmd.deserialize(data);
handlePpgData(cmd);
return true;
} catch (IllegalArgumentException e) {
LOG.error("Failed to handle response", e);
return false;
}
}
public void completeInitialization() {
gbDevice.setState(GBDevice.State.INITIALIZED);
gbDevice.sendDeviceUpdateIntent(getContext());
@ -411,17 +438,14 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
}
}
public void handlePpgData(GetPpgDataCommand command) {
byte[] ppgData = command.getPpgData();
private void handlePpgData(int timestamp, int ppgType, byte[] ppgData) {
int ppgData0 = ppgData[0] & 0xff;
int ppgData1 = ppgData.length > 1 ? ppgData[1] & 0xff : 0;
try (DBHandler handler = GBApplication.acquireDB()) {
DaoSession session = handler.getDaoSession();
int timestamp = dateToTimestamp(command.getYear(), command.getMonth(), command.getDay(),
command.getHour(), command.getMinute(), command.getSecond());
if (command.getPpgType() == LefunConstants.PPG_TYPE_HEART_RATE) {
if (ppgType == LefunConstants.PPG_TYPE_HEART_RATE) {
LefunActivitySample sample = getActivitySample(session, timestamp);
if (sample == null) {
sample = new LefunActivitySample(timestamp,
@ -438,7 +462,7 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
LefunBiometricSample bioSample = new LefunBiometricSample(timestamp,
DBHelper.getDevice(getDevice(), session).getId());
bioSample.setUserId(DBHelper.getUser(session).getId());
bioSample.setType(command.getPpgType());
bioSample.setType(ppgType);
bioSample.setValue1(ppgData0);
bioSample.setValue2(ppgData1);
session.getLefunBiometricSampleDao().insertOrReplace(bioSample);
@ -447,6 +471,21 @@ public class LefunDeviceSupport extends AbstractBTLEDeviceSupport {
}
}
public void handlePpgData(GetPpgDataCommand command) {
int timestamp = dateToTimestamp(command.getYear(), command.getMonth(), command.getDay(),
command.getHour(), command.getMinute(), command.getSecond());
int ppgType = command.getPpgType();
byte[] ppgData = command.getPpgData();
handlePpgData(timestamp, ppgType, ppgData);
}
public void handlePpgData(PpgResultCommand command) {
int timestamp = (int) (Calendar.getInstance().getTimeInMillis() / 1000);
int ppgType = command.getPpgType();
byte[] ppgData = command.getPpgData();
handlePpgData(timestamp, ppgType, ppgData);
}
public void handleSleepData(GetSleepDataCommand command) {
try (DBHandler handler = GBApplication.acquireDB()) {
DaoSession session = handler.getDaoSession();

47
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/StartPpgRequest.java Normal file
View File

@ -0,0 +1,47 @@
package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.FindDeviceCommand;
import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.StartPpgSensingCommand;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.LefunDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.OperationStatus;
public class StartPpgRequest extends Request {
public StartPpgRequest(LefunDeviceSupport support, TransactionBuilder builder) {
super(support, builder);
}
int ppgType;
public int getPpgType() {
return ppgType;
}
public void setPpgType(int ppgType) {
this.ppgType = ppgType;
}
@Override
public byte[] createRequest() {
StartPpgSensingCommand cmd = new StartPpgSensingCommand();
cmd.setPpgType(ppgType);
return cmd.serialize();
}
@Override
public int getCommandId() {
return LefunConstants.CMD_PPG_START;
}
@Override
public void handleResponse(byte[] data) {
StartPpgSensingCommand cmd = new StartPpgSensingCommand();
cmd.deserialize(data);
if (!cmd.isSetSuccess() || cmd.getPpgType() != ppgType)
reportFailure("Could not start PPG sensing");
operationStatus = OperationStatus.FINISHED;
}
}