diff --git a/spinnyboy_rust/.cargo/config.toml b/spinnyboy_rust/.cargo/config.toml index 180027b..9742ea7 100644 --- a/spinnyboy_rust/.cargo/config.toml +++ b/spinnyboy_rust/.cargo/config.toml @@ -8,8 +8,6 @@ rustflags = [ # Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.) # NOTE: May negatively impact performance of produced code "-C", "force-frame-pointers", - #https://defmt.ferrous-systems.com/setup - "-C", "link-arg=-Tdefmt.x", ] target = "riscv32imac-unknown-none-elf" diff --git a/spinnyboy_rust/Cargo.toml b/spinnyboy_rust/Cargo.toml index 653e6f9..2fc72b8 100644 --- a/spinnyboy_rust/Cargo.toml +++ b/spinnyboy_rust/Cargo.toml @@ -17,8 +17,6 @@ esp-bootloader-esp-idf = { version = "0.4.0", features = ["esp32c6"] } critical-section = "1.2.0" esp-alloc = "0.9.0" rtt-target = "0.6.2" -embedded-hal = "1.0.0" -esp-backtrace = {version = "0.18.1",features = ["esp32c6","defmt"]} [profile.dev] diff --git a/spinnyboy_rust/shell.nix b/spinnyboy_rust/shell.nix index c4f8346..8570f2f 100644 --- a/spinnyboy_rust/shell.nix +++ b/spinnyboy_rust/shell.nix @@ -1,28 +1,19 @@ -{ pkgs ? import { - overlays = [ - (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) +{ pkgs ? import {}}: +let rust-toolchain = with pkgs; symlinkJoin { + name = "rust-toolchain"; + paths = [ + probe-rs-tools + rustup + rustc + cargo + rustfmt + rust-analyzer + clippy + rustPlatform.rustcSrc ]; - } -}: - -let - # Define the specific toolchain with ESP32-C6 support - rustToolchain = pkgs.rust-bin.selectLatestNightlyWith(toolchain: toolchain.default.override { - targets = [ "riscv32imac-unknown-none-elf" ]; - extensions = [ "rust-src" "llvm-tools-preview" ]; - }); -in -pkgs.mkShell { - nativeBuildInputs = [ - rustToolchain - pkgs.probe-rs-tools - pkgs.espflash # For flashing your ESP32-C6 - pkgs.pkg-config - pkgs.gcc # Critical: provides the 'cc' wrapper script - ]; - - # Injects necessary library paths for the Nix-wrapped linker - shellHook = '' - export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]}" - ''; + }; +in pkgs.mkShell { + buildInputs = [rust-toolchain]; + RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; + RUST_BACKTRACE = 1; } diff --git a/spinnyboy_rust/src/bin/main.rs b/spinnyboy_rust/src/bin/main.rs index 9ec1140..0aec8dd 100644 --- a/spinnyboy_rust/src/bin/main.rs +++ b/spinnyboy_rust/src/bin/main.rs @@ -23,7 +23,7 @@ use esp_hal::handler; use core::cell::RefCell; use esp_hal::time::{Duration, Instant}; use esp_hal::timer::timg::TimerGroup; -use esp_backtrace as _; + use critical_section::Mutex; use rtt_target::rprintln; mod dc_driver; @@ -38,10 +38,7 @@ fn panic(_: &core::panic::PanicInfo) -> ! { // static EMERGENCY_BUTTON: Mutex>> = Mutex::new(RefCell::new(None)); extern crate alloc; -//target RPM -const DEFAULT_TARGET_RPM: u32 = 1000; -//in seconds -const DEFAULT_SPIN_TIME:u32 = 10; + // This creates a default app-descriptor required by the esp-idf bootloader. // For more information see: esp_bootloader_esp_idf::esp_app_desc!(); @@ -101,6 +98,12 @@ fn main() -> ! { .unwrap() .with_rx(peripherals.GPIO5) .with_tx(peripherals.GPIO7); + // uart0.write(b"page page0"); + // uart0.write(b"\xff"); + // uart0.write(b"\xff"); + // uart0.write(b"\xff"); + // uart0.write(b"\xff"); + // rprintln!("WRITE HAPPENED!"); let mut display = Nextion::new(&mut uart0); display.send_command(b"page page0"); loop {