MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-25 01:55:50 +01:00
Code Releases Wiki Activity

A few additions and changes for Xiaomi Workouts

Browse Source
This commit is contained in:
AndrewP 2024-11-29 22:40:33 +01:00 committed by José Rebelo
parent 4f30648886
commit b5edfd8c17
3 changed files with 76 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,11 +197,15 @@ public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
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_OUTDOOR_WALKING_V1(Type.SPORTS, 0x02),
SPORTS_TREADMILL(Type.SPORTS, 0x03), // TODO
SPORTS_OUTDOOR_CYCLING_V2(Type.SPORTS, 0x06), // TODO
SPORTS_INDOOR_CYCLING(Type.SPORTS, 0x07), SPORTS_INDOOR_CYCLING(Type.SPORTS, 0x07),
SPORTS_FREESTYLE(Type.SPORTS, 0x08), SPORTS_FREESTYLE(Type.SPORTS, 0x08),
SPORTS_POOL_SWIMMING(Type.SPORTS, 0x09), SPORTS_POOL_SWIMMING(Type.SPORTS, 0x09),
SPORTS_HIIT(Type.SPORTS, 0x10), SPORTS_HIIT(Type.SPORTS, 0x10),
SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B), SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B),
SPORTS_ROWING(Type.SPORTS, 0x0D), // TODO
SPORTS_ROPESKIPPING(Type.SPORTS, 0x0E), // TODO
SPORTS_OUTDOOR_WALKING_V2(Type.SPORTS, 0x16), SPORTS_OUTDOOR_WALKING_V2(Type.SPORTS, 0x16),
SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17), SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17),
; ;

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

@ -192,7 +192,8 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
parser = getIndoorCyclingParser(fileId); parser = getIndoorCyclingParser(fileId);
break; break;
case SPORTS_FREESTYLE: case SPORTS_FREESTYLE:
summary.setActivityKind(ActivityKind.STRENGTH_TRAINING.getCode()); summary.setActivityKind(ActivityKind.EXERCISE.getCode());
// summary.setActivityKind(ActivityKind.STRENGTH_TRAINING.getCode());
parser = getFreestyleParser(fileId); parser = getFreestyleParser(fileId);
break; break;
case SPORTS_POOL_SWIMMING: case SPORTS_POOL_SWIMMING:
@ -200,12 +201,13 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
parser = getPoolSwimmingParser(fileId); parser = getPoolSwimmingParser(fileId);
break; break;
case SPORTS_HIIT: case SPORTS_HIIT:
summary.setActivityKind(ActivityKind.EXERCISE.getCode()); summary.setActivityKind(ActivityKind.HIIT.getCode());
// summary.setActivityKind(ActivityKind.EXERCISE.getCode());
parser = getHiitParser(fileId); parser = getHiitParser(fileId);
break; break;
case SPORTS_ELLIPTICAL: case SPORTS_ELLIPTICAL:
summary.setActivityKind(ActivityKind.ELLIPTICAL_TRAINER.getCode()); summary.setActivityKind(ActivityKind.ELLIPTICAL_TRAINER.getCode());
// TODO parser = getEllipticalParser(fileId);
break; break;
case SPORTS_OUTDOOR_WALKING_V2: case SPORTS_OUTDOOR_WALKING_V2:
parser = getOutdoorWalkingV2Parser(fileId); parser = getOutdoorWalkingV2Parser(fileId);
@ -230,7 +232,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
final int version = fileId.getVersion(); final int version = fileId.getVersion();
final int headerSize; final int headerSize;
switch (version) { switch (version) {
case 5: case 5: // for Smart Band 8 Active
headerSize = 3; headerSize = 3;
break; break;
case 8: case 8:
@ -253,25 +255,37 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
builder.addByte(HR_MAX, UNIT_BPM); builder.addByte(HR_MAX, UNIT_BPM);
builder.addByte(HR_MIN, UNIT_BPM); builder.addByte(HR_MIN, UNIT_BPM);
if (version == 5) { if (version == 5) {
// for Smart Band 8 Active
builder.addUnknown(7); builder.addUnknown(7);
builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS);
builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
// builder.addUnknown(23);
} else { } else {
builder.addUnknown(6); builder.addUnknown(6);
builder.addFloat(TRAINING_EFFECT_AEROBIC, UNIT_NONE); builder.addFloat(TRAINING_EFFECT_AEROBIC, UNIT_NONE);
builder.addUnknown(1); builder.addUnknown(1);
builder.addUnknown(1); builder.addUnknown(1);
builder.addShort(RECOVERY_TIME, UNIT_HOURS); builder.addShort(RECOVERY_TIME, UNIT_HOURS);
builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS); }
builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS); builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS);
builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS); builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS); builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS); builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
if (version == 5) {
builder.addUnknown(11);
// TODO: next byte is FreestyleType?
// indoor cycling 0x07
// freestyle 0x08
// yoga 0x0c
// HIIT 0x10
// stair climbing 0x2d
// core training 0x2f
// flexibility 0x30
// pilates 0x31
// stretching 0x33
// strength 0x34
// aerobics 0x36
// roller skating 0xca
builder.addUnknown(1); // FREESTYLE_TYPE
builder.addUnknown(1);
} else {
builder.addUnknown(2); builder.addUnknown(2);
builder.addUnknown(4); builder.addUnknown(4);
builder.addFloat(TRAINING_EFFECT_ANAEROBIC, UNIT_NONE); builder.addFloat(TRAINING_EFFECT_ANAEROBIC, UNIT_NONE);
@ -394,7 +408,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
final int version = fileId.getVersion(); final int version = fileId.getVersion();
final int headerSize; final int headerSize;
switch (version) { switch (version) {
case 1: case 1: // for Smart Band 8 Active
headerSize = 5; headerSize = 5;
break; break;
case 4: case 4:
@ -408,7 +422,6 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
LOG.warn("Unable to parse workout summary version {}", fileId.getVersion()); LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
return null; return null;
} }
final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder(); final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
builder.setHeaderSize(headerSize); builder.setHeaderSize(headerSize);
builder.addShort(XIAOMI_WORKOUT_TYPE, XIAOMI_WORKOUT_TYPE); builder.addShort(XIAOMI_WORKOUT_TYPE, XIAOMI_WORKOUT_TYPE);
@ -420,12 +433,11 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
builder.addUnknown(2); builder.addUnknown(2);
builder.addShort(CALORIES_BURNT, UNIT_KCAL); builder.addShort(CALORIES_BURNT, UNIT_KCAL);
if (version == 1) { if (version == 1) {
// for Smart Band 8 Active
builder.addInt(PACE_MAX, UNIT_SECONDS_PER_KM); builder.addInt(PACE_MAX, UNIT_SECONDS_PER_KM);
builder.addInt(PACE_MIN, UNIT_SECONDS_PER_KM); builder.addInt(PACE_MIN, UNIT_SECONDS_PER_KM);
builder.addUnknown(4); builder.addUnknown(4);
builder.addInt(STEPS, UNIT_STEPS); builder.addInt(STEPS, UNIT_STEPS);
builder.addUnknown(2); // MAX_STEPS_PER_MINUTE, Short? builder.addUnknown(2); // MAX_STEPS_PER_MINUTE, UNIT_STEPS_PER_MINUTE
builder.addByte(HR_AVG, UNIT_BPM); builder.addByte(HR_AVG, UNIT_BPM);
builder.addByte(HR_MAX, UNIT_BPM); builder.addByte(HR_MAX, UNIT_BPM);
builder.addByte(HR_MIN, UNIT_BPM); builder.addByte(HR_MIN, UNIT_BPM);
@ -435,7 +447,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS); builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS); builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS); builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
// builder.addUnknown(22); builder.addUnknown(21);
} else { } else {
if (version >= 5) { if (version >= 5) {
builder.addInt(PACE_AVG_SECONDS_KM, UNIT_SECONDS_PER_KM); builder.addInt(PACE_AVG_SECONDS_KM, UNIT_SECONDS_PER_KM);
@ -632,4 +644,39 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
return builder.build(); return builder.build();
} }
@Nullable
private XiaomiSimpleActivityParser getEllipticalParser(final XiaomiActivityFileId fileId) {
final int version = fileId.getVersion();
final int headerSize;
switch (version) {
case 3:
headerSize = 4;
break;
default:
LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
return null;
}
final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
builder.setHeaderSize(headerSize);
builder.addInt(TIME_START, UNIT_UNIX_EPOCH_SECONDS);
builder.addInt(TIME_END, UNIT_UNIX_EPOCH_SECONDS);
builder.addInt(ACTIVE_SECONDS, UNIT_SECONDS);
builder.addShort(CALORIES_BURNT, UNIT_KCAL);
builder.addInt(STEPS, UNIT_STEPS);
builder.addUnknown(2); // MAX_STEPS_PER_MINUTE, UNIT_STEPS_PER_MINUTE
builder.addByte(HR_AVG, UNIT_BPM);
builder.addByte(HR_MAX, UNIT_BPM);
builder.addByte(HR_MIN, UNIT_BPM);
builder.addUnknown(7);
builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS);
builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
builder.addUnknown(20);
return builder.build();
}
} }

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

@ -104,11 +104,14 @@ public class XiaomiSimpleActivityParser {
summary.setActivityKind(ActivityKind.OUTDOOR_RUNNING.getCode()); summary.setActivityKind(ActivityKind.OUTDOOR_RUNNING.getCode());
break; break;
case 2: case 2:
summary.setActivityKind(ActivityKind.OUTDOOR_WALKING.getCode()); summary.setActivityKind(ActivityKind.WALKING.getCode());
break; break;
case 6: case 6:
summary.setActivityKind(ActivityKind.OUTDOOR_CYCLING.getCode()); summary.setActivityKind(ActivityKind.OUTDOOR_CYCLING.getCode());
break; break;
case 15:
summary.setActivityKind(ActivityKind.OUTDOOR_WALKING.getCode());
break;
default: default:
summary.setActivityKind(ActivityKind.UNKNOWN.getCode()); summary.setActivityKind(ActivityKind.UNKNOWN.getCode());
} }