demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 17:11:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Xiaomi: Fix outdoor walking parsing on some watches

Browse Source
This commit is contained in:
José Rebelo 2023-12-29 19:54:37 +00:00
parent e14b2fc382
commit 1907912bd2
2 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
View File

@ -195,9 +195,10 @@ public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
ACTIVITY_SLEEP_STAGES(Type.ACTIVITY, 0x03), ACTIVITY_SLEEP_STAGES(Type.ACTIVITY, 0x03),
ACTIVITY_SLEEP(Type.ACTIVITY, 0x08), ACTIVITY_SLEEP(Type.ACTIVITY, 0x08),
SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01), SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
SPORTS_OUTDOOR_WALKING_V1(Type.SPORTS, 0x02),
SPORTS_FREESTYLE(Type.SPORTS, 0x08), SPORTS_FREESTYLE(Type.SPORTS, 0x08),
SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B), SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B),
SPORTS_OUTDOOR_WALKING(Type.SPORTS, 0x16), SPORTS_OUTDOOR_WALKING_V2(Type.SPORTS, 0x16),
SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17), SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17),
; ;

67
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
View File

@ -94,14 +94,16 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf); final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
switch (fileId.getSubtype()) { switch (fileId.getSubtype()) {
case SPORTS_OUTDOOR_WALKING_V1:
return parseOutdoorWalkingV1(summary, fileId, buf);
case SPORTS_OUTDOOR_RUNNING: case SPORTS_OUTDOOR_RUNNING:
return parseOutdoorRunning(summary, fileId, buf); return parseOutdoorRunning(summary, fileId, buf);
case SPORTS_FREESTYLE: case SPORTS_FREESTYLE:
return parseFreestyle(summary, fileId, buf); return parseFreestyle(summary, fileId, buf);
case SPORTS_ELLIPTICAL: case SPORTS_ELLIPTICAL:
return parseElliptical(summary, fileId, buf); return parseElliptical(summary, fileId, buf);
case SPORTS_OUTDOOR_WALKING: case SPORTS_OUTDOOR_WALKING_V2:
return parseOutdoorWalking(summary, fileId, buf); return parseOutdoorWalkingV2(summary, fileId, buf);
case SPORTS_OUTDOOR_CYCLING: case SPORTS_OUTDOOR_CYCLING:
return parseOutdoorCycling(summary, fileId, buf); return parseOutdoorCycling(summary, fileId, buf);
} }
@ -135,7 +137,66 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
return summary; return summary;
} }
private BaseActivitySummary parseOutdoorWalking(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) { private BaseActivitySummary parseOutdoorWalkingV1(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
final JSONObject summaryData = new JSONObject();
final int version = fileId.getVersion();
final int headerSize;
switch (version) {
case 4:
headerSize = 4;
break;
default:
LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
return null;
}
final byte[] header = new byte[headerSize];
buf.get(header);
summary.setActivityKind(ActivityKind.TYPE_WALKING);
final int startTime = buf.getInt();
final int endTime = buf.getInt();
// We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
// to find it. They also seem to match.
//summary.setStartTime(new Date(startTime * 1000L));
summary.setEndTime(new Date(endTime * 1000L));
final int duration = buf.getInt();
addSummaryData(summaryData, "activeSeconds", duration, "seconds");
final int distance = buf.getInt();
addSummaryData(summaryData, "distanceMeters", distance, "meters");
final int calories = buf.getShort();
addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
final int maxPace = buf.getInt();
addSummaryData(summaryData, "maxPace", maxPace, "seconds_m");
final int minPace = buf.getInt();
addSummaryData(summaryData, "minPace", minPace, "seconds_m");
final int unknown1 = buf.getInt(); // ?
final int steps = buf.getInt();
addSummaryData(summaryData, "steps", steps, "steps_unit");
final int unknown6 = buf.getShort(); // pace?
final int averageHR = buf.get() & 0xff;
final int maxHR = buf.get() & 0xff;
final int minHR = buf.get() & 0xff;
addSummaryData(summaryData, "averageHR", averageHR, "bpm");
addSummaryData(summaryData, "maxHR", maxHR, "bpm");
addSummaryData(summaryData, "minHR", minHR, "bpm");
summary.setSummaryData(summaryData.toString());
return summary;
}
private BaseActivitySummary parseOutdoorWalkingV2(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
final JSONObject summaryData = new JSONObject(); final JSONObject summaryData = new JSONObject();
final int version = fileId.getVersion(); final int version = fileId.getVersion();