1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-23 18:36:50 +01:00

Amazfit GTR: Also fix firmware flashing for the chinese(?) variant

This commit is contained in:
Andreas Shimokawa 2020-11-12 18:06:52 +01:00
parent 66bb6f694e
commit 5f85bba438
2 changed files with 8 additions and 3 deletions

View File

@ -7,7 +7,7 @@
* Amazfit Band 5: Allow enabling SpO2 menu * Amazfit Band 5: Allow enabling SpO2 menu
* Mi/Amazfit Band 5: Support shortcuts (right/left swipe) * Mi/Amazfit Band 5: Support shortcuts (right/left swipe)
* Amazfit GTS: Fix firmware flashing on Firmware >=0.1.1.16 * Amazfit GTS: Fix firmware flashing on Firmware >=0.1.1.16
* Amazfit GTR: Fix firmware flashing on Firmware >=1.3.7.16 * Amazfit GTR: Fix firmware flashing on Firmware >=1.3.7.16 or >=1.7.0.10
* Fossil Hybrid HR: Remove Android notifications when deleting them from the watch * Fossil Hybrid HR: Remove Android notifications when deleting them from the watch
* Fossil Hybrid HR: Enable rejecting calls on newer firmwares * Fossil Hybrid HR: Enable rejecting calls on newer firmwares
* Fossil Hybrid HR: Support hands calibration * Fossil Hybrid HR: Support hands calibration

View File

@ -39,7 +39,7 @@ public class AmazfitGTRSupport extends AmazfitGTSSupport {
@Override @Override
public UpdateFirmwareOperation createUpdateFirmwareOperation(Uri uri) { public UpdateFirmwareOperation createUpdateFirmwareOperation(Uri uri) {
Version version = new Version(gbDevice.getFirmwareVersion()); Version version = new Version(gbDevice.getFirmwareVersion());
if (version.compareTo(new Version("1.3.7.16")) >= 0) { if ((!isCH(version) && (version.compareTo(new Version("1.3.7.16")) >= 0)) || (version.compareTo(new Version("1.7.0.10")) >= 0)) {
return new UpdateFirmwareOperation2020(uri, this); return new UpdateFirmwareOperation2020(uri, this);
} }
@ -59,6 +59,11 @@ public class AmazfitGTRSupport extends AmazfitGTSSupport {
} }
private boolean is47mm(Version version) { private boolean is47mm(Version version) {
return version.compareTo(new Version("1.0.0.00")) >= 0; return (version.compareTo(new Version("1.0.0.00")) >= 0) && (version.compareTo(new Version("1.6.0.00")) < 0);
} }
private boolean isCH(Version version) { // chinese variant?
return version.compareTo(new Version("1.6.0.00")) >= 0;
}
} }