From 098d3f1d896de80a276398f6de1f6d9c16572d5f Mon Sep 17 00:00:00 2001 From: Nicolas Menard Date: Thu, 25 Jul 2024 09:34:57 -0400 Subject: [PATCH] release v0.2.3 --- Cargo.lock | 12 ++++++------ Cargo.toml | 3 ++- etc/docker/Dockerfile | 2 +- .../micrordklib-idf-component/CMakeLists.txt | 2 +- micro-rdk-ffi/micrordklib-idf-component/Kconfig | 2 +- .../micrordklib-idf-component/idf_component.yml | 4 ++-- micro-rdk/src/common/data_store.rs | 2 +- micro-rdk/src/common/grpc.rs | 2 +- micro-rdk/src/common/webrtc/grpc.rs | 2 +- templates/module/Cargo.toml | 4 ++-- templates/project/Cargo.toml | 4 ++-- 11 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05129e0f1..8105915e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2470,7 +2470,7 @@ dependencies = [ [[package]] name = "micro-rdk" -version = "0.2.2" +version = "0.2.3" dependencies = [ "async-channel 2.3.1", "async-executor", @@ -2528,7 +2528,7 @@ dependencies = [ [[package]] name = "micro-rdk-ffi" -version = "0.2.2" +version = "0.2.3" dependencies = [ "async-channel 2.3.1", "base64 0.21.7", @@ -2550,7 +2550,7 @@ dependencies = [ [[package]] name = "micro-rdk-installer" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "clap 4.5.7", @@ -2572,7 +2572,7 @@ dependencies = [ [[package]] name = "micro-rdk-macros" -version = "0.2.2" +version = "0.2.3" dependencies = [ "micro-rdk", "proc-macro-crate 2.0.0", @@ -2583,7 +2583,7 @@ dependencies = [ [[package]] name = "micro-rdk-modular-driver-example" -version = "0.2.2" +version = "0.2.3" dependencies = [ "log", "micro-rdk", @@ -2591,7 +2591,7 @@ dependencies = [ [[package]] name = "micro-rdk-server" -version = "0.2.2" +version = "0.2.3" dependencies = [ "async-channel 2.3.1", "embedded-hal 0.2.7", diff --git a/Cargo.toml b/Cargo.toml index d3cf6c59a..2ca683a87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,10 +22,11 @@ description = "Viam RDK for microcontroller" edition = "2021" license = "AGPL-3.0" repository = "https://github.com/viamrobotics/micro-rdk" -version = "0.2.2" +version = "0.2.3" rust-version = "1.75" [profile.release] +debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "s" [profile.dev] diff --git a/etc/docker/Dockerfile b/etc/docker/Dockerfile index 11b3a6ea9..7f5cee736 100644 --- a/etc/docker/Dockerfile +++ b/etc/docker/Dockerfile @@ -16,7 +16,7 @@ RUN cd qemu && mkdir build && cd build && ../configure --target-list=xtensa-soft WORKDIR /esp -RUN git clone --depth 1 -b v4.4.4 --single-branch --recurse-submodules --shallow-submodules https://github.com/viamrobotics/esp-idf +RUN git clone --depth 1 -b v4.4.8 --single-branch --recurse-submodules --shallow-submodules https://github.com/espressif/esp-idf/ FROM debian:bookworm diff --git a/micro-rdk-ffi/micrordklib-idf-component/CMakeLists.txt b/micro-rdk-ffi/micrordklib-idf-component/CMakeLists.txt index 04ac23506..aa3345422 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.2) +set(LIBMICRORDK_VERSION v0.2.3) 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/Kconfig b/micro-rdk-ffi/micrordklib-idf-component/Kconfig index d2f905fad..bf19782ed 100644 --- a/micro-rdk-ffi/micrordklib-idf-component/Kconfig +++ b/micro-rdk-ffi/micrordklib-idf-component/Kconfig @@ -2,7 +2,7 @@ menu "Micro RDK configuration" config MICRO_RDK_ENABLE_BUILD_LIBRARY bool "Enable Micro-RDK library" default n - depends on (ESP_SYSTEM_EVENT_TASK_STACK_SIZE >= 4096) && (PTHREAD_TASK_STACK_SIZE_DEFAULT>=8192) && ESP32_SPIRAM_SUPPORT && (SPIRAM_MALLOC_ALWAYSINTERNAL >= 4090) && MBEDTLS_DEFAULT_MEM_ALLOC + depends on (ESP_SYSTEM_EVENT_TASK_STACK_SIZE >= 4096) && (PTHREAD_TASK_STACK_SIZE_DEFAULT>=8192) && ESP32_SPIRAM_SUPPORT && (SPIRAM_MALLOC_ALWAYSINTERNAL >= 4090) && MBEDTLS_EXTERNAL_MEM_ALLOC select ESP_TLS_SERVER select SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY select MBEDTLS_SSL_PROTO_DTLS diff --git a/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml b/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml index b6144712d..5e0ffffba 100644 --- a/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml +++ b/micro-rdk-ffi/micrordklib-idf-component/idf_component.yml @@ -1,6 +1,6 @@ -version: "0.2.2-rc1" +version: "0.2.3" description: "Micro-RDK lib" dependencies: ## Required IDF version idf: - version: ">=4.4.4,<5.0.0" + version: ">=4.4.7,<5.0.0" diff --git a/micro-rdk/src/common/data_store.rs b/micro-rdk/src/common/data_store.rs index d345a6d10..89c146a9c 100644 --- a/micro-rdk/src/common/data_store.rs +++ b/micro-rdk/src/common/data_store.rs @@ -28,7 +28,7 @@ impl Default for WriteMode { } } -static mut DATA_STORE: [MaybeUninit; 10240] = [MaybeUninit::uninit(); 10240]; +static mut DATA_STORE: [MaybeUninit; 30240] = [MaybeUninit::uninit(); 30240]; #[derive(Clone, Error, Debug)] pub enum DataStoreError { diff --git a/micro-rdk/src/common/grpc.rs b/micro-rdk/src/common/grpc.rs index a1063e46a..6478f9e3d 100644 --- a/micro-rdk/src/common/grpc.rs +++ b/micro-rdk/src/common/grpc.rs @@ -37,7 +37,7 @@ use thiserror::Error; #[cfg(feature = "camera")] static GRPC_BUFFER_SIZE: usize = 1024 * 30; // 30KB #[cfg(not(feature = "camera"))] -static GRPC_BUFFER_SIZE: usize = 4096; +static GRPC_BUFFER_SIZE: usize = 9216; #[derive(Clone, Debug)] pub struct GrpcBody { diff --git a/micro-rdk/src/common/webrtc/grpc.rs b/micro-rdk/src/common/webrtc/grpc.rs index fdd000aee..f44bd1b8e 100755 --- a/micro-rdk/src/common/webrtc/grpc.rs +++ b/micro-rdk/src/common/webrtc/grpc.rs @@ -24,7 +24,7 @@ use super::{api::WebRtcError, sctp::Channel}; // sizeof(fake_image) + headers/encodings static WEBRTC_GRPC_BUFFER_SIZE: usize = 1024 * 11; #[cfg(not(feature = "camera"))] -static WEBRTC_GRPC_BUFFER_SIZE: usize = 1650; +static WEBRTC_GRPC_BUFFER_SIZE: usize = 9216; #[derive(Debug, Default)] pub struct WebRtcGrpcBody { diff --git a/templates/module/Cargo.toml b/templates/module/Cargo.toml index 9f6a1d21d..647ac2542 100644 --- a/templates/module/Cargo.toml +++ b/templates/module/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "{{project-name}}" -version = "0.2.2" +version = "0.2.3" edition = "2021" authors = ["{{authors}}"] resolver = "2" rust-version = "1.75" [dependencies] -micro-rdk = {git = "https://github.com/viamrobotics/micro-rdk.git", features = ["{{mcu}}"], version = "0.2.2", rev = "a1863c9"} +micro-rdk = {git = "https://github.com/viamrobotics/micro-rdk.git", features = ["{{mcu}}"], version = "0.2.3", rev = "a1863c9"} [package.metadata.com.viam] module = true diff --git a/templates/project/Cargo.toml b/templates/project/Cargo.toml index ae43d7104..bee4352a2 100644 --- a/templates/project/Cargo.toml +++ b/templates/project/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "{{project-name}}" -version = "0.2.2" +version = "0.2.3" edition = "2021" authors = ["{{authors}}"] resolver = "2" @@ -20,7 +20,7 @@ embedded-hal = { version = "0.2.7", features = ["unproven"]} log = "0.4" async-channel = "2" futures-lite = "1" -micro-rdk = {version = "0.2.2", git = "https://github.com/viamrobotics/micro-rdk.git", features = ["esp32", "binstart","provisioning"], rev = "a1863c9" } +micro-rdk = {version = "0.2.3", git = "https://github.com/viamrobotics/micro-rdk.git", features = ["esp32", "binstart","provisioning"], rev = "a1863c9" } [build-dependencies] cargo_metadata = "0.18"