Skip to content

Commit

Permalink
Add cursor around cbor writer to get write position back
Browse files Browse the repository at this point in the history
  • Loading branch information
MathiasKoch committed Nov 6, 2024
1 parent 86e005f commit 8656eb1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ bitmaps = { version = "3.1", default-features = false }
heapless = { version = "0.8", features = ["serde"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }

minicbor = { version = "0.25", optional = true }
minicbor-serde = { version = "0.3.2", optional = true }


Expand Down Expand Up @@ -72,13 +73,13 @@ hex = { version = "0.4.3", features = ["alloc"] }
[features]
default = ["ota_mqtt_data", "provision_cbor"]

provision_cbor = ["minicbor-serde"]
provision_cbor = ["dep:minicbor", "dep:minicbor-serde"]

ota_mqtt_data = ["minicbor-serde"]
ota_mqtt_data = ["dep:minicbor", "dep:minicbor-serde"]

ota_http_data = []

std = ["serde/std", "minicbor-serde/std"]
std = ["serde/std", "minicbor-serde?/std"]

defmt = [
"dep:defmt",
Expand Down
5 changes: 3 additions & 2 deletions src/ota/encoding/cbor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ pub fn to_slice<T>(value: &T, slice: &mut [u8]) -> Result<usize, ()>
where
T: serde::ser::Serialize,
{
let mut serializer = minicbor_serde::Serializer::new(slice);
let mut serializer =
minicbor_serde::Serializer::new(minicbor::encode::write::Cursor::new(slice));
value.serialize(&mut serializer).map_err(|_| ())?;
Ok(serializer.into_encoder().writer().len())
Ok(serializer.into_encoder().writer().position())
}

impl<'a> From<GetStreamResponse<'a>> for FileBlock<'a> {
Expand Down

0 comments on commit 8656eb1

Please sign in to comment.