demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

igpsport: Get battery level from factory command

Browse Source 
* basic deserialization implementation
* battery level set
* fw2 version set to bootloader version
This commit is contained in:
Vitaliy Tomin
2026-05-13 23:33:24 +02:00
committed by José Rebelo
parent 30dd491dfc
commit a42b4e1944
1 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java
+53 -3
View File
@@ -5,6 +5,8 @@ import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.content.Intent;
import com.google.protobuf.InvalidProtocolBufferException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,10 +140,10 @@ public class IGPSportDeviceSupport extends AbstractBTLEDeviceSupport {
Factory.factory_msg.Builder factoryBuilder = Factory.factory_msg.newBuilder();
factoryBuilder.setServiceType(Common.service_type_index.enum_SERVICE_TYPE_INDEX_FACTORY);
factoryBuilder.setFactoryOperateType(Factory.FACTORY_OPERATE_TYPE.enum_FACTORY_OPERATE_TYPE_SN_GET);
byte[] factoryGetSNdata = craftData((byte)factoryBuilder.getServiceType().getNumber(), (byte)0xff, (byte)factoryBuilder.getFactoryOperateType().getNumber(), factoryBuilder.build().toByteArray());
factoryBuilder.setFactoryOperateType(Factory.FACTORY_OPERATE_TYPE.enum_FACTORY_OPERATE_TYPE_BATTARY_GET);
byte[] factoryGetBatterydata = craftData((byte)factoryBuilder.getServiceType().getNumber(), (byte)0xff, (byte)factoryBuilder.getFactoryOperateType().getNumber(), factoryBuilder.build().toByteArray());
builder.write(writeCharacteristic, factoryGetSNdata);
builder.write(writeCharacteristic, factoryGetBatterydata);
@@ -166,9 +168,57 @@ public class IGPSportDeviceSupport extends AbstractBTLEDeviceSupport {
LOG.info("Characteristic changed UUID: " + characteristicUUID);
LOG.info("Characteristic changed value: " + GB.hexdump(characteristic.getValue()));
byte[] data = characteristic.getValue();
if (data[0] != IGPSportConstants.DATA_HEADER) {
LOG.info("FitPro, packet not starting with 0x01: " + data[0] + "other message types not implemented yet");
return false;
}
if (data != null && data.length > 20) {
byte mainService = data[1];
byte mainOperation = data[4];
int dataSize = data[8] + (data[7] << 8);
byte[] pbData = new byte[dataSize];
System.arraycopy(data, 20, pbData, 0, dataSize);
try {
switch (mainService) {
case Common.service_type_index.enum_SERVICE_TYPE_INDEX_FACTORY_VALUE:
handleFactoryData(pbData);
break;
case Common.service_type_index.enum_SERVICE_TYPE_INDEX_FIRMWARE_VALUE:
handleFirmwareData(pbData);
break;
}
} catch (InvalidProtocolBufferException e) {
throw new RuntimeException(e);
}
}
return false;
}
public void handleFactoryData(byte[] data) throws InvalidProtocolBufferException {
Factory.factory_msg factoryMsg = Factory.factory_msg.parseFrom(data);
if (factoryMsg.hasBattaryMsg()) {
gbDevice.setBatteryLevel(factoryMsg.getBattaryMsg().getPowerPercent());
}
}
public void handleFirmwareData(byte[] data) throws InvalidProtocolBufferException {
Firmware.firmware_msg firmwareMsg = Firmware.firmware_msg.parseFrom(data);
if (firmwareMsg.hasFirmwareDataMsg()) {
Firmware.firmware_data_message fwDataMsg = firmwareMsg.getFirmwareDataMsg();
if (fwDataMsg.hasBleBootFirmwareVer()) {
gbDevice.setFirmwareVersion2(String.valueOf(fwDataMsg.getBleBootFirmwareVer()));
}
}
}
public static byte[] craftData(byte mainService, byte secondService, byte command, byte[] data) {
// 010C14FF02FFFF00064A 01FFFFFFFFFFFFFFFFF0 080C10141802
byte[] result = new byte[IGPSportConstants.DATA_TEMPLATE.length + data.length];