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

Use data type constant instead of hardcoded value

This commit is contained in:
Daniele Gobbetti 2015-09-17 15:39:44 +02:00
parent 4e83742d6c
commit b73ff49681
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java
View File

@ -178,13 +178,14 @@ public class MiBandService {
*/ */
/* MODES: unknown /* MODES: probably related to the sample data structure
public static final MODE_REGULAR_DATA_LEN_BYTE = 0x0t;
public static final MODE_REGULAR_DATA_LEN_MINITE = 0x1t
*/ */
public static final byte MODE_REGULAR_DATA_LEN_BYTE = 0x0;
// was MODE_REGULAR_DATA_LEN_MINITE
public static final byte MODE_REGULAR_DATA_LEN_MINUTE = 0x1;
/* PROFILE: unknown /* PROFILE: unknown
public static final PROFILE_STATE_UNKNOWN:I = 0x0 public static final PROFILE_STATE_UNKNOWN:I = 0x0

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
View File

@ -111,14 +111,14 @@ public class FetchActivityOperation extends AbstractBTLEOperation<MiBandSupport>
// counter of all data held by the band // counter of all data held by the band
int totalDataToRead = (value[7] & 0xff) | ((value[8] & 0xff) << 8); int totalDataToRead = (value[7] & 0xff) | ((value[8] & 0xff) << 8);
totalDataToRead *= (dataType == 1) ? 3 : 1; totalDataToRead *= (dataType == MiBandService.MODE_REGULAR_DATA_LEN_MINUTE) ? 3 : 1;
// counter of this data block // counter of this data block
int dataUntilNextHeader = (value[9] & 0xff) | ((value[10] & 0xff) << 8); int dataUntilNextHeader = (value[9] & 0xff) | ((value[10] & 0xff) << 8);
dataUntilNextHeader *= (dataType == 1) ? 3 : 1; dataUntilNextHeader *= (dataType == MiBandService.MODE_REGULAR_DATA_LEN_MINUTE) ? 3 : 1;
// there is a total of totalDataToRead that will come in chunks (3 bytes per minute if dataType == 1), // there is a total of totalDataToRead that will come in chunks (3 bytes per minute if dataType == 1 (MiBandService.MODE_REGULAR_DATA_LEN_MINUTE)),
// these chunks are usually 20 bytes long and grouped in blocks // these chunks are usually 20 bytes long and grouped in blocks
// after dataUntilNextHeader bytes we will get a new packet of 11 bytes that should be parsed // after dataUntilNextHeader bytes we will get a new packet of 11 bytes that should be parsed
// as we just did // as we just did