forked from Blendman974/faceclaw
Move framePb to send-time
This commit is contained in:
1 parent
6d693d13b6
commit
b82019617f
4 files changed
+34
-50
No files matched your search
@@ -76,6 +76,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
private ConnectionOptions connectionOptions = new ConnectionOptions();
|
||||
private final BleMagicPool magicPool = new BleMagicPool();
|
||||
private MessageBuilder messageBuilder = new MessageBuilder(magicPool);
|
||||
private int nextTransportSeq = 0x40;
|
||||
private int nextMapSessionId = 0;
|
||||
private int nextImageUpdateId = 1;
|
||||
private int lastShutdownAckMagic = 0;
|
||||
@@ -708,10 +709,16 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
|
||||
String writeAddress = message.isLeftArmMessage ? leftAddress : rightAddress;
|
||||
List<byte[]> frames = BleProtocol.framePb(
|
||||
message.message,
|
||||
message.sid,
|
||||
message.flag,
|
||||
nextTransportSeq++
|
||||
);
|
||||
boolean result = bleManager.writeFrames(
|
||||
writeAddress,
|
||||
BleProtocol.WRITE_CHAR_UUID,
|
||||
message.frames,
|
||||
frames,
|
||||
ConnectionOptions.WRITE_TYPE,
|
||||
ConnectionOptions.WRITE_TIMEOUT_MS
|
||||
);
|
||||
|
||||
@@ -43,8 +43,9 @@ public class BleProtocol {
|
||||
// App-launch message. Protobuf contents come from a capture (done in g2-kit-unofficial)
|
||||
// so the actual meaning of most fields isn't known. The standard protobuf
|
||||
// wire format still lets us identify field numbers, wire types, and lengths.
|
||||
public static final byte[] PRELUDE_F5872_PAYLOAD = buildPreludeF5872Payload();
|
||||
public static final byte[] PRELUDE_F5872 =
|
||||
framePb(buildPreludeF5872Payload(), SID_APP_LAUNCH, FLAG_REQUEST, 0x92).getFirst();
|
||||
framePb(PRELUDE_F5872_PAYLOAD, SID_APP_LAUNCH, FLAG_REQUEST, 0x92).getFirst();
|
||||
|
||||
private static byte[] buildPreludeF5872Payload() {
|
||||
byte[] field4 = encodeMessageField(3,
|
||||
|
||||
+18
-44
@@ -1,5 +1,4 @@
|
||||
package com.faceclaw.app;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class MessageBuilder {
|
||||
private static final int ACK_TIMEOUT_MS = 3_500;
|
||||
@@ -7,7 +6,6 @@ public class MessageBuilder {
|
||||
private static final int WARMUP_FRAGMENT_TIMEOUT_MS = 3_000;
|
||||
|
||||
private BleMagicPool magicPool;
|
||||
private int nextTransportSeq = 0x40;
|
||||
|
||||
public MessageBuilder(BleMagicPool magicPool) {
|
||||
this.magicPool = magicPool;
|
||||
@@ -17,8 +15,9 @@ public class MessageBuilder {
|
||||
return new OutboundMessage(
|
||||
"prelude", "prelude",
|
||||
BleProtocol.PRELUDE_ACK_SID,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
BleProtocol.PRELUDE_ACK_MAGIC,
|
||||
CollectionUtils.singletonList(Arrays.copyOf(BleProtocol.PRELUDE_F5872, BleProtocol.PRELUDE_F5872.length)),
|
||||
BleProtocol.PRELUDE_F5872_PAYLOAD,
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
@@ -31,13 +30,9 @@ public class MessageBuilder {
|
||||
"shutdown",
|
||||
"shutdown mode=" + exitMode,
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildShutdown(magic, exitMode),
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildShutdown(magic, exitMode),
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
@@ -50,12 +45,9 @@ public class MessageBuilder {
|
||||
"warmup",
|
||||
"warmup " + tile.name + "#" + fragment.index,
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildImageRawData(tile, sessionId, bmp.length, fragment, magic),
|
||||
BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildImageRawData(tile, sessionId, bmp.length, fragment, magic),
|
||||
WARMUP_FRAGMENT_TIMEOUT_MS,
|
||||
-1,
|
||||
leftArm
|
||||
@@ -68,12 +60,9 @@ public class MessageBuilder {
|
||||
"image",
|
||||
"image " + plan.tile.name + "#" + fragment.index,
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildImageRawData(plan.tile, plan.sessionId, plan.bmp.length, fragment, magic),
|
||||
BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildImageRawData(plan.tile, plan.sessionId, plan.bmp.length, fragment, magic),
|
||||
ACK_TIMEOUT_MS,
|
||||
plan.tileIndex,
|
||||
leftArm
|
||||
@@ -86,13 +75,9 @@ public class MessageBuilder {
|
||||
"audio-control",
|
||||
enable ? "G2 mic enable" : "G2 mic disable",
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildAudioControl(magic, enable),
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildAudioControl(magic, enable),
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
@@ -105,13 +90,9 @@ public class MessageBuilder {
|
||||
"create-layout",
|
||||
"create-layout",
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildCreateMixedImagePage(magic, tiles),
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildCreateMixedImagePage(magic, tiles),
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
@@ -124,13 +105,9 @@ public class MessageBuilder {
|
||||
"startup-text-probe",
|
||||
"startup text probe",
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildDashboardTextUpgrade(magic),
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildDashboardTextUpgrade(magic),
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
@@ -143,8 +120,9 @@ public class MessageBuilder {
|
||||
"heartbeat",
|
||||
"heartbeat",
|
||||
BleProtocol.SID_EVENHUB,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(BleProtocol.buildHeartbeat(magic), BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, nextTransportSeq++),
|
||||
BleProtocol.buildHeartbeat(magic),
|
||||
HEARTBEAT_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
@@ -157,13 +135,9 @@ public class MessageBuilder {
|
||||
"battery",
|
||||
"battery",
|
||||
BleProtocol.SID_UI_SETTING,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
magic,
|
||||
BleProtocol.framePb(
|
||||
BleProtocol.buildSettingsQuery(magic),
|
||||
BleProtocol.SID_UI_SETTING,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
nextTransportSeq++
|
||||
),
|
||||
BleProtocol.buildSettingsQuery(magic),
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
false
|
||||
|
||||
+6
-4
@@ -1,12 +1,13 @@
|
||||
package com.faceclaw.app;
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
public final class OutboundMessage {
|
||||
final String kind;
|
||||
final String label;
|
||||
final int sid;
|
||||
final int flag;
|
||||
final int magic;
|
||||
final List<byte[]> frames;
|
||||
final byte[] message;
|
||||
final int ackTimeoutMs;
|
||||
final int tileIndex;
|
||||
final boolean isLeftArmMessage;
|
||||
@@ -21,12 +22,13 @@ public final class OutboundMessage {
|
||||
Runnable onAck;
|
||||
Runnable onTimeout;
|
||||
|
||||
OutboundMessage(String kind, String label, int sid, int magic, List<byte[]> frames, int ackTimeoutMs, int tileIndex, boolean isLeftArmMessage) {
|
||||
OutboundMessage(String kind, String label, int sid, int flag, int magic, byte[] message, int ackTimeoutMs, int tileIndex, boolean isLeftArmMessage) {
|
||||
this.kind = kind;
|
||||
this.label = label;
|
||||
this.sid = sid;
|
||||
this.flag = flag;
|
||||
this.magic = magic;
|
||||
this.frames = frames;
|
||||
this.message = message == null ? new byte[0] : Arrays.copyOf(message, message.length);
|
||||
this.ackTimeoutMs = ackTimeoutMs;
|
||||
this.tileIndex = tileIndex;
|
||||
this.isLeftArmMessage = isLeftArmMessage;
|
||||
|
||||
Reference in new issue
Block a user