Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

fix: update riscv-rt to avoid yanked version #47

Closed
wants to merge 5 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV LANG=C.UTF-8
# Arguments
ARG CONTAINER_USER=esp
ARG CONTAINER_GROUP=esp
ARG TOOLCHAIN_VERSION=1.64.0.0
ARG TOOLCHAIN_VERSION=1.65.0.0
ARG ESP_BOARD=esp32
ARG INSTALL_RUST_TOOLCHAIN=install-rust-toolchain.sh

Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ license = "MIT OR Apache-2.0"
{% if mcu == "esp32" -%}
{{ mcu }}-hal = "0.7.0"
{% else -%}
{{ mcu }}-hal = "0.4.0"
# TODO: remove vcs override when revving past a release containing https://github.com/esp-rs/esp-hal/pull/350
{{ mcu }}-hal = { version = "0.4.0", git = "https://github.com/esp-rs/esp-hal.git", ref = "832f9ef" }
{%- endif %}
{% if alloc -%}
esp-alloc = { version = "0.1.0", features = ["oom-handler"] }
{%- endif %}
esp-backtrace = { version = "0.4.0", features = ["{{ mcu }}", "panic-handler", "print-uart"] }
{% if mcu == "esp32c3" -%}
riscv-rt = { version = "0.10", optional = true }
riscv-rt = { version = "0.11.0", optional = true }
{%- else -%}
{% if mcu == "esp32s2" -%}
xtensa-atomic-emulation-trap = "0.3.0"
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
extern crate alloc;
{% endif -%}

use {{ mcu }}_hal::{clock::ClockControl, pac::Peripherals, prelude::*, timer::TimerGroup, Rtc};
use {{ mcu }}_hal::{clock::ClockControl, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc};
use esp_backtrace as _;{% if mcu == "esp32s2" %}
use xtensa_atomic_emulation_trap as _;{% endif %}
{% if alloc %}#[global_allocator]
Expand Down Expand Up @@ -34,7 +34,7 @@ fn init_heap() {
{% else -%}
#[xtensa_lx_rt::entry]
{% endif %}fn main() -> ! {
let peripherals = Peripherals::take().unwrap();
let peripherals = Peripherals::take();
{%- if mcu == "esp32" %}
let system = peripherals.DPORT.split();
{%- else %}
Expand Down