Skip to content

Commit 4a068e3

Browse files
committed
Update to 25.0.5, fixes firmware update hanging at 100%
1 parent 2804617 commit 4a068e3

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

grapple-hook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "grapple-hook",
33
"private": true,
4-
"version": "25.0.4",
4+
"version": "25.0.5",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

grapple-hook/src-tauri/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

grapple-hook/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grapple-hook"
3-
version = "25.0.4"
3+
version = "25.0.5"
44
description = "Configuration Tool for Grapple Hardware"
55
authors = ["Jaci Brunning <jaci.brunning@gmail.com>"]
66
license = "GPLv3"

grapple-hook/src-tauri/src/devices/mod.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,16 @@ impl<T: FirmwareValidatingDevice> FirmwareUpgradeDevice<T> {
201201
for (i, chunk) in chunks.enumerate() {
202202
info!("Chunk {} (len: {})", i, chunk.len());
203203

204+
let mut padded = vec![0u8; chunk_size];
205+
206+
for i in 0..chunk.len() {
207+
padded[i] = chunk[i];
208+
}
209+
204210
sender.send(TaggedGrappleMessage::new(
205211
id,
206212
GrappleDeviceMessage::FirmwareUpdate(
207-
GrappleFirmwareMessage::UpdatePart(AsymmetricCow(Cow::<Payload>::Borrowed(Into::into(chunk))).into_static())
213+
GrappleFirmwareMessage::UpdatePart(AsymmetricCow(Cow::<Payload>::Borrowed(Into::into(&padded[..]))).into_static())
208214
)
209215
)).await?;
210216
tokio::time::timeout(Duration::from_millis(1000), ack.notified()).await?;

grapple-hook/src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"package": {
1010
"productName": "GrappleHook",
11-
"version": "25.0.4"
11+
"version": "25.0.5"
1212
},
1313
"tauri": {
1414
"allowlist": {

0 commit comments

Comments
 (0)