nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mi2: Experimental support for activity recognition

This commit is contained in:
cpfeiffer 2016-12-02 00:22:06 +01:00
parent da297ecd8b
commit 44f74270df
3 changed files with 109 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
View File

@ -1,25 +1,47 @@
package nodomain.freeyourgadget.gadgetbridge.devices.miband; package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import java.util.List;
import de.greenrobot.dao.query.QueryBuilder;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySampleDao;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
public class MiBand2SampleProvider extends AbstractMiBandSampleProvider { public class MiBand2SampleProvider extends AbstractMiBandSampleProvider {
// these are all bogus atm (come from Mi1) // these come from Mi1
public static final int TYPE_DEEP_SLEEP = 11; // public static final int TYPE_LIGHT_SLEEP = 5;
public static final int TYPE_LIGHT_SLEEP = 5; // public static final int TYPE_ACTIVITY = -1;
public static final int TYPE_ACTIVITY = -1; // public static final int TYPE_UNKNOWN = -1;
public static final int TYPE_UNKNOWN = -1; // public static final int TYPE_NONWEAR = 3;
public static final int TYPE_NONWEAR = 3; // public static final int TYPE_CHARGING = 6;
public static final int TYPE_CHARGING = 6;
// appears to be a measurement problem resulting in type = 10 and intensity = 20, at least
// with fw 1.0.0.39
public static final int TYPE_IGNORE = 10;
// observed the following values so far: // observed the following values so far:
// 00 01 02 09 0a 0b 0c 10 11 // 00 01 02 09 0a 0b 0c 10 11
// 0 = same activity kind as before
// 1 = light activity walking?
// 3 = definitely non-wear
// 9 = probably deep sleep, definitely some kind of sleep
// 10 = ignore, except for hr (if valid)
// 11 = probably light sleep
// 12 = definitely wake up
// 17 = definitely not sleep related
public static final int TYPE_UNSET = -1;
public static final int TYPE_NO_CHANGE = 0;
public static final int TYPE_ACTIVITY = 1;
public static final int TYPE_NONWEAR = 3;
public static final int TYPE_CHARGING = 6;
public static final int TYPE_LIGHT_SLEEP = 9;
public static final int TYPE_DEEP_SLEEP = 11;
public static final int TYPE_WAKE_UP = 12;
// appears to be a measurement problem resulting in type = 10 and intensity = 20, at least with fw 1.0.0.39
public static final int TYPE_IGNORE = 10;
public MiBand2SampleProvider(GBDevice device, DaoSession session) { public MiBand2SampleProvider(GBDevice device, DaoSession session) {
super(device, session); super(device, session);
} }
@ -29,40 +51,88 @@ public class MiBand2SampleProvider extends AbstractMiBandSampleProvider {
return SampleProvider.PROVIDER_MIBAND2; return SampleProvider.PROVIDER_MIBAND2;
} }
@Override
protected List<MiBandActivitySample> getGBActivitySamples(int timestamp_from, int timestamp_to, int activityType) {
List<MiBandActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to, activityType);
postprocess(samples);
return samples;
}
/**
* "Temporary" runtime post processing of activity kinds.
* @param samples
*/
private void postprocess(List<MiBandActivitySample> samples) {
if (samples.isEmpty()) {
return;
}
int lastValidKind = determinePreviousValidActivityType(samples.get(0));
for (MiBandActivitySample sample : samples) {
int rawKind = sample.getRawKind();
switch (rawKind) {
case TYPE_IGNORE:
case TYPE_NO_CHANGE:
if (lastValidKind != TYPE_UNSET) {
sample.setRawKind(lastValidKind);
}
break;
default:
lastValidKind = rawKind;
break;
}
}
}
private int determinePreviousValidActivityType(MiBandActivitySample sample) {
QueryBuilder<MiBandActivitySample> qb = getSampleDao().queryBuilder();
qb.where(MiBandActivitySampleDao.Properties.DeviceId.eq(sample.getDeviceId()),
MiBandActivitySampleDao.Properties.UserId.eq(sample.getUserId()),
MiBandActivitySampleDao.Properties.Timestamp.lt(sample.getTimestamp()),
MiBandActivitySampleDao.Properties.RawKind.notIn(TYPE_IGNORE, TYPE_NO_CHANGE));
qb.limit(1);
List<MiBandActivitySample> result = qb.build().list();
if (result.size() > 0) {
return result.get(0).getRawKind();
}
return TYPE_UNSET;
}
@Override @Override
public int normalizeType(int rawType) { public int normalizeType(int rawType) {
switch (rawType) { switch (rawType) {
// case TYPE_DEEP_SLEEP: case TYPE_DEEP_SLEEP:
// return ActivityKind.TYPE_DEEP_SLEEP; return ActivityKind.TYPE_DEEP_SLEEP;
// case TYPE_LIGHT_SLEEP: case TYPE_LIGHT_SLEEP:
// return ActivityKind.TYPE_LIGHT_SLEEP; return ActivityKind.TYPE_LIGHT_SLEEP;
// case TYPE_ACTIVITY: case TYPE_ACTIVITY:
// return ActivityKind.TYPE_ACTIVITY; return ActivityKind.TYPE_ACTIVITY;
// case TYPE_NONWEAR: case TYPE_NONWEAR:
// return ActivityKind.TYPE_NOT_WORN; return ActivityKind.TYPE_NOT_WORN;
// case TYPE_CHARGING: case TYPE_CHARGING:
// return ActivityKind.TYPE_NOT_WORN; //I believe it's a safe assumption return ActivityKind.TYPE_NOT_WORN; //I believe it's a safe assumption
// case TYPE_IGNORE: case TYPE_IGNORE:
default: default:
// case TYPE_UNKNOWN: // fall through case TYPE_UNSET: // fall through
return ActivityKind.TYPE_UNKNOWN; return ActivityKind.TYPE_UNKNOWN;
} }
} }
@Override @Override
public int toRawActivityKind(int activityKind) { public int toRawActivityKind(int activityKind) {
// switch (activityKind) { switch (activityKind) {
// case ActivityKind.TYPE_ACTIVITY: case ActivityKind.TYPE_ACTIVITY:
// return TYPE_ACTIVITY; return TYPE_ACTIVITY;
// case ActivityKind.TYPE_DEEP_SLEEP: case ActivityKind.TYPE_DEEP_SLEEP:
// return TYPE_DEEP_SLEEP; return TYPE_DEEP_SLEEP;
// case ActivityKind.TYPE_LIGHT_SLEEP: case ActivityKind.TYPE_LIGHT_SLEEP:
// return TYPE_LIGHT_SLEEP; return TYPE_LIGHT_SLEEP;
// case ActivityKind.TYPE_NOT_WORN: case ActivityKind.TYPE_NOT_WORN:
// return TYPE_NONWEAR; return TYPE_NONWEAR;
// case ActivityKind.TYPE_UNKNOWN: // fall through case ActivityKind.TYPE_UNKNOWN: // fall through
// default: default:
return TYPE_UNKNOWN; return TYPE_UNSET;
// } }
} }
} }

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java
View File

@ -75,7 +75,7 @@ public class BLETypeConversions {
} }
// MiBand2: // MiBand2:
// year,year,month,dayofmonth,hour,minute,second,dayofweek,0,0,tz // year,year,month,dayofmonth,hour,minute
byte[] year = fromUint16(timestamp.get(Calendar.YEAR)); byte[] year = fromUint16(timestamp.get(Calendar.YEAR));
return new byte[] { return new byte[] {

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchActivityOperation.java
View File

@ -199,11 +199,9 @@ public class FetchActivityOperation extends AbstractMiBand2Operation {
throw new AssertionError("Unexpected activity array size: " + value); throw new AssertionError("Unexpected activity array size: " + value);
} }
for (int i = 1; i < len; i++) { for (int i = 1; i < len; i+=4) {
if (i % 4 == 1) { MiBandActivitySample sample = createSample(value[i], value[i + 1], value[i + 2], value[i + 3]);
MiBandActivitySample sample = createSample(value[i], value[i + 1], value[i + 2], value[i + 3]); samples.add(sample);
samples.add(sample);
}
} }
} }