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

Display fw2 as GPS for Amazfit Bip

master
Andreas Shimokawa 2017-08-29 23:12:28 +02:00
parent c946ef5201
commit 32c03013ce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
View File

@ -61,6 +61,7 @@ public class GBDevice implements Parcelable {
private static final String DEVINFO_HW_VER = "HW: "; private static final String DEVINFO_HW_VER = "HW: ";
private static final String DEVINFO_FW_VER = "FW: "; private static final String DEVINFO_FW_VER = "FW: ";
private static final String DEVINFO_HR_VER = "HR: "; private static final String DEVINFO_HR_VER = "HR: ";
private static final String DEVINFO_GPS_VER = "GPS: ";
private static final String DEVINFO_ADDR = "ADDR: "; private static final String DEVINFO_ADDR = "ADDR: ";
private static final String DEVINFO_ADDR2 = "ADDR2: "; private static final String DEVINFO_ADDR2 = "ADDR2: ";
private String mName; private String mName;
@ -165,7 +166,7 @@ public class GBDevice implements Parcelable {
} }
/** /**
* Sets the second firmware version, typically the heart rate firmware version * Sets the second firmware version (HR or GPS or other component)
* @param firmwareVersion2 * @param firmwareVersion2
*/ */
public void setFirmwareVersion2(String firmwareVersion2) { public void setFirmwareVersion2(String firmwareVersion2) {
@ -445,7 +446,12 @@ public class GBDevice implements Parcelable {
result.add(new GenericItem(DEVINFO_FW_VER, mFirmwareVersion)); result.add(new GenericItem(DEVINFO_FW_VER, mFirmwareVersion));
} }
if (mFirmwareVersion2 != null) { if (mFirmwareVersion2 != null) {
result.add(new GenericItem(DEVINFO_HR_VER, mFirmwareVersion2)); // FIXME: thats ugly
if (mDeviceType == DeviceType.AMAZFITBIP) {
result.add(new GenericItem(DEVINFO_GPS_VER, mFirmwareVersion2));
} else {
result.add(new GenericItem(DEVINFO_HR_VER, mFirmwareVersion2));
}
} }
if (mAddress != null) { if (mAddress != null) {
result.add(new GenericItem(DEVINFO_ADDR, mAddress)); result.add(new GenericItem(DEVINFO_ADDR, mAddress));