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

Zepp OS BTBR: Acks, protocol version, and improved ping handling

Browse Source
This commit is contained in:
José Rebelo
2025-04-26 18:08:28 +01:00
parent 8805473a30
commit 023e8bc631
5 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedEncoder.java
+3 -2
View File
@@ -115,7 +115,7 @@ public class Huami2021ChunkedEncoder {
flags |= 0x08;
}
if (count == 0) {
flags |= 0x01;
flags |= 0x01; // first chunk
int i = 4;
if (extended_flags) {
i++;
@@ -128,7 +128,8 @@ public class Huami2021ChunkedEncoder {
chunk[i] = (byte) ((type >> 8) & 0xff);
}
if (remaining <= maxChunkLength) {
flags |= 0x06; // last chunk?
flags |= 0x02; // last chunk
flags |= 0x04; // needs ack
}
chunk[0] = 0x03;
chunk[1] = flags;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsBtbrSupport.java
+28 -10
View File
@@ -22,6 +22,7 @@ import android.location.Location;
import android.net.Uri;
import android.os.Bundle;
import android.util.SparseArray;
import android.widget.Toast;
import org.apache.commons.lang3.RandomUtils;
import org.slf4j.Logger;
@@ -34,6 +35,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards.LoyaltyCard;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -107,6 +109,7 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
@Override
public void dispose() {
zeppOsSupport.dispose();
super.dispose();
}
@Override
@@ -137,6 +140,7 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
final byte cmd = packetBuffer.get();
final byte seqNum = packetBuffer.get();
// TODO check seqNum
seqNumRx = seqNum;
final int length = packetBuffer.getShort();
if (packetBuffer.remaining() < length + 3) {
@@ -190,7 +194,10 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
builder.write(buf.array());
}
protected void write(final TransactionBuilder builder, final UUID characteristic, final byte[] value) {
protected void write(final TransactionBuilder builder,
final UUID characteristic,
final byte[] value,
final boolean requestAck) {
final Short channel = characteristicToChannel.get(characteristic);
if (channel == null) {
LOG.error("Unknown characteristic {}", characteristic);
@@ -199,7 +206,7 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
final ByteBuffer buf = ByteBuffer.allocate(value.length + 4).order(ByteOrder.LITTLE_ENDIAN);
buf.put(sessionNumber);
buf.putShort(channel);
buf.put((byte) 0); // TODO request ack?
buf.put((byte) (requestAck ? 1 : 0));
buf.put(value);
write(builder, CMD_CHANNEL_DATA, buf.array());
}
@@ -211,7 +218,10 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
case CMD_CHANNELS_RET: {
final int version = buf.get() & 0xff; // ?
if (version > 1) {
// TODO warn and disconnect
LOG.error("Protocol version {} is not supported", version);
GB.toast(getContext(), "Unsupported protocol version " + version, Toast.LENGTH_LONG, GB.WARN);
GBApplication.deviceService(getDevice()).disconnect();
return;
}
final int numCharacteristics = buf.getShort();
LOG.debug("Got channels version={}, numCharacteristics={}", version, numCharacteristics);
@@ -235,14 +245,12 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
case CMD_SESSION_START_ACK: {
final int nonce = buf.getInt();
if (nonce != sessionNonce) {
LOG.error("Got unexpected session nonce {}, expected {}", nonce, sessionNonce);
// TODO reconnect?
LOG.warn("Got unexpected session nonce {}, expected {}", nonce, sessionNonce);
return;
}
final int status = buf.get() & 0xff;
if (status != 1) {
LOG.error("Got unexpected status {}", status);
// TODO reconnect?
return;
}
sessionNumber = buf.get();
@@ -290,13 +298,14 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
final UUID uuid = channelToCharacteristic.get(channel);
if (uuid == null) {
LOG.error("Channel {} does not match any known characteristic", channel);
return;
}
zeppOsSupport.onCharacteristicChanged(uuid, dataPayload);
if (mustAck != 0) {
// TODO ack
//final TransactionBuilder builder = createTransactionBuilder("ack");
//write(builder, CMD_SESSION_START, BLETypeConversions.fromUint32(sessionNonce));
//builder.queue(getQueue());
// untested, based on what we see in the watch->phone ack when requested
final TransactionBuilder builder = createTransactionBuilder("channel ack");
write(builder, CMD_CHANNEL_ACK, new byte[]{session, seqNumRx, 0x01 /* ok */, 0x00 /* ? */});
builder.queue(getQueue());
}
return;
}
@@ -315,11 +324,20 @@ public class ZeppOsBtbrSupport extends AbstractBTBRDeviceSupport implements Zepp
final byte unk2 = buf.get(); // 0
if (session != sessionNumber) {
LOG.warn("Got ping for unknown session {}, expected {}", session, sessionNumber);
return;
}
LOG.debug("Got ping, session={}, status={}, unk1={}, unk2={}", session, status, unk1, unk2);
final TransactionBuilder builder = createTransactionBuilder("pong");
write(builder, CMD_PONG, new byte[]{session, 0x01, 0x00, 0x00});
builder.queue(getQueue());
// When we send a ping, watch replies with a pong. However, we never actually saw it happen
// in the other direction, and sending the pong is not enough. The official app will
// constantly request the apps list every once in a while.
// Send an actual data packet to try and keep it alive when we get a btbr ping.
zeppOsSupport.sendPing();
return;
}
case CMD_PONG: {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsBtbrTransactionBuilder.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class ZeppOsBtbrTransactionBuilder implements ZeppOsTransactionBuilder {
@Override
public void write(final UUID characteristic, final byte[] arr) {
mSupport.write(mBuilder, characteristic, arr);
mSupport.write(mBuilder, characteristic, arr, false);
}
@Override
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
+5 -1
View File
@@ -319,7 +319,11 @@ public class ZeppOsSupport extends AbstractDeviceSupport
@Override
public void onTestNewFunction() {
voiceMemosService.requestList();
}
public void sendPing() {
connectionService.sendPing();
}
@Override
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsConnectionService.java
+9 -5
View File
@@ -31,8 +31,8 @@ public class ZeppOsConnectionService extends AbstractZeppOsService {
private static final byte CMD_MTU_REQUEST = 0x01;
private static final byte CMD_MTU_RESPONSE = 0x02;
private static final byte CMD_UNKNOWN_3 = 0x03;
private static final byte CMD_UNKNOWN_4 = 0x04;
private static final byte CMD_PING = 0x03;
private static final byte CMD_PONG = 0x04;
public ZeppOsConnectionService(final ZeppOsSupport support) {
super(support, true);
@@ -51,10 +51,10 @@ public class ZeppOsConnectionService extends AbstractZeppOsService {
LOG.info("Device announced MTU change: {}", mtu);
getSupport().setMtu(mtu);
return;
case CMD_UNKNOWN_3:
case CMD_PING:
// Some ping? Band sometimes sends 0x03, phone replies with 0x04
LOG.info("Got unknown 3, replying with unknown 4");
write("respond connection unknown 4", CMD_UNKNOWN_4);
LOG.info("Got ping, replying with pong");
write("connection pong reply", CMD_PONG);
return;
}
@@ -64,4 +64,8 @@ public class ZeppOsConnectionService extends AbstractZeppOsService {
public void requestMTU(final ZeppOsTransactionBuilder builder) {
write(builder, CMD_MTU_REQUEST);
}
public void sendPing() {
write("send connection ping", CMD_PING);
}
}