Compare commits
No commits in common. "cb95755998a1491c4f6d1987b2dc7f75dc224c38" and "fbc187f001986d9ed18d023696a1d23a8de8b884" have entirely different histories.
cb95755998
...
fbc187f001
4 changed files with 25 additions and 35 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -1,28 +1,19 @@
|
|||
{ pkgs ? import <nixpkgs> {
|
||||
overlays = [
|
||||
(import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
|
||||
{ pkgs ? import <nixpkgs> {}}:
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<RefCell<Option<Input>>> = 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: <https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/app_image_format.html#application-description>
|
||||
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 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue