Update to the new release (#182)

* Update to the new release * We now need 1.75 at least * Add the VFS component for now, to fix the cmake build
esp-rs · Jan 26, 2024 · ae1f15a · ae1f15a
1 parent 372ec1b
commit ae1f15a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ci_cargo.yml b/.github/workflows/ci_cargo.yml
@@ -48,7 +48,6 @@ jobs:
           default: true
           buildtargets: ${{ matrix.target }}
           ldproxy: false
-          version: "1.71.0"
       - uses: Swatinem/rust-cache@v2
       - name: Setup | cargo-generate (binary)
         id: cargo-generate-binary

diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
@@ -66,7 +66,6 @@ jobs:
           default: true
           buildtargets: ${{ matrix.target.mcu }}
           ldproxy: false
-          version: "1.71.0"
       - uses: Swatinem/rust-cache@v2
       - name: Setup | cargo-generate (binary)
         id: cargo-generate-binary

diff --git a/cargo/.cargo/config.toml b/cargo/.cargo/config.toml
@@ -5,10 +5,8 @@ target = "{{ rust_target }}"
 linker = "ldproxy"
 # runner = "espflash --monitor" # Select this runner for espflash v1.x.x
 runner = "espflash flash --monitor" # Select this runner for espflash v2.x.x
-{% if espidfver != "v4.4" and arch == "xtensa" -%}
+{% if espidfver != "v4.4" -%}
 rustflags = [ "--cfg",  "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110
-{%- elsif espidfver != "v4.4" and arch == "riscv" -%}
-rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"]
 {%- elsif espidfver == "v4.4" and arch == "riscv" -%}
 rustflags = ["-C", "default-linker-libraries"]
 {%- endif %}
@@ -26,7 +24,7 @@ MCU="{{ mcu }}"
 {%- if espidfver == "v4.4" %}
 ESP_IDF_VERSION = "v4.4.6"
 {% elsif espidfver == "v5.1" %}
-ESP_IDF_VERSION = "v5.1.1"
+ESP_IDF_VERSION = "v5.1.2"
 {% elsif espidfver == "master" %}
 ESP_IDF_VERSION = "master"
 {% endif %}
diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml
@@ -29,7 +29,7 @@ embassy = ["esp-idf-svc/embassy-sync", "esp-idf-svc/critical-section", "esp-idf-
 
 [dependencies]
 log = { version = "0.4", default-features = false }
-esp-idf-svc = { version = "0.47.3", default-features = false }
+esp-idf-svc = { version = "0.48", default-features = false }
 
 [build-dependencies]
 embuild = "0.31.3"
diff --git a/cmake/components/rust-{{project-name}}/CMakeLists.txt b/cmake/components/rust-{{project-name}}/CMakeLists.txt
@@ -1,6 +1,6 @@
 # If this component depends on other components - be it ESP-IDF or project-specific ones - enumerate those in the double-quotes below, separated by spaces
 # Note that pthread should always be there, or else STD will not work
-set(RUST_DEPS "pthread" "driver")
+set(RUST_DEPS "pthread" "driver" "vfs")
 # Here's a non-minimal, reasonable set of ESP-IDF components that one might want enabled for Rust:
 #set(RUST_DEPS "pthread" "esp_http_client" "esp_http_server" "espcoredump" "app_update" "esp_serial_slave_link" "nvs_flash" "spi_flash" "esp_adc_cal" "mqtt")
 

diff --git a/cmake/components/rust-{{project-name}}/Cargo.toml b/cmake/components/rust-{{project-name}}/Cargo.toml
@@ -33,7 +33,7 @@ embassy = ["esp-idf-svc/embassy-sync", "esp-idf-svc/critical-section", "esp-idf-
 
 [dependencies]
 log = { version = "0.4", default-features = false }
-esp-idf-svc = { version = "0.47.1", default-features = false }
+esp-idf-svc = { version = "0.48", default-features = false }
 
 [build-dependencies]
 embuild = "0.31.3"