From a400ef2d95325f2215b242de81cf210559a021d0 Mon Sep 17 00:00:00 2001 From: Nicolas Menard Date: Thu, 15 Aug 2024 16:15:27 -0400 Subject: [PATCH] bump version --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- .../micrordklib-idf-component/CMakeLists.txt | 2 +- .../micrordklib-idf-component/idf_component.yml | 2 +- micro-rdk-ffi/src/ffi/sensor.rs | 10 +++++++++- templates/module/Cargo.toml | 2 +- templates/project/Cargo.toml | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9e157e2f..ffeb64d38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2470,7 +2470,7 @@ dependencies = [ [[package]] name = "micro-rdk" -version = "0.2.4" +version = "0.2.5" dependencies = [ "async-channel 2.3.1", "async-executor", @@ -2529,7 +2529,7 @@ dependencies = [ [[package]] name = "micro-rdk-ffi" -version = "0.2.4" +version = "0.2.5" dependencies = [ "async-channel 2.3.1", "base64 0.21.7", @@ -2552,7 +2552,7 @@ dependencies = [ [[package]] name = "micro-rdk-installer" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "clap 4.5.7", @@ -2574,7 +2574,7 @@ dependencies = [ [[package]] name = "micro-rdk-macros" -version = "0.2.4" +version = "0.2.5" dependencies = [ "micro-rdk", "proc-macro-crate 2.0.0", @@ -2585,7 +2585,7 @@ dependencies = [ [[package]] name = "micro-rdk-modular-driver-example" -version = "0.2.4" +version = "0.2.5" dependencies = [ "log", "micro-rdk", @@ -2593,7 +2593,7 @@ dependencies = [ [[package]] name = "micro-rdk-server" -version = "0.2.4" +version = "0.2.5" dependencies = [ "async-channel 2.3.1", "embedded-hal 0.2.7", diff --git a/Cargo.toml b/Cargo.toml index d06e069b4..5ff552d75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ description = "Viam RDK for microcontroller" edition = "2021" license = "AGPL-3.0" repository = "https://github.com/viamrobotics/micro-rdk" -version = "0.2.4" +version = "0.2.5" rust-version = "1.75" [profile.release] diff --git a/micro-rdk-ffi/micrordklib-idf-component/CMakeLists.txt b/micro-rdk-ffi/micrordklib-idf-component/CMakeLists.txt index ac150ad20..f08775a1b 100644 --- a/micro-rdk-ffi/micrordklib-idf-component/CMakeLists.txt +++ b/micro-rdk-ffi/micrordklib-idf-component/CMakeLists.txt @@ -1,7 +1,7 @@ idf_component_register(INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") idf_build_set_property(INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/assets" APPEND) -set(LIBMICRORDK_VERSION v0.2.4) +set(LIBMICRORDK_VERSION v0.2.5) set(LIBMICRORDK_URL https://github.com/viamrobotics/micro-rdk/releases/download/${LIBMICRORDK_VERSION}/micro-rdk-lib.zip) set(LIBMICRORDK_PATH ${CMAKE_BINARY_DIR}/import/micro-rdk-lib.zip) diff --git a/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml b/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml index c212c200e..6f121d736 100644 --- a/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml +++ b/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml @@ -1,4 +1,4 @@ -version: "0.2.4" +version: "0.2.5" description: "Micro-RDK lib" dependencies: ## Required IDF version diff --git a/micro-rdk-ffi/src/ffi/sensor.rs b/micro-rdk-ffi/src/ffi/sensor.rs index f1327c64f..3652293f2 100644 --- a/micro-rdk-ffi/src/ffi/sensor.rs +++ b/micro-rdk-ffi/src/ffi/sensor.rs @@ -4,7 +4,7 @@ use micro_rdk::{ sensor::{GenericReadingsResult, Readings, Sensor, SensorError}, status::Status, }, - google::protobuf::{value, Value}, + google::protobuf::{value, ListValue, Value}, DoCommand, }; use std::{ @@ -235,6 +235,14 @@ fn into_value(kind: Kind) -> value::Kind { Kind::NullValue(n) => value::Kind::NullValue(n), Kind::NumberValue(f) => value::Kind::NumberValue(f), Kind::StringValue(s) => value::Kind::StringValue(s), + Kind::VecValue(v) => value::Kind::ListValue(ListValue { + values: v + .into_iter() + .map(|v| Value { + kind: Some(into_value(v)), + }) + .collect(), + }), _ => value::Kind::NullValue(0), } } diff --git a/templates/module/Cargo.toml b/templates/module/Cargo.toml index e716943d5..9bc5fef82 100644 --- a/templates/module/Cargo.toml +++ b/templates/module/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "{{project-name}}" -version = "0.2.4" +version = "0.2.5" edition = "2021" authors = ["{{authors}}"] resolver = "2" diff --git a/templates/project/Cargo.toml b/templates/project/Cargo.toml index c59d11be2..5f69917e2 100644 --- a/templates/project/Cargo.toml +++ b/templates/project/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "{{project-name}}" -version = "0.2.4" +version = "0.2.5" edition = "2021" authors = ["{{authors}}"] resolver = "2"