Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 7 additions & 171 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resolver = "3"
members = [
"dispatch-bundle",
"serac",
"embedded-command",
# "embedded-command",
"macros",
"packit",
# "packit",
]
12 changes: 6 additions & 6 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euxo pipefail
rustup toolchain install nightly --component miri

TARGETS=("thumbv6m-none-eabi" "thumbv7em-none-eabi" "thumbv7em-none-eabihf")
CRATES=("macros" "serac" "dispatch-bundle")
CRATES=("embedded-command-macros" "serac" "dispatch-bundle")

# build

Expand All @@ -24,14 +24,14 @@ done

# miri

cargo +nightly miri test -p embedded-command command_buffer
# skip for now
# cargo +nightly miri test -p embedded-command command_buffer

# clippy
cargo clippy
cargo clippy -- --deny warnings

# crate-specific

# cookie-cutter

# asm analysis
# serac
## asm analysis
cargo build -p serac --bin asm --target thumbv7em-none-eabihf --features binary --release
4 changes: 2 additions & 2 deletions dispatch-bundle/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pub use macros::bundle;

#[cfg(test)]
mod tests {
use cookie_cutter::{encoding::vanilla, SerializeBuf};
use macros::bundle;
use serac::{buf, encoding::vanilla, SerializeBuf};

trait Foo {
fn bar(&self) -> u8;
Expand Down Expand Up @@ -126,7 +126,7 @@ mod tests {
C = TEN,
}

let mut buf = <MyBundle as SerializeBuf>::Serialized::default();
let mut buf = buf!(MyBundle);

MyBundle::C(C {
val: 15,
Expand Down
12 changes: 6 additions & 6 deletions embedded-command/src/crc.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
use core::marker::PhantomData;

use cookie_cutter::SerializeIter;
use iter::{CRCComputeIter, CRCComputeIterMut};
use serac::SerializeIter;

mod iter;

#[derive(Debug)]
pub enum Error {
Serialize(cookie_cutter::error::Error),
Serialize(serac::error::Error),
Crc,
}

impl From<cookie_cutter::error::Error> for Error {
fn from(value: cookie_cutter::error::Error) -> Self {
impl From<serac::error::Error> for Error {
fn from(value: serac::error::Error) -> Self {
Self::Serialize(value)
}
}
Expand Down Expand Up @@ -48,7 +48,7 @@ impl<P: SerializeIter, C: CRCProvider<Word = u8>> CRCPacket<P, C> {
&'a self,
dst: impl IntoIterator<Item = &'a mut C::Word>,
crc_provider: &'a mut C,
) -> Result<(), cookie_cutter::error::EndOfInput>
) -> Result<(), serac::error::EndOfInput>
where
C::Word: 'a,
{
Expand Down Expand Up @@ -87,7 +87,7 @@ impl<P: SerializeIter, C: CRCProvider<Word = u8>> CRCPacket<P, C> {

#[cfg(test)]
mod tests {
use cookie_cutter::encoding::vanilla;
use serac::encoding::vanilla;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "embedded-command-macros"
version = "0.2.0"
version = "0.3.0"
edition = "2024"
description = "Macros for the embedded command crate family."
license = "CC-BY-NC-SA-4.0"
Expand Down
Loading