Skip to content
Permalink
Browse files

Merge pull request #67 from kjetilkjeka/preview

Preview 0
  • Loading branch information...
kjetilkjeka committed Sep 10, 2018
2 parents 402ecbd + 967e5e2 commit 1740514f7f7a8c69b73d223d6c58374df2362328
Showing with 13 additions and 11 deletions.
  1. +3 −3 uavcan-derive/Cargo.toml
  2. +8 −5 uavcan/Cargo.toml
  3. +0 −2 uavcan/src/frame_disassembler.rs
  4. +2 −1 uavcan/src/lib.rs
@@ -1,11 +1,11 @@
[package]
name = "uavcan-derive"
authors = ["Kjetil Kjeka <kjetilkjeka@gmail.com>"]
version = "0.0.1"
version = "0.1.0-preview0"

description = "Makes it possible to derive UavcanIndexable and UavcanFrame used in uavcan-core"
description = "Makes it possible to derive Uavcan related types"

repository = "https://github.com/kjetilkjeka/uavcan-core.rs/tree/master/uavcan-derive"
repository = "https://github.com/UAVCAN/uavcan.rs"

keywords = ["uavcan", "can", "uav", "embedded"]

@@ -1,26 +1,29 @@
[package]
name = "uavcan"
authors = ["Kjetil Kjeka <kjetilkjeka@gmail.com>"]
version = "0.0.1"
version = "0.1.0-preview0"

description = "Full functionality reference implementation of uavcan in Rust"

description = "The primary (core) part of the uavcan implementation in rust. Core is also fitting as this crate is and always will be no_std"
repository = "https://github.com/UAVCAN/uavcan.rs"
homepage = "https://uavcan.org/Implementations/Uavcan.rs/"

repository = "https://github.com/kjetilkjeka/uavcan.rs"
readme = "README.md"

keywords = ["uavcan", "can", "uav", "embedded"]
categories = ["no-std", "embedded"]

license = "Apache-2.0/MIT"

[features]
default = ["std"]
default = []
std = ["ux/std", "half/std"]

[workspace]

[dependencies]
bit_field = "0.8.0"
uavcan-derive = {path = "../uavcan-derive"}
uavcan-derive = "0.1.0-preview0"
embedded_types = "0.3.0"

[dependencies.half]
@@ -38,8 +38,6 @@ impl<S: Struct> FrameDisassembler<S> {
}
}

pub fn finished(&self) -> bool { self.finished }

pub fn next_transfer_frame<T: TransferFrame>(&mut self) -> Option<T> {
let max_data_length = T::MAX_DATA_LENGTH;
let mut transport_frame = T::new(self.id);
@@ -234,6 +234,7 @@ impl<T: Struct> Frame<T> {
}
}

/*
pub fn from_anonymous_message(message: T, priority: u8, discriminator: u16) -> Self where T: Message {
if let Some(type_id) = T::TYPE_ID {
let mut id = 0;
@@ -292,7 +293,7 @@ impl<T: Struct> Frame<T> {
}
}

*/

fn from_parts(id: TransferFrameID, body: T) -> Self {
Frame{id: id, body: body}

0 comments on commit 1740514

Please sign in to comment.
You can’t perform that action at this time.