forked from Blendman974/faceclaw
Do message compression at the transport level, rather than in individual messages
This commit is contained in:
1 parent
33bfdcf1d1
commit
720f6af8f8
8 files changed
+224
-132
No files matched your search
@@ -266,6 +266,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
private final TextureCacheState textureCache = new TextureCacheState();
|
||||
|
||||
private final ArrayDeque<OutboundMessage> pendingMessages = new ArrayDeque<>();
|
||||
private final CfwTransport[] cfwTransports = { new CfwTransport(), new CfwTransport() };
|
||||
private final ArrayDeque<OutboundMessage> inFlightMessages = new ArrayDeque<>();
|
||||
private OutboundMessage prewrittenMessage;
|
||||
private List<byte[]> prewrittenFrames = Collections.emptyList();
|
||||
@@ -1661,12 +1662,19 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
lastIncomingAtMs = SystemClock.elapsedRealtime();
|
||||
for (OutboundMessage message : inFlightMessages) {
|
||||
String ingress = message.isLeftArmMessage ? leftAddress : rightAddress;
|
||||
if (address.equalsIgnoreCase(ingress) && message.acceptCfwAck(ack)) {
|
||||
lastAckAtMs = lastIncomingAtMs;
|
||||
resolveAckLocked(message, data);
|
||||
if (message.sid == CfwTransport.SID && address.equalsIgnoreCase(ingress) && message.magic == ack.streamId) {
|
||||
message.acceptCfwAck(ack);
|
||||
Log.i(TAG, "CFW " + (ack.nack ? "NACK" : "ACK") + " id=" + ack.streamId
|
||||
+ " ordinal=" + ack.messageId + " lens=" + ack.lens + " txseq=" + (data[2] & 255)
|
||||
+ " size=" + ack.size + " crc=" + ack.checksum
|
||||
+ " expected=" + message.message.length + "/" + message.cfwChecksum
|
||||
+ " ackedLenses=" + message.cfwAckLenses
|
||||
+ " ageMs=" + (lastIncomingAtMs - message.sentAtMs));
|
||||
message.ackPayload = Arrays.copyOf(data, data.length);
|
||||
break;
|
||||
}
|
||||
}
|
||||
drainCfwAcknowledgementsLocked();
|
||||
}
|
||||
interruptibleSleep.interrupt();
|
||||
return;
|
||||
@@ -1989,6 +1997,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
audioCaptureActive = false;
|
||||
faceclawWakePendingNonce = -1;
|
||||
cfwCleanupDelivered = false;
|
||||
for (CfwTransport transport : cfwTransports) transport.reset();
|
||||
lastCfwCleanupAckMagic = 0;
|
||||
lastFaceclawWakeLeaseQueuedAtMs = 0;
|
||||
lastFaceclawFramebufferLeaseQueuedAtMs = 0;
|
||||
@@ -2274,6 +2283,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
maybeFinishNoChangeDesiredFrame();
|
||||
|
||||
synchronized (lock) {
|
||||
drainCfwAcknowledgementsLocked();
|
||||
if (cfwCleanupDelivered) {
|
||||
/* Successful mode 11 must be the last Faceclaw write. Drop
|
||||
* anything a late external producer attempted to enqueue
|
||||
@@ -2301,11 +2311,36 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
if (!inFlightMessages.isEmpty()) {
|
||||
OutboundMessage oldest = inFlightMessages.peekFirst();
|
||||
List<OutboundMessage> replay = CfwMessageWindow.replayWindow(inFlightMessages, now);
|
||||
if (!replay.isEmpty()) {
|
||||
logLine("CFW recovery: replay " + replay.size()
|
||||
+ " unresolved message(s) from id=" + replay.get(0).magic);
|
||||
for (OutboundMessage candidate : replay) {
|
||||
if (candidate.cfwRetries >= CfwMessageWindow.MAX_RETRIES) {
|
||||
handleTransportFailure("CFW recovery retry limit");
|
||||
return 0;
|
||||
}
|
||||
logLine("CFW replay id=" + candidate.magic + " label=" + candidate.label
|
||||
+ " cause=" + (candidate.cfwRetryPending ? "NACK"
|
||||
: candidate.cfwAckLenses == CfwTransport.BOTH ? "ordered tail" : "missing ACK")
|
||||
+ " ackedLenses=" + candidate.cfwAckLenses
|
||||
+ " ageMs=" + (now - candidate.sentAtMs));
|
||||
inFlightMessages.remove(candidate);
|
||||
magicPool.release(candidate.sid, candidate.magic, candidate.label, "CFW replay");
|
||||
candidate.prepareCfwReplay(magicPool.allocate());
|
||||
}
|
||||
for (int i = replay.size() - 1; i >= 0; --i) pendingMessages.addFirst(replay.get(i));
|
||||
return 0;
|
||||
}
|
||||
if (oldest != null && oldest.ackDeadlineAtMs <= now) {
|
||||
Log.i(TAG, "message timed out: " + oldest.label);
|
||||
inFlightMessages.removeFirst();
|
||||
logLine("message timed out: " + oldest.label);
|
||||
logLine("message timed out: " + oldest.label + " sid=" + oldest.sid
|
||||
+ " id=" + oldest.magic + " ackedLenses=" + oldest.cfwAckLenses
|
||||
+ " ageMs=" + (now - oldest.sentAtMs));
|
||||
magicPool.release(oldest.sid, oldest.magic, oldest.label, "timeout");
|
||||
if (oldest.sid == CfwTransport.SID)
|
||||
cfwTransports[oldest.isLeftArmMessage ? 0 : 1].reset();
|
||||
handleAckTimeoutLocked(oldest);
|
||||
return 0;
|
||||
}
|
||||
@@ -2565,7 +2600,9 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
prewrittenMessage = null;
|
||||
prewrittenFrames = Collections.emptyList();
|
||||
} else if (message.sid == CfwTransport.SID) {
|
||||
frames = CfwTransport.frame(message.message, message.magic, CfwTransport.BOTH,
|
||||
if (message.cfwRetries > 0) cfwTransports[message.isLeftArmMessage ? 0 : 1].reset();
|
||||
frames = cfwTransports[message.isLeftArmMessage ? 0 : 1].encode(
|
||||
message.message, message.magic, CfwTransport.BOTH,
|
||||
bleManager.getNegotiatedMtu(writeAddress));
|
||||
} else {
|
||||
frames = BleProtocol.framePb(
|
||||
@@ -2594,6 +2631,8 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
}
|
||||
|
||||
if (!result && message.sid == CfwTransport.SID)
|
||||
cfwTransports[message.isLeftArmMessage ? 0 : 1].reset();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -2681,6 +2720,18 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
|
||||
|
||||
/** Also drain on the worker: a clear/timeout may have removed a blocking
|
||||
* head since the last notification. Fully ACKed controls must never reach
|
||||
* the generic timeout path just because no further BLE reply arrived. */
|
||||
private void drainCfwAcknowledgementsLocked() {
|
||||
while (true) {
|
||||
OutboundMessage first = CfwMessageWindow.acknowledgedHead(inFlightMessages);
|
||||
if (first == null) return;
|
||||
lastAckAtMs = SystemClock.elapsedRealtime();
|
||||
resolveAckLocked(first, first.ackPayload);
|
||||
}
|
||||
}
|
||||
|
||||
private void resolveAckLocked(int sid, int magic, byte[] pb) {
|
||||
Iterator<OutboundMessage> iterator = inFlightMessages.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
@@ -2994,7 +3045,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
commands.add(plan.payload);
|
||||
} else {
|
||||
// A noisy full frame can exceed the stream record limit. Repaint it
|
||||
// with independently decodable bands, never fragments of zlib data.
|
||||
// with independently decodable RLE bands below the decoded-message limit.
|
||||
commands.addAll(BleImageOptimizer.encodeFullFrameBands(
|
||||
plan.packed, plan.width, plan.height, nextImageFrameId));
|
||||
for (int i = 0; i < commands.size(); i++) {
|
||||
@@ -3730,6 +3781,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
lastFaceclawWakeLeaseQueuedAtMs = 0;
|
||||
faceclawWakeControlSentCount = 0;
|
||||
cfwCleanupDelivered = false;
|
||||
for (CfwTransport transport : cfwTransports) transport.reset();
|
||||
lastCfwCleanupAckMagic = 0;
|
||||
wearState = -1;
|
||||
displayedFingerprint = "";
|
||||
|
||||
+9
-41
@@ -1,11 +1,9 @@
|
||||
package com.faceclaw.app;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.zip.Deflater;
|
||||
import android.util.Log;
|
||||
|
||||
public final class BleImageOptimizer {
|
||||
@@ -79,7 +77,7 @@ public final class BleImageOptimizer {
|
||||
public final byte[] packed;
|
||||
public final int width;
|
||||
public final int height;
|
||||
final byte[] payload; // bytes actually streamed: mode-6 zlib(rle(4bpp))
|
||||
final byte[] payload; // bytes actually streamed: mode-6 rle(4bpp)
|
||||
final int sessionId;
|
||||
List<BleProtocol.ImageFragment> fragments = Collections.emptyList();
|
||||
|
||||
@@ -113,7 +111,7 @@ public final class BleImageOptimizer {
|
||||
* Build a mode-3 bounding-box incremental payload, or null when a full
|
||||
* update should be sent instead (frames not comparable, or the changed
|
||||
* region spans the whole screen). Wire format:
|
||||
* [3][left/4][top/2][width/4][height/2][fid_lo][fid_hi][zlib(rle(headerless 4bpp region))]
|
||||
* [3][left/4][top/2][width/4][height/2][fid_lo][fid_hi][rle(headerless 4bpp region)]
|
||||
* The region is top-down rows of the NEW frame, stride width/2 bytes. The
|
||||
* box is aligned so left/width are multiples of 4 pixels and top/height
|
||||
* multiples of 2 rows, letting each coordinate fit one byte and avoiding
|
||||
@@ -260,7 +258,7 @@ public final class BleImageOptimizer {
|
||||
|
||||
/**
|
||||
* Encode one CFW mode-3 rectangle delta:
|
||||
* [3][left/4][top/2][width/4][height/2][fid_lo][fid_hi][zlib(rle(box pixels))]
|
||||
* [3][left/4][top/2][width/4][height/2][fid_lo][fid_hi][rle(box pixels)]
|
||||
* left/width must be multiples of 4 (=> left>>1, width>>1 are whole bytes), top/
|
||||
* height multiples of 2. The box pixels are top-down rows of `next` (4bpp packed,
|
||||
* width>>1 bytes/row), run-length encoded before deflate. Shared by the single-bbox
|
||||
@@ -273,7 +271,7 @@ public final class BleImageOptimizer {
|
||||
for (int y = 0; y < boxHeight; y++) {
|
||||
System.arraycopy(next, (top + y) * stride + (left >> 1), region, y * regionStride, regionStride);
|
||||
}
|
||||
byte[] compressed = deflate(rleEncode(region));
|
||||
byte[] compressed = rleEncode(region);
|
||||
byte[] out = new byte[7 + compressed.length];
|
||||
out[0] = 3;
|
||||
out[1] = (byte) (left / 4);
|
||||
@@ -326,8 +324,7 @@ public final class BleImageOptimizer {
|
||||
}
|
||||
|
||||
// Break-even tuning for the rect splitter. Splitting adds ~15 fixed bytes per
|
||||
// rect (seglen + mode-3 header + fid + zlib framing) and loses cross-rect
|
||||
// dictionary sharing, so only split across gaps big enough to pay for that.
|
||||
// rect (seglen + mode-3 header + fid), so only split across gaps big enough to pay for that.
|
||||
// Gaps are in the changed-mask's native units: whole 4bpp bytes (2px) for
|
||||
// columns, rows for the vertical bands. Kept above the 4px/2px box alignment so
|
||||
// aligned rects never overlap.
|
||||
@@ -477,8 +474,8 @@ public final class BleImageOptimizer {
|
||||
}
|
||||
|
||||
/**
|
||||
* RLE- then zlib-compress headerless 4bpp pixels for CFW load_image_z mode 6.
|
||||
* Wire format: [6][zlib(rle(4bpp pixels))]. Always use mode 6: the logical
|
||||
* Run-length encode headerless 4bpp pixels for CFW load_image_z mode 6.
|
||||
* Wire format: [6][rle(4bpp pixels)]. Always use mode 6: the logical
|
||||
* image can be larger than its EvenHub carrier, so a raw BMP fallback would
|
||||
* carry dimensions the legacy container loader cannot accept.
|
||||
*/
|
||||
@@ -486,7 +483,7 @@ public final class BleImageOptimizer {
|
||||
if (packed == null || packed.length == 0) {
|
||||
return packed;
|
||||
}
|
||||
byte[] z = deflate(rleEncode(packed));
|
||||
byte[] z = rleEncode(packed);
|
||||
byte[] out = new byte[z.length + 1];
|
||||
out[0] = 6;
|
||||
System.arraycopy(z, 0, out, 1, z.length);
|
||||
@@ -495,7 +492,7 @@ public final class BleImageOptimizer {
|
||||
|
||||
/**
|
||||
* Run-length encode packed 4bpp pixels for CFW modes 3 and 6, whose payload is
|
||||
* zlib(rle(pixels)) rather than zlib(pixels). Runs are over the pixel NIBBLES of
|
||||
* RLE tokens; deflate belongs to the transport. Runs are over the pixel NIBBLES of
|
||||
* {@code pix} in wire order (high nibble = left pixel), including the pad nibble
|
||||
* that ends each row at odd widths — i.e. {@code pix} read as 2*length nibbles.
|
||||
* One token is:
|
||||
@@ -543,35 +540,6 @@ public final class BleImageOptimizer {
|
||||
return (i & 1) != 0 ? (b & 0x0f) : (b >> 4);
|
||||
}
|
||||
|
||||
// Level 6: BEST_COMPRESSION cost 18-109ms per frame on the BLE worker,
|
||||
// but BEST_SPEED inflated typical payloads from ~2.7KB past the 3800-byte
|
||||
// fragment boundary, adding a whole extra ack round trip (~350ms). The
|
||||
// default level keeps payloads under one fragment at about half the CPU.
|
||||
// One long-lived Deflater per thread: constructing one allocates and
|
||||
// initializes a native zlib stream, which is measurable at per-frame rates.
|
||||
private static final ThreadLocal<Deflater> DEFLATER =
|
||||
new ThreadLocal<Deflater>() {
|
||||
@Override protected Deflater initialValue() {
|
||||
return new Deflater(Deflater.DEFAULT_COMPRESSION);
|
||||
}
|
||||
};
|
||||
|
||||
private static byte[] deflate(byte[] data) {
|
||||
Deflater deflater = DEFLATER.get();
|
||||
try {
|
||||
deflater.setInput(data);
|
||||
deflater.finish();
|
||||
ByteArrayOutputStream out = new ByteArrayOutputStream(Math.max(64, data.length / 3));
|
||||
byte[] buf = new byte[4096];
|
||||
while (!deflater.finished()) {
|
||||
out.write(buf, 0, deflater.deflate(buf));
|
||||
}
|
||||
return out.toByteArray();
|
||||
} finally {
|
||||
deflater.reset();
|
||||
}
|
||||
}
|
||||
|
||||
public static final class ImageUpdateStats {
|
||||
final int paintMs;
|
||||
final int tileCount;
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.faceclaw.app;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/** Ordered completion and go-back-N recovery for the custom-message window. */
|
||||
final class CfwMessageWindow {
|
||||
// Flappy capture: p99 ACK 63ms, max 77ms. Leave room for full-frame
|
||||
// processing while recovering a lost reply well before the stock timeout.
|
||||
static final int ACK_TIMEOUT_MS = 500;
|
||||
static final int MAX_RETRIES = 3;
|
||||
|
||||
private CfwMessageWindow() {}
|
||||
|
||||
static OutboundMessage acknowledgedHead(Iterable<OutboundMessage> messages) {
|
||||
for (OutboundMessage message : messages) {
|
||||
if (message.sid != CfwTransport.SID) continue;
|
||||
return !message.cfwRetryPending && message.cfwAckLenses == CfwTransport.BOTH ? message : null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
static List<OutboundMessage> replayWindow(Iterable<OutboundMessage> messages, long nowMs) {
|
||||
List<OutboundMessage> replay = new ArrayList<>();
|
||||
boolean failed = false;
|
||||
for (OutboundMessage message : messages) {
|
||||
if (message.sid != CfwTransport.SID) continue;
|
||||
failed |= message.cfwRetryPending || (message.cfwAckLenses != CfwTransport.BOTH
|
||||
&& message.ackDeadlineAtMs > 0 && message.ackDeadlineAtMs <= nowMs);
|
||||
replay.add(message);
|
||||
}
|
||||
// A lost ACK, first fragment, or NACK can leave an older attempt
|
||||
// unresolved. Replaying only the named failure strands that older
|
||||
// attempt at the head until its timeout. Rewind the unresolved window.
|
||||
if (!failed) replay.clear();
|
||||
return replay;
|
||||
}
|
||||
}
|
||||
@@ -1,26 +1,79 @@
|
||||
package com.faceclaw.app;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.zip.Deflater;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/** Faceclaw/7 private length-prefixed stream, independent of EvenHub image framing. */
|
||||
/** Faceclaw/10 records: clear flags, wire length and decoded CRC; persistent zlib body. */
|
||||
public final class CfwTransport {
|
||||
public static final int SID = 0xf0;
|
||||
public static final int BOTH = 3;
|
||||
public static final int MAX_MESSAGE = 65535;
|
||||
private CfwTransport() {}
|
||||
public static final int COMPRESSED = 4, RESET_CONTEXT = 8;
|
||||
private final Deflater deflater = new Deflater();
|
||||
private boolean resetPending = true;
|
||||
private int previousLenses;
|
||||
|
||||
public CfwTransport() {}
|
||||
|
||||
public synchronized void reset() {
|
||||
deflater.reset();
|
||||
resetPending = true;
|
||||
previousLenses = 0;
|
||||
}
|
||||
|
||||
/** Compress only when writing, in exactly the order seen by the receiver. */
|
||||
public synchronized List<byte[]> encode(byte[] message, int streamId, int lenses, int mtu) {
|
||||
validate(message, streamId, lenses, mtu);
|
||||
if (previousLenses != lenses) reset();
|
||||
boolean reset = resetPending;
|
||||
deflater.setInput(message);
|
||||
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||
byte[] chunk = new byte[4096];
|
||||
int count;
|
||||
do {
|
||||
count = deflater.deflate(chunk, 0, chunk.length, Deflater.SYNC_FLUSH);
|
||||
out.write(chunk, 0, count);
|
||||
} while (count == chunk.length);
|
||||
byte[] body = out.toByteArray();
|
||||
int flags = lenses | COMPRESSED | (reset ? RESET_CONTEXT : 0);
|
||||
if (body.length == 0) flags &= ~COMPRESSED; // repeated empty sync flush
|
||||
if (body.length > MAX_MESSAGE) {
|
||||
// Incompressible maximum-size records still fit as raw records.
|
||||
// The attempted deflate advanced history: reset both ends before reuse.
|
||||
reset();
|
||||
body = message;
|
||||
flags = lenses | RESET_CONTEXT;
|
||||
} else {
|
||||
resetPending = false;
|
||||
previousLenses = lenses;
|
||||
}
|
||||
return frameRecord(body, crc(message), streamId, flags, mtu);
|
||||
}
|
||||
|
||||
private static void validate(byte[] message, int streamId, int lenses, int mtu) {
|
||||
if (message == null || message.length > MAX_MESSAGE || streamId < 0 || streamId > 255
|
||||
|| lenses < 1 || lenses > BOTH || mtu < 23 || mtu > 517)
|
||||
throw new IllegalArgumentException("invalid CFW stream parameters");
|
||||
}
|
||||
|
||||
/** One logical command per stream for now. Packets are bounded by actual ATT MTU. */
|
||||
public static List<byte[]> frame(byte[] message, int streamId, int lenses, int mtu) {
|
||||
if (message == null || message.length > MAX_MESSAGE || streamId < 0 || streamId > 255
|
||||
|| lenses < 1 || lenses > BOTH || mtu < 23 || mtu > 517) {
|
||||
throw new IllegalArgumentException("invalid CFW stream parameters");
|
||||
}
|
||||
validate(message, streamId, lenses, mtu);
|
||||
return frameRecord(message, crc(message), streamId, lenses | RESET_CONTEXT, mtu);
|
||||
}
|
||||
|
||||
private static List<byte[]> frameRecord(byte[] body, int checksum, int streamId, int flags, int mtu) {
|
||||
int lenses = flags & BOTH;
|
||||
int capacity = Math.min(252, mtu - 14);
|
||||
byte[] stream = new byte[message.length + 2];
|
||||
stream[0] = (byte) message.length;
|
||||
stream[1] = (byte) (message.length >>> 8);
|
||||
System.arraycopy(message, 0, stream, 2, message.length);
|
||||
byte[] stream = new byte[body.length + 5];
|
||||
stream[0] = (byte) flags;
|
||||
stream[1] = (byte) body.length;
|
||||
stream[2] = (byte) (body.length >>> 8);
|
||||
stream[3] = (byte) checksum;
|
||||
stream[4] = (byte) (checksum >>> 8);
|
||||
System.arraycopy(body, 0, stream, 5, body.length);
|
||||
List<byte[]> packets = new ArrayList<>();
|
||||
for (int offset = 0, index = 0; offset < stream.length; offset += capacity, index++) {
|
||||
int count = Math.min(capacity, stream.length - offset);
|
||||
@@ -58,14 +111,16 @@ public final class CfwTransport {
|
||||
public static Ack parseAck(byte[] packet) {
|
||||
if (packet == null || packet.length != 19 || (packet[0] & 255) != 0xaa
|
||||
|| packet[1] != 0x12 || packet[3] != 11 || packet[4] != 1 || packet[5] != 1
|
||||
|| (packet[6] & 255) != SID || packet[7] != 0 || packet[8] != 1
|
||||
|| (packet[6] & 255) != SID || packet[7] != 0 || (packet[8] != 1 && packet[8] != 3)
|
||||
|| (packet[12] != 1 && packet[12] != 2)
|
||||
|| crc(packet, 8, 9) != u16(packet, 17)) return null;
|
||||
return new Ack(packet[9] & 255, u16(packet, 10), packet[12], u16(packet, 13), u16(packet, 15));
|
||||
return new Ack(packet[8] == 3, packet[9] & 255, u16(packet, 10), packet[12], u16(packet, 13), u16(packet, 15));
|
||||
}
|
||||
public static final class Ack {
|
||||
public final boolean nack;
|
||||
public final int streamId, messageId, lens, size, checksum;
|
||||
Ack(int streamId, int messageId, int lens, int size, int checksum) {
|
||||
Ack(boolean nack, int streamId, int messageId, int lens, int size, int checksum) {
|
||||
this.nack = nack;
|
||||
this.streamId = streamId; this.messageId = messageId; this.lens = lens;
|
||||
this.size = size; this.checksum = checksum;
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ public class MessageBuilder {
|
||||
throw new IllegalArgumentException("CFW message exceeds uint16 length");
|
||||
int streamId = magicPool.allocate();
|
||||
return new OutboundMessage(kind, label, CfwTransport.SID, 0, streamId, payload,
|
||||
ACK_TIMEOUT_MS, tileIndex, leftArm);
|
||||
CfwMessageWindow.ACK_TIMEOUT_MS, tileIndex, leftArm);
|
||||
}
|
||||
|
||||
public OutboundMessage cfwCleanup(
|
||||
|
||||
+21
-6
@@ -6,13 +6,14 @@ public final class OutboundMessage {
|
||||
final String label;
|
||||
final int sid;
|
||||
final int flag;
|
||||
final int magic;
|
||||
int magic;
|
||||
final byte[] message;
|
||||
final int ackTimeoutMs;
|
||||
final int tileIndex;
|
||||
final boolean isLeftArmMessage;
|
||||
|
||||
int cfwAckLenses;
|
||||
int cfwAckLenses, cfwRetries;
|
||||
boolean cfwRetryPending;
|
||||
final int cfwChecksum;
|
||||
|
||||
int imageUpdateId;
|
||||
@@ -39,13 +40,27 @@ public final class OutboundMessage {
|
||||
this.isLeftArmMessage = isLeftArmMessage;
|
||||
}
|
||||
|
||||
/** Record only a matching processing ACK; completion requires both lenses. */
|
||||
/** NACK names this attempt's stream/message sequence, even without a decoded size. */
|
||||
boolean acceptCfwAck(CfwTransport.Ack ack) {
|
||||
if (ack == null || sid != CfwTransport.SID || magic != ack.streamId
|
||||
|| ack.messageId != 0 || message.length != ack.size || cfwChecksum != ack.checksum
|
||||
|| (ack.lens != 1 && ack.lens != 2)) return false;
|
||||
|| ack.messageId != 0 || (ack.lens != 1 && ack.lens != 2)) return false;
|
||||
if (ack.nack) {
|
||||
cfwRetryPending = true;
|
||||
return false;
|
||||
}
|
||||
if (message.length != ack.size || cfwChecksum != ack.checksum) return false;
|
||||
cfwAckLenses |= ack.lens;
|
||||
return cfwAckLenses == CfwTransport.BOTH;
|
||||
return !cfwRetryPending && cfwAckLenses == CfwTransport.BOTH;
|
||||
}
|
||||
|
||||
/** Replace an attempt atomically under the communicator lock. */
|
||||
void prepareCfwReplay(int streamId) {
|
||||
magic = streamId;
|
||||
++cfwRetries;
|
||||
cfwAckLenses = 0;
|
||||
cfwRetryPending = false;
|
||||
ackDeadlineAtMs = 0;
|
||||
ackPayload = new byte[0];
|
||||
}
|
||||
|
||||
void setImageUpdatePosition(int updateId, int messageNumber, int messageCount) {
|
||||
|
||||
@@ -26,7 +26,7 @@ export type FirmwareInfo = {
|
||||
};
|
||||
|
||||
/** The Faceclaw firmware revision this build of the app needs. */
|
||||
export const REQUIRED_FACECLAW_FIRMWARE_VERSION = 7;
|
||||
export const REQUIRED_FACECLAW_FIRMWARE_VERSION = 11;
|
||||
|
||||
const FACECLAW_PREFIX = "Faceclaw/";
|
||||
const LEGACY_PREFIX = "EVENCFW";
|
||||
|
||||
@@ -19,30 +19,30 @@ export type FirmwarePatchSet = {
|
||||
export const CFW_PATCH_SET: FirmwarePatchSet = {
|
||||
"base": "g2_2.2.9.22.bin",
|
||||
"baseSha256": "a03fbea9f68a9de6bc271daabb9f3a41c59053d1086622c76a4e990f829cc561",
|
||||
"outputSha256": "2c4ab57d2a8b3acbd7e756e2c4f671eb33f1af82c898e46edd6d475cae11afee",
|
||||
"outputSha256": "ed78d30cf1cfcd7fe783ec847bae024c0a92eede3a9a5c3154179f4e2910171a",
|
||||
"patches": [
|
||||
{
|
||||
"offset": 935280,
|
||||
"old": "fff717f8",
|
||||
"new": "65f3a1fd",
|
||||
"new": "64f371fb",
|
||||
"desc": "bl cfw_message_bridge_received (ordered private bridge delivery before worker pool)"
|
||||
},
|
||||
{
|
||||
"offset": 935628,
|
||||
"old": "fef769ff",
|
||||
"new": "65f3f3fc",
|
||||
"new": "64f3c3fa",
|
||||
"desc": "bl cfw_message_bridge_received (ordered private bridge delivery before worker pool)"
|
||||
},
|
||||
{
|
||||
"offset": 943818,
|
||||
"old": "fcf76aff",
|
||||
"new": "63f3f4fc",
|
||||
"new": "62f3c4fa",
|
||||
"desc": "bl cfw_message_bridge_received (ordered private bridge delivery before worker pool)"
|
||||
},
|
||||
{
|
||||
"offset": 1415004,
|
||||
"old": "fcf745f8",
|
||||
"new": "f0f277f8",
|
||||
"new": "eef20bfb",
|
||||
"desc": "bl cfw_receive_packet (private SID-f0 probe before TPL reassembly)"
|
||||
},
|
||||
{
|
||||
@@ -69,178 +69,142 @@ export const CFW_PATCH_SET: FirmwarePatchSet = {
|
||||
"new": "5ff43332",
|
||||
"desc": "reserve final 1 KiB of primary TLSF arena for CFW context anchor"
|
||||
},
|
||||
{
|
||||
"offset": 1524180,
|
||||
"old": "bdf82c10",
|
||||
"new": "40f24120",
|
||||
"desc": "container width <= 576"
|
||||
},
|
||||
{
|
||||
"offset": 1524380,
|
||||
"old": "bdf82e00",
|
||||
"new": "40f22111",
|
||||
"desc": "container height movw #0x121"
|
||||
},
|
||||
{
|
||||
"offset": 1524384,
|
||||
"old": "9128",
|
||||
"new": "8842",
|
||||
"desc": "container height cmp r0,r1"
|
||||
},
|
||||
{
|
||||
"offset": 1516784,
|
||||
"old": "70f775ff",
|
||||
"new": "d7f231f8",
|
||||
"desc": "bl snapshot_side @ 0x4ec0ee (shared image-complete helper)"
|
||||
},
|
||||
{
|
||||
"offset": 1516816,
|
||||
"old": "30d0",
|
||||
"new": "1cd0",
|
||||
"desc": "image-complete success -> immediate ACK (pipelining-safe)"
|
||||
},
|
||||
{
|
||||
"offset": 1222660,
|
||||
"old": "49f0daff",
|
||||
"new": "1ef3abfe",
|
||||
"desc": "bl image_deferred (deferred consumer -> FIFO restore + worker, both lenses)"
|
||||
},
|
||||
{
|
||||
"offset": 1242342,
|
||||
"old": "d4f790fb",
|
||||
"new": "1bf376fe",
|
||||
"new": "1af3eafb",
|
||||
"desc": "bl settings_send_wrapper (append caps field 100)"
|
||||
},
|
||||
{
|
||||
"offset": 1240038,
|
||||
"old": "f5f710f9",
|
||||
"new": "1bf3f2ff",
|
||||
"new": "1af396fd",
|
||||
"desc": "bl settings_decode_wrapper (Faceclaw lease field 101)"
|
||||
},
|
||||
{
|
||||
"offset": 939336,
|
||||
"old": "0bf02af9",
|
||||
"new": "65f369fa",
|
||||
"new": "64f30df8",
|
||||
"desc": "bl faceclaw_display_start @ 0x45f146 (fail-open wake takeover)"
|
||||
},
|
||||
{
|
||||
"offset": 939528,
|
||||
"old": "0bf0caf8",
|
||||
"new": "65f3d7fa",
|
||||
"new": "64f37bf8",
|
||||
"desc": "bl faceclaw_display_start_headup @ 0x45f206 (fail-open wake takeover)"
|
||||
},
|
||||
{
|
||||
"offset": 939016,
|
||||
"old": "10f096f8",
|
||||
"new": "67f3fdf8",
|
||||
"new": "65f335fd",
|
||||
"desc": "bl headup_gate (head-up sensor event -> EvenHub sys event 12 under lease)"
|
||||
},
|
||||
{
|
||||
"offset": 939036,
|
||||
"old": "fff765fb",
|
||||
"new": "65f3cdf9",
|
||||
"new": "63f3a1ff",
|
||||
"desc": "bl faceclaw_idle_input_gate (idle tap/long/release -> field-102 events 2/3/4)"
|
||||
},
|
||||
{
|
||||
"offset": 831036,
|
||||
"old": "1df057fc",
|
||||
"new": "81f3d9fa",
|
||||
"new": "7ff311ff",
|
||||
"desc": "bl gesture_press (Faceclaw lease gates event 9 vs stock UI event 8)"
|
||||
},
|
||||
{
|
||||
"offset": 831042,
|
||||
"old": "24f023f9",
|
||||
"new": "81f37afb",
|
||||
"new": "7ff3b2ff",
|
||||
"desc": "bl gesture_short_long (Faceclaw lease gates event 11 vs stock Menu path)"
|
||||
},
|
||||
{
|
||||
"offset": 831800,
|
||||
"old": "1df0d9fa",
|
||||
"new": "81f35ff9",
|
||||
"new": "7ff397fd",
|
||||
"desc": "bl gesture_release (source-qualified event 10 vs stock UI event 0x4a)"
|
||||
},
|
||||
{
|
||||
"offset": 1553752,
|
||||
"old": "7fb50600",
|
||||
"new": "cff22bbe",
|
||||
"new": "cef29fbb",
|
||||
"desc": "even_ai_display_ctrl entry -> conditional Faceclaw lease trampoline"
|
||||
},
|
||||
{
|
||||
"offset": 1047796,
|
||||
"old": "f6f7edff",
|
||||
"new": "45f3f1fc",
|
||||
"new": "45f315fd",
|
||||
"desc": "bl display_copy_hook @ 0x4798f2 (640x480 direct framebuffer)"
|
||||
},
|
||||
{
|
||||
"offset": 1048112,
|
||||
"old": "f6f74fff",
|
||||
"new": "45f353fc",
|
||||
"new": "45f377fc",
|
||||
"desc": "bl display_copy_hook @ 0x479a2e (640x480 direct framebuffer)"
|
||||
},
|
||||
{
|
||||
"offset": 1255404,
|
||||
"old": "d9f758ff",
|
||||
"new": "17f3e9ff",
|
||||
"new": "16f3bdfd",
|
||||
"desc": "bl faceclaw_send_wear_event @ 0x4ac3ea (outside onboarding)"
|
||||
},
|
||||
{
|
||||
"offset": 1255504,
|
||||
"old": "d9f726ff",
|
||||
"new": "17f3b7ff",
|
||||
"new": "16f38bfd",
|
||||
"desc": "bl faceclaw_send_wear_event @ 0x4ac44e (outside onboarding)"
|
||||
},
|
||||
{
|
||||
"offset": 1297700,
|
||||
"old": "65f0affd",
|
||||
"new": "0df33dfa",
|
||||
"new": "0cf319f8",
|
||||
"desc": "bl compass_decode_capture (sample-matched GAF diagnostics)"
|
||||
},
|
||||
{
|
||||
"offset": 1296176,
|
||||
"old": "fff759fc",
|
||||
"new": "0df3b3fd",
|
||||
"new": "0cf38ffb",
|
||||
"desc": "bl compass_report_event (stock UI + heading with diagnostics over BLE)"
|
||||
},
|
||||
{
|
||||
"offset": 4476518,
|
||||
"old": "",
|
||||
"new": "2de9f04f83b04ef66a674ff2a8454ff6a04a8b46ccf2ff07c2f229054ff6ff76cff6ff7a00244ff001080192029006e048f2c731c0f24501bff32f8f8847d5f80090bff35f8f2b68bff35f8f18466ff39600b0f1005f03d11868b84200f0cf804ff4587006f022fc002800f0d48051464218483182f8604382f8614382f8624382f8634382f8644382f8654382f8664382f8674382f8684382f8694382f86a4382f86b4382f86c4382f86d4382f86e4382f86f4382f8704382f8714382f8724382f8734382f8744382f8754382f8764382f8774382f8784382f8794382f87a4382f87b4382f87c4382f87d4382f87e4382f87f4382f8804382f8814382f8824382f8834382f8844382f8854382f8864382f8874382f8884382f8894382f88a4382f88b4382f88c4382f88d4382f88e4382f88f4382f8904382f8914382f8924382f8934382f8944382f8954382f8964382f8974382f8984382f8994382f89a4382f89b4382f89c4382f89d4382f89e4382f89f4382f8a04382f8a14382f8a24382f8a34382f8a44382f8a54382f8a64382f8a7437ff46caf076080f8ce80a0f8e060a0f8e260a0f8e460a0f8e660a0f8e860a0f8ea60a0f8ec60a0f8ee60a0f8f060a0f8f260a0f8f460a0f8f660a0f8f860a0f8fa60a0f8fc60a0f8fe6055e8001f49457ff424afbff35f8f45e8000121b155e8001f4945f8d019e70346019802994bea004700205a46c3f8347303b0bde8f04f04e04ff0ff3003b0bde8f08f2de9f04fa7b040f2030b4ef66a644ff2a8480546cff6807bccf2ff04c2f229084ff6ff7a00260127cde9021207e000bf48f2c731c0f24501bff32f8f8847d8f80090bff35f8fd8f80000bff35f8f00ea0b01b1f1005f03d10168a14200f0d2804ff4587006f012fb002800f0e5814ff6a041cff6ff7100bf4218483182f8606382f8616382f8626382f8636382f8646382f8656382f8666382f8676382f8686382f8696382f86a6382f86b6382f86c6382f86d6382f86e6382f86f6382f8706382f8716382f8726382f8736382f8746382f8756382f8766382f8776382f8786382f8796382f87a6382f87b6382f87c6382f87d6382f87e6382f87f6382f8806382f8816382f8826382f8836382f8846382f8856382f8866382f8876382f8886382f8896382f88a6382f88b6382f88c6382f88d6382f88e6382f88f6382f8906382f8916382f8926382f8936382f8946382f8956382f8966382f8976382f8986382f8996382f89a6382f89b6382f89c6382f89d6382f89e6382f89f6382f8a06382f8a16382f8a26382f8a36382f8a46382f8a56382f8a66382f8a7637ff46caf046080f8ce70a0f8e0a0a0f8e2a0a0f8e4a0a0f8e6a0a0f8e8a0a0f8eaa0a0f8eca0a0f8eea0a0f8f0a0a0f8f2a0a0f8f4a0a0f8f6a0a0f8f8a0a0f8faa0a0f8fca0a0f8fea058e8001f49457ff420afbff35f8f48e8000121b158e8001f4945f8d015e7d0f8387342f6f769c0f24409002fbff35f8f00f0038109f19a0238464ff0ff314ff0ff369047002840f0588143f67750c0f24f000195804700260596adf8186007e000bf48f2c731c0f24501bff32f8f8847d8f80050bff35f8fd8f80000bff35f8f00ea0b01b1f1005f03d10168a14200f0fc804ff4587006f006fa002800f0f4804ff6a041cff6ff7100bf4218483182f8606382f8616382f8626382f8636382f8646382f8656382f8666382f8676382f8686382f8696382f86a6382f86b6382f86c6382f86d6382f86e6382f86f6382f8706382f8716382f8726382f8736382f8746382f8756382f8766382f8776382f8786382f8796382f87a6382f87b6382f87c6382f87d6382f87e6382f87f6382f8806382f8816382f8826382f8836382f8846382f8856382f8866382f8876382f8886382f8896382f88a6382f88b6382f88c6382f88d6382f88e6382f88f6382f8906382f8916382f8926382f8936382f8946382f8956382f8966382f8976382f8986382f8996382f89a6382f89b6382f89c6382f89d6382f89e6382f89f6382f8a06382f8a16382f8a26382f8a36382f8a46382f8a56382f8a66382f8a7637ff46caf0121046080f8ce10a0f8e0a0a0f8e2a0a0f8e4a0a0f8e6a0a0f8e8a0a0f8eaa0a0f8eca0a0f8eea0a0f8f0a0a0f8f2a0a0f8f4a0a0f8f6a0a0f8f8a0a0f8faa0a0f8fca0a0f8fea058e8001fa9427ff41fafbff35f8f00bf48e8000161b358e8001fa942f8d013e72e4605460020c84730b105f54e7151e8007f27b135460ce04ff0ff3650e03546bff35f8f41e800027ab151e8007f002ff8d00021bff32f8fbff35f8f09b10746dbe609f5a9718847d7e60121f4e70020029c039e002c4ff0010518bf002e33d1ca460df110098046484603f0dbfa01980df1140c214632460123cdf800c007f07bf89df8191006464846002918bf4ff0ff3603f025fc044645b99df8180028b949f28340c0f247004c308047d146b8f1000f18bfc8f8d04009f5807138468847304627b0bde8f08f227802f07f01a1f1100313f1040f09d80b2907d002f07e02082a03d0032901d00629b9d140b149f28341c0f247010546884795f8281211b14ff0ff36d8e728460025a9e702fb01f000e000bfb0b54ff2ac44c2f229040146206846f23f52c5f28802b2eb500f40f258304cf2e9124cf67e25c2f20000c0f24802caf2101518bf25609047002804bf691c2160b0bd00bf0846ffe7014640f258304cf20732c2f20000c0f24802104770b500284ed001684ef66a62ccf2ff02914218bf70bd90f8081190f8095146f6756c8d42c0f2510c2ad205eb8501014491f80d2191f80e4191f80ae191f80b3191f80c1142ea0424012c4ff0010298bf14466e1c054680f80961b9b164294eea032028bf6421012888bf024644f62060824228bf02460cf5e2731046984706e0002180f80811bde870406047e047d5f8040138b142f64d42c0f244022146bde87040104770bd00bf02464ff64770cff6ff7042f6653c7844c0f2440c00210023604700bf2de9f04f9fb04ff2a840c2f229000668bff35f8f30466ff39600b0f1005f40f0d98030684ef66a6bccf2ff0b584540f0d18096f82802002800f0ba80d6f82442002c00f0b58040f6b400c2f20000056804a803f0cdf9002d00f01f8204f1600005f1600100220296831853f8607c8c18af5053f85c6caf187e6053f8586cbe6053f8546cfe6053f8506c3e6153f84c6c7e6153f8486cbe6153f8446cfe6153f8406c3e6253f83c6c7e6253f8386cbe6253f8346cfe6253f8306c3e6353f82c6c7e6353f8286cbe6353f8246cfe6353f8206c3e6453f81c6c7e6453f8186cbe6453f8146cfe6453f8106c3e6553f80c6c7e6553f8086cbe6553f8046c44f8046c86588e505e68c0327e669e68b2f5163fbe66de68fe661e693e675e697e679e69be67de69fe671e6ac7f880605e6ac7f884609e6ac7f88860de6ac7f88c601e6bc7f890605e6bc7f89Line truncated
|
||||
"new": "b0b581ea00039b0701d0034637e0c2b110f0030315d000f1010ca2f1010e0023cc5c9e45c45403f1010404d0634413f003032346f4d121440319121b102a14d302e00346102a10d3d1f800c0d1f804e0cc688d68103adc609d60c3f804e043f810cb0f2a01f11001eed8042a07d300bf51f8045b043a032a43f8045bf8d8002a08bfb0bd0139013b11f8015f013a03f8015ff9d1b0bd00bf884218bf002a00d1704710b50b1a38bf431a934207d288420ad281ea00039b0726d0034669e0fff79fffbde81040704781ea000300eb020c9b0701eb020e42d15fea8c732bd0a0f1010c00bf8b1813f801ec8418531e04f801ec04d0624412f003021a46f2d101eb030e00eb030c17e0830736d0a2f1010c00f1010e002300bfcc5c9c45c45403f1010404d0734413f003032346f4d1121b2144031922e01346042b0ed3aef10402acf1040152f80449043b032b41f80449f8d802f1040e01f1040c1a4653b1aef10101acf1010300bf11f80149013a03f80149f9d1bde8104070470346042a06d351f8044b043a032a43f8044bf8d8002af0d00139013b00bf11f8014f013a03f8014ff9d1e6e700bf2de9f04fa5b04ef66c6b4ff2a84416460d46ccf2ff0bc2f229044ff6ff7900274ff00108019006e048f2c731c0f24501bff32f8f8847d4f800a0bff35f8f20680321cff680710140b1f1005fbff35f8f03d10168594500f0b3804ff42b7004f0e7ff002800f089824ff65451cff6ff714218393182f8ac7282f8ad7282f8ae7282f8af7282f8b07282f8b17282f8b27282f8b37282f8b47282f8b57282f8b67282f8b77282f8b87282f8b97282f8ba7282f8bb7282f8bc7282f8bd7282f8be7282f8bf7282f8c07282f8c17282f8c27282f8c37282f8c47282f8c57282f8c67282f8c77282f8c87282f8c97282f8ca7282f8cb7282f8cc7282f8cd7282f8ce7282f8cf7282f8d07282f8d17282f8d27282f8d37282f8d47282f8d57282f8d67282f8d77282f8d87282f8d97282f8da7282f8db7282f8dc7282f8dd7282f8de7282f8df7282f8e07282f8e17282f8e27282f8e37282f8e4728ad1c0f800b080f80a80a0f81c90a0f81e90a0f82090a0f82290a0f82490a0f82690a0f82890a0f82a90a0f82c90a0f82e90a0f83090a0f83290a0f83490a0f83690a0f83890a0f83a9054e8001f51457ff43eafbff35f8f44e8000121b154e8001f5145f8d033e7aa4645ea064100260127c0f8701206e048f2c731c0f24501bff32f8f88472568bff35f8f20680321cff680710140b1f1005fbff35f8f03d10168594500f0b4804ff42b7004f014ff002800f0b6814ff65451cff6ff7100bf4218393182f8ac6282f8ad6282f8ae6282f8af6282f8b06282f8b16282f8b26282f8b36282f8b46282f8b56282f8b66282f8b76282f8b86282f8b96282f8ba6282f8bb6282f8bc6282f8bd6282f8be6282f8bf6282f8c06282f8c16282f8c26282f8c36282f8c46282f8c56282f8c66282f8c76282f8c86282f8c96282f8ca6282f8cb6282f8cc6282f8cd6282f8ce6282f8cf6282f8d06282f8d16282f8d26282f8d36282f8d46282f8d56282f8d66282f8d76282f8d86282f8d96282f8da6282f8db6282f8dc6282f8dd6282f8de6282f8df6282f8e06282f8e16282f8e26282f8e36282f8e4628ad1c0f800b08772a0f81c90a0f81e90a0f82090a0f82290a0f82490a0f82690a0f82890a0f82a90a0f82c90a0f82e90a0f83090a0f83290a0f83490a0f83690a0f83890a0f83a9054e8001fa9427ff43fafbff35f8f00bf44e8000121b154e8001fa942f8d033e7d0f8746242f6f767c0f24407002ebff35f8f00f0e38007f19a0230464ff0ff314ff0ff379047002840f0398143f67750c0f24f00804700274ff001080397adf8107006e048f2c731c0f24501bff32f8f88472568bff35f8f20680321cff680710140b1f1005fbff35f8f03d10168594500f0d9804ff42b7004f026fe002800f0d1804ff65451cff6ff7100bf4218393182f8ac7282f8ad7282f8ae7282f8af7282f8b07282f8b17282f8b27282f8b37282f8b47282f8b57282f8b67282f8b77282f8b87282f8b97282f8ba7282f8bb7282f8bc7282f8bd7282f8be7282f8bf7282f8c07282f8c17282f8c27282f8c37282f8c47282f8c57282f8c67282f8c77282f8c87282f8c97282f8ca7282f8cb7282f8cc7282f8cd7282f8ce7282f8cf7282f8d07282f8d17282f8d27282f8d37282f8d47282f8d57282f8d67282f8d77282f8d87282f8d97282f8da7282f8db7282f8dc7282f8dd7282f8de7282f8df7282f8e07282f8e17282f8e27282f8e37282f8e4728ad1c0f800b080f80a80a0f81c90a0f81e90a0f82090a0f82290a0f82490a0f82690a0f82890a0f82a90a0f82c90a0f82e90a0f83090a0f83290a0f83490a0f83690a0f83890a0f83a9054e8001fa9427ff43eafbff35f8f44e8000149b354e8001fa942f8d033e705460020b847b0b105f51d7151e8006f4eb9bff35f8f00bf41e8000292b151e8006f002ef8d00021bff32f8fbff35f8f21b1064601e74ff0ff3742e007f5a9718847fae60121f1e70020019d42f6f764002d4ff0010bc0f2440418bfbaf1000f33d10df108098046484602f073f903ab28465146012205f061fc9df8111007464846002918bf4ff0ff3702f091fabbf1000f044608d19df8100028b949f28340c0f247004c308047b8f1000f18bfc8f80c4042f6f764c0f2440404f5807130468847384625b0bde8f08f2a7802f07f01a1f1100313f1040f09d80b2907d002f07e02082a03d0032901d00629b9d140b149f28341c0f247010746884797f8641111b14ff0ff37d8e738464ff0000ba8e770b500284dd001684ef66c62ccf2ff02914218bf70bd90f8441090f8455046f6756c8d42c0f2510c2ad205eb8501014491f8492091f84a4091f846e091f8473091f8481042ea0424012c4ff0010298bf14466e1c054680f84560b9b164294eea032028bf6421012888bf024644f62060824228bf02460cf5e2731046984706e0002180f84410bde870406047e047286c38b142f64d42c0f244022146bde87040104770bd02464ff64b70cff6ff7042f6653c7844c0f2440c00210023604700bf2de9f04f9fb04ff2a840c2f229000668bff35f8f30466ff39600b0f1005f42d130684ef66c65ccf2ff05a8423bd196f8640130b3d6f860411cb340f6b400c2f20000076804a802f09df8002f00f0628140f2030a384621464ff416320296cff6807a4ff6ff760397fff76cfb4ff6545b48f2c738cff6ff7b00270124c0f245081ce096f8660170b1d6f8680140b146f68051c2f207010968401a002802f36880002086f8660140f6d100c0f247001fb0bde8f04f0047bff32f8fc0474ff2a840c2f22900d0f80090bff35f8f0068bff35f8f00ea0a01b1f1005f03d10168a94200f0a2804ff42b7004f018fc002802f0278059464218393182f8ac7282f8ad728Line truncated
|
||||
"desc": "append injected blobs to main-app payload"
|
||||
},
|
||||
{
|
||||
"offset": 779114,
|
||||
"old": "846a3800",
|
||||
"new": "802e3900",
|
||||
"new": "e0173900",
|
||||
"desc": "main-app subheader payload size (ps)"
|
||||
},
|
||||
{
|
||||
"offset": 152,
|
||||
"old": "046b3800",
|
||||
"new": "002f3900",
|
||||
"new": "60183900",
|
||||
"desc": "main-app TOC entry size (ps + 128)"
|
||||
},
|
||||
{
|
||||
"offset": 779234,
|
||||
"old": "846a3804",
|
||||
"new": "802e3904",
|
||||
"new": "e0173904",
|
||||
"desc": "main-app preamble length (low 24 bits)"
|
||||
},
|
||||
{
|
||||
"offset": 779238,
|
||||
"old": "85c355a2",
|
||||
"new": "39324b35",
|
||||
"new": "517198a3",
|
||||
"desc": "[5] ota/s200_firmware_ota.bin preamble crc32"
|
||||
},
|
||||
{
|
||||
"offset": 156,
|
||||
"old": "ed292ee4",
|
||||
"new": "5a0eea65",
|
||||
"new": "5ace0c83",
|
||||
"desc": "[5] ota/s200_firmware_ota.bin component crc32c (TOC)"
|
||||
},
|
||||
{
|
||||
"offset": 779118,
|
||||
"old": "ed292ee4",
|
||||
"new": "5a0eea65",
|
||||
"new": "5ace0c83",
|
||||
"desc": "[5] ota/s200_firmware_ota.bin component crc32c (subheader)"
|
||||
}
|
||||
]
|
||||
|
||||
Reference in new issue
Block a user